Your message dated Sat, 13 Nov 2010 11:47:06 +0000 with message-id <1289648826.3322.5107.camel@hathi.jungle.funky-badger.org> and subject line Re: Bug#603337: unblock: exim4/4.72-2 has caused the Debian Bug report #603337, regarding unblock: exim4/4.72-2 to be marked as done. This means that you claim that the problem has been dealt with. If this is not the case it is now your responsibility to reopen the Bug report if necessary, and/or fix the problem forthwith. (NB: If you are a system administrator and have no idea what this message is talking about, this may indicate a serious mail system misconfiguration somewhere. Please contact owner@bugs.debian.org immediately.) -- 603337: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=603337 Debian Bug Tracking System Contact owner@bugs.debian.org with problems
--- Begin Message ---
- To: Debian Bug Tracking System <submit@bugs.debian.org>
- Subject: unblock: exim4/4.72-2
- From: Andreas Metzler <ametzler@downhill.at.eu.org>
- Date: Sat, 13 Nov 2010 09:12:09 +0100
- Message-id: <[🔎] 20101113081209.GA30609@downhill.g.la>
Package: release.debian.org Severity: normal User: release.debian.org@packages.debian.org Usertags: unblock Please unblock package exim4. The changes are rather small: * 40_dkimnotinpaniclog.diff pulled from upstream git. Stop logging non-critical DKIM errors in paniclog. Closes: #567876 Exim4's paniclog is reserved for serious issues. I could really like to see this in squeeze. * Debconf translations updates: dk, ru. * Documentation updates: + fix exim4-config_files man page, mention {host|sender}_local_deny_exceptions instead of local_{host|sender}_whitelist. Thanks to Fabien André in #578176 + Re-work config.autogenerated header to more exactly reflect configuration source. (mh) Closes: #593984 Some minor stuff: * add !acl = acl_local_deny_exceptions to defer stanzas in SPF code. Thanks to Fabien André. Closes: #578176 * Fix getopt invocation to make update-exim4.conf.template -o work. (Thank you Matthew W. S. Bell) Closes: #590333 unblock exim4/4.72-2 Thanks, cu andreas changelog | 23 + debconf/conf.d/acl/30_exim4-config_check_rcpt | 2 debconf/update-exim4.conf | 22 + debconf/update-exim4.conf.template | 2 manpages/exim4-config_files.5 | 12 patches/40_dkimnotinpaniclog.diff | 21 + patches/series | 1 po/da.po | 463 +++----------------------- po/ru.po | 7 9 files changed, 136 insertions(+), 417 deletions(-)diff -Nru exim4-4.72/debian/changelog exim4-4.72/debian/changelog --- exim4-4.72/debian/changelog 2010-06-03 18:16:24.000000000 +0200 +++ exim4-4.72/debian/changelog 2010-10-30 13:38:31.000000000 +0200 @@ -1,3 +1,26 @@ +exim4 (4.72-2) unstable; urgency=low + + [ Marc Haber ] + * Apply patch to russian (ru) debconf template, thanks to Тим + Алексеевский and Tim Alexeevsky. Closes: #576202 + * fix exim4-config_files man page, mention + {host|sender}_local_deny_exceptions instead of + local_{host|sender}_whitelist. Thanks to Fabien André in #578176 + * add !acl = acl_local_deny_exceptions to defer stanzas in SPF code. + Thanks to Fabien André. Closes: #578176 + * Re-work config.autogenerated header to more exactly reflect + configuration source. (mh) Closes: #593984 + + [ Andreas Metzler ] + * Fix getopt invocation to make update-exim4.conf.template -o work. (Thank + you Matthew W. S. Bell) Closes: #590333 + * 40_dkimnotinpaniclog.diff pulled from upstream git. Stop logging + non-critical DKIM errors in paniclog. Closes: #567876 + * Debconf translations: + - Danish. Closes: #592792 + + -- Andreas Metzler <ametzler@debian.org> Sat, 30 Oct 2010 13:38:26 +0200 + exim4 (4.72-1) unstable; urgency=low * New upstream release. (Identical to the git snapshot previously diff -Nru exim4-4.72/debian/debconf/conf.d/acl/30_exim4-config_check_rcpt exim4-4.72/debian/debconf/conf.d/acl/30_exim4-config_check_rcpt --- exim4-4.72/debian/debconf/conf.d/acl/30_exim4-config_check_rcpt 2010-03-20 18:42:31.000000000 +0100 +++ exim4-4.72/debian/debconf/conf.d/acl/30_exim4-config_check_rcpt 2010-07-03 14:56:37.000000000 +0200 @@ -254,6 +254,7 @@ defer message = Temporary DNS error while checking SPF record. Try again later. + !acl = acl_local_deny_exceptions condition = ${if eq {$runrc}{5}{yes}{no}} warn @@ -274,6 +275,7 @@ defer message = Temporary DNS error while checking SPF record. Try again later. + !acl = acl_local_deny_exceptions condition = ${if eq {$runrc}{5}{yes}{no}} .endif diff -Nru exim4-4.72/debian/debconf/update-exim4.conf exim4-4.72/debian/debconf/update-exim4.conf --- exim4-4.72/debian/debconf/update-exim4.conf 2009-05-09 09:40:45.000000000 +0200 +++ exim4-4.72/debian/debconf/update-exim4.conf 2010-08-28 09:36:48.000000000 +0200 @@ -248,10 +248,24 @@ # WARNING WARNING WARNING # WARNING WARNING WARNING # WARNING WARNING WARNING -# This file is generated dynamically from the files in -# the conf.d/ directory, or from exim4.conf.template respectively. -# Additional information is read from update-exim4.conf.conf -# This version of the file was created from the directory $UPEX4C_confdir +# This file was generated dynamically from +EOF + +if [ "${dc_use_split_config}" = "true" ] ; then +cat << EOF >> "${UPEX4C_outputfile}.tmp" +# split config files in the $UPEX4C_confd/ directory. +EOF +else +cat << EOF >> "${UPEX4C_outputfile}.tmp" +# non-split config ($UPEX4C_confdir/exim4.conf.localmacros +# and $UPEX4C_confdir/exim4.conf.template). +EOF +fi + +cat << EOF >> "${UPEX4C_outputfile}.tmp" +# The config files are supplemented with package installation/configuration +# settings managed by debconf. This data is stored in +# $UPEX4C_confdir/update-exim4.conf.conf # Any changes you make here will be lost. # See /usr/share/doc/exim4-base/README.Debian.gz and update-exim4.conf(8) # for instructions of customization. diff -Nru exim4-4.72/debian/debconf/update-exim4.conf.template exim4-4.72/debian/debconf/update-exim4.conf.template --- exim4-4.72/debian/debconf/update-exim4.conf.template 2005-04-03 09:39:12.000000000 +0200 +++ exim4-4.72/debian/debconf/update-exim4.conf.template 2010-07-30 19:03:06.000000000 +0200 @@ -21,7 +21,7 @@ ## Parse commandline TEMP=$(getopt -n update-exim4.conf.template \ -l nobackup,output:,help,run -- \ - +nohr "$@") + +no:hr "$@") if test "$?" != 0; then echo "Terminating..." >&2 diff -Nru exim4-4.72/debian/manpages/exim4-config_files.5 exim4-4.72/debian/manpages/exim4-config_files.5 --- exim4-4.72/debian/manpages/exim4-config_files.5 2010-01-02 17:41:45.000000000 +0100 +++ exim4-4.72/debian/manpages/exim4-config_files.5 2010-07-03 14:56:37.000000000 +0200 @@ -27,11 +27,11 @@ .br /etc/exim4/local_host_blacklist .br -/etc/exim4/local_host_whitelist +/etc/exim4/host_local_deny_exceptions .br /etc/exim4/local_sender_blacklist .br -/etc/exim4/local_sender_whitelist +/etc/exim4/sender_local_deny_exceptions .br /etc/exim4/local_sender_callout .br @@ -92,7 +92,7 @@ it is possible to exclude addresses from being blacklisted. For convenience, as an additional method to whitelist addresses from being blocked, an explicit whitelist is read in from -/etc/exim4/local_host_whitelist. Entries in the whitelist override +/etc/exim4/host_local_deny_exceptions. Entries in the whitelist override corresponding blacklist entries. In the blacklist, the trick is to read a line break as "or" if it @@ -113,7 +113,7 @@ context), so you don't get the same kind of operator binding as in a programming language. -.SH /etc/exim4/local_host_whitelist +.SH /etc/exim4/host_local_deny_exceptions contains a list of IP addresses, networks and host names whose messages will be accepted despite the address is also listed in /etc/exim4/local_host_blacklist, overriding a blacklisting. @@ -125,7 +125,7 @@ used. This includes negative items, and so it is possible to exclude addresses from being blacklisted. For convenience, as an additional method to whitelist addresses from being blocked, an explicit -whitelist is read in from /etc/exim4/local_sender_whitelist. Entries +whitelist is read in from /etc/exim4/sender_local_deny_exceptions. Entries in the whitelist override corresponding blacklist entries. In the blacklist, the trick is to read a line break as "or" if it @@ -146,7 +146,7 @@ context), so you don't get the same kind of operator binding as in a programming language. -.SH /etc/exim4/local_sender_whitelist +.SH /etc/exim4/sender_local_deny_exceptions is an optional file containing a list of envelope senders messages will be accepted despite the address is also listed in /etc/exim4/local_sender_blacklist, overriding a blacklisting. diff -Nru exim4-4.72/debian/patches/40_dkimnotinpaniclog.diff exim4-4.72/debian/patches/40_dkimnotinpaniclog.diff --- exim4-4.72/debian/patches/40_dkimnotinpaniclog.diff 1970-01-01 01:00:00.000000000 +0100 +++ exim4-4.72/debian/patches/40_dkimnotinpaniclog.diff 2010-08-28 09:53:43.000000000 +0200 @@ -0,0 +1,21 @@ +From: John Jetmore <jj33@pobox.com> +Date: Sat, 12 Jun 2010 13:54:38 +0000 (+0000) +Subject: iaddressing bug 966 and my own concerns, stop sending non-panic error to panic log... +X-Git-Url: http://git.exim.org/exim.git/commitdiff_plain/d4f333f76f0904e18506a7e1964b33b3d39175c1 +Bug-Debian: http://bugs.debian.org/567876 + +iaddressing bug 966 and my own concerns, stop sending non-panic error to panic log in dkim.c +--- + +diff -NurBbp a/src/dkim.c b/src/dkim.c +--- a/src/dkim.c 2010-05-29 21:16:50.000000000 +0200 ++++ b/src/dkim.c 2010-08-28 09:52:19.000000000 +0200 +@@ -92,7 +92,7 @@ void dkim_exim_verify_finish(void) { + means there was a processing error somewhere along the way. + Log the incident and disable futher verification. */ + if (!dkim_collect_input) { +- log_write(0, LOG_MAIN|LOG_PANIC, "DKIM: Error while running this message through validation, disabling signature verification."); ++ log_write(0, LOG_MAIN, "DKIM: Error while running this message through validation, disabling signature verification."); + dkim_disable_verify = TRUE; + return; + } diff -Nru exim4-4.72/debian/patches/series exim4-4.72/debian/patches/series --- exim4-4.72/debian/patches/series 2010-06-03 17:35:40.000000000 +0200 +++ exim4-4.72/debian/patches/series 2010-08-28 09:40:15.000000000 +0200 @@ -4,6 +4,7 @@ 33_eximon.binary.dpatch 34_eximstatsmanpage.dpatch 35_install.dpatch +40_dkimnotinpaniclog.diff 50_localscan_dlopen.dpatch 60_convert4r4.dpatch 66_enlarge-dh-parameters-size.dpatch diff -Nru exim4-4.72/debian/po/da.po exim4-4.72/debian/po/da.po --- exim4-4.72/debian/po/da.po 2010-06-03 18:16:35.000000000 +0200 +++ exim4-4.72/debian/po/da.po 2010-10-30 13:38:43.000000000 +0200 @@ -1,25 +1,22 @@ -# translation of da.po to Danish +# Danish translation exim4. +# Copyright (C) 2010 exim4 & nedenstående oversættere. +# This file is distributed under the same license as the exim4 package. +# Claus Hindsgaul <claus.hindsgaul@gmail.com>, 2004, 2006. +# Joe Hansen (joedalton2@yahoo.dk), 2010. # -# This file is from the DDTP, the Debian Description Translation Project -# -# See http://ddtp.debian.org/ for more information. -# -# Claus Hindsgaul <claus_h@image.dk>, 2004. -# Claus Hindsgaul <claus.hindsgaul@gmail.com>, 2006. msgid "" msgstr "" -"Project-Id-Version: da\n" +"Project-Id-Version: exim4\n" "Report-Msgid-Bugs-To: pkg-exim4-maintainers@lists.alioth.debian.org\n" "POT-Creation-Date: 2007-07-18 08:29+0200\n" -"PO-Revision-Date: 2006-10-14 14:27+0200\n" -"Last-Translator: Claus Hindsgaul <claus.hindsgaul@gmail.com>\n" -"Language-Team: Danish\n" +"PO-Revision-Date: 2010-08-12 17:30+01:00\n" +"Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n" +"Language-Team: Danish <debian-l10n-danish@lists.debian.org> \n" "Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "org>\n" -"X-Generator: KBabel 1.11.4\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" # Template: exim4/purge_spool @@ -28,7 +25,6 @@ #. Type: boolean #. Description #: ../exim4-base.templates:1001 -#, fuzzy msgid "Remove undelivered messages in spool directory?" msgstr "Fjern ikke-leverede breve i kø-mappen?" @@ -36,26 +32,24 @@ #. Type: boolean #. Description #: ../exim4-base.templates:1001 -#, fuzzy msgid "" "There are e-mail messages in the Exim spool directory /var/spool/exim4/" "input/ which have not yet been delivered. Removing Exim will cause them to " "remain undelivered until Exim is re-installed." msgstr "" -"Der er post i exims kø-mappe /var/spool/exim4/input, som ikke er blevet " +"Der er e-post i exims kø-mappe /var/spool/exim4/input, som ikke er blevet " "leveret endnu. Hvis du fjerner Exim, vil de ikke blive leveret, før Exim " "bliver geninstalleret." #. Type: boolean #. Description #: ../exim4-base.templates:1001 -#, fuzzy msgid "" "If this option is not chosen, the spool directory is kept, allowing the " "messages in the queue to be delivered at a later date after Exim is re-" "installed." msgstr "" -"Hvis denne indstilling ikke bliver valgt, vil kømappen blive bevaret, så " +"Hvis denne indstilling ikke bliver valgt, vil kø-mappen blive bevaret, så " "brevene i køen bliver leveret senere, når Exim er geninstalleret." #. Type: error @@ -69,13 +63,12 @@ #. Description #: ../exim4-base.templates:2001 ../exim4-daemon-heavy.templates:1001 #: ../exim4-daemon-light.templates:1001 ../exim4.templates:1001 -#, fuzzy msgid "" "Exim4 has its configuration factored out into a dedicated package, exim4-" "config. To reconfigure Exim4, use 'dpkg-reconfigure exim4-config'." msgstr "" "Exim4 har udskilt sin opsætning i en dertil oprettet pakke, exim4-config. " -"Hvis du vil sætte Exim4 op, så brug dpkg-reconfigure exim4-config." +"For at rekonfigurere Exim4 bruges 'dpkg-reconfigure exim4-config'." #. Type: select #. Choices @@ -87,7 +80,7 @@ #. this will break the choices shown to users #: ../exim4-config.templates:1001 msgid "internet site; mail is sent and received directly using SMTP" -msgstr "internet-sted; post sendes og modtages direkte med SMTP" +msgstr "internetsted; post sendes og modtages direkte med SMTP" #. Type: select #. Choices @@ -143,19 +136,18 @@ #. Description #: ../exim4-config.templates:1002 msgid "General type of mail configuration:" -msgstr "Overordnet post-opsætningstype:" +msgstr "Overordnet postopsætningstype:" #. Type: select #. Description #: ../exim4-config.templates:1002 msgid "" "Please select the mail server configuration type that best meets your needs." -msgstr "Vælg den type postopsætning, der bedst svarer til dine behov." +msgstr "Vælg venligst den postopsætningstype der bedst svarer til dine behov." #. Type: select #. Description #: ../exim4-config.templates:1002 -#, fuzzy msgid "" "Systems with dynamic IP addresses, including dialup systems, should " "generally be configured to send outgoing mail to another machine, called a " @@ -164,7 +156,7 @@ msgstr "" "System med dynamiske IP-adresser, herunder opkaldssystemer, skal generelt " "sættes op til at levere udgående post til en anden maskine, en såkaldt " -"\"smarthost\", da mange modtagersystemer på internettet blokerer indkommende " +"'smarthost', da mange modtagersystemer på internettet blokerer indkommende " "post fra dynamiske IP-adresser for at undgå spam." #. Type: select @@ -188,67 +180,61 @@ #. Type: boolean #. Description #: ../exim4-config.templates:2001 -#, fuzzy msgid "" "Until the mail system is configured, it will be broken and cannot be used. " "Configuration at a later time can be done either by hand or by running 'dpkg-" "reconfigure exim4-config' as root." msgstr "" "Indtil postsystemet er sat op, vil det være ude af funktion og kan ikke " -"benyttes. Du kan sætte det op senere, enten manuelt eller ved at køre \"dpkg-" -"reconfigure exim4-config\" som root." +"benyttes. Du kan sætte det op senere, enten manuelt eller ved at køre 'dpkg-" +"reconfigure exim4-config' som root." #. Type: string #. Description #: ../exim4-config.templates:3001 msgid "System mail name:" -msgstr "System-postnavn:" +msgstr "Systempostnavn:" #. Type: string #. Description #: ../exim4-config.templates:3001 -#, fuzzy msgid "" "The 'mail name' is the domain name used to 'qualify' mail addresses without " "a domain name." msgstr "" -"\"postnavnet\" er det domænenavn, der benyttes til at \"kvalificere\" " +"'postnavnet' er det domænenavn, der benyttes til at 'kvalificere' " "postadresser uden domænenavn." # #. Type: string #. Description #: ../exim4-config.templates:3001 -#, fuzzy msgid "" "This name will also be used by other programs. It should be the single, " "fully qualified domain name (FQDN)." msgstr "" "Dette navn vil også blive brugt af andre programmer. Det bør være et enkelt, " -"fuldt domænenavn (FQDN)." +"fuldt kvalificeret domænenavn (FQDN)." #. Type: string #. Description #: ../exim4-config.templates:3001 -#, fuzzy msgid "" "Thus, if a mail address on the local host is foo@example.org, the correct " "value for this option would be example.org." msgstr "" -"Hvis din e-post adresse på den lokale maskine f.eks. var foo@domaene." -"eksempel, ville den rigtige værdi til denne indstilling være domaene." -"eksempel." +"Hvis en e-post-adresse på den lokale maskine f.eks. er foo@eksempel.org, vil " +"den rigtige værdi til denne indstilling være eksempel.org." #. Type: string #. Description #: ../exim4-config.templates:3001 -#, fuzzy msgid "" "This name won't appear on From: lines of outgoing messages if rewriting is " "enabled." msgstr "" -"Dette navn vil ikke optræde i \"From:\"-linjerne i udgående breve, hvis " -"omskrivning er aktiveret." +"Dette navn vil ikke optræde i From:-linjerne (Fra-linjerne) i udgående " +"breve, hvis omskrivning er aktiveret." #. Type: string #. Description @@ -260,16 +246,16 @@ #. Type: string #. Description #: ../exim4-config.templates:4001 -#, fuzzy msgid "" "Please enter a semicolon-separated list of recipient domains for which this " "machine should consider itself the final destination. These domains are " "commonly called 'local domains'. The local hostname (${fqdn}) and " "'localhost' are always added to the list given here." msgstr "" -"Angiv en liste adskilt med semikolon over modtegerdomæner, for hvilke denne " -"maskine skal betragte sig som endestations, udover det lokale værtsnavn " -"(${fqdn}) og \"localhost\". Disse domæner kaldes ofte \"lokale domæner\"." +"Angiv en liste adskilt med semikolon over modtagerdomæner, for hvilke denne " +"maskine skal betragte sig som endestation. Disse domæner kaldes normalt " +"'lokale domæner'. Det lokale værtsnavn (${fqdn}) og 'localhost' tilføjes " +"altid til den her anførte liste." # #. Type: string @@ -290,7 +276,7 @@ #. Description #: ../exim4-config.templates:5001 msgid "Domains to relay mail for:" -msgstr "Domæner at videresende (\"relay\") post for:" +msgstr "Domæner at videresende (»relay«) post for:" #. Type: string #. Description @@ -303,31 +289,30 @@ msgstr "" "Angiv en liste adskilt med semikolon over modtagerdomæner, dette system skal " "videresende post for - for eksempel som reserve-MX eller post-gateway. Det " -"betyder at dette system vil acceptere post til disse domæner fra ethvert " +"betyder, at dette system vil acceptere post til disse domæner fra ethvert " "sted på internettet og levere dem efter de lokale leveringsregler." #. Type: string #. Description #: ../exim4-config.templates:5001 msgid "Do not mention local domains here. Wildcards may be used." -msgstr "Nævn ikke lokale domæner her. Du kan godt bruge wildcards." +msgstr "Nævn ikke lokale domæner her. Du kan godt bruge jokertegn (wildcards)." #. Type: string #. Description #: ../exim4-config.templates:6001 msgid "Machines to relay mail for:" -msgstr "Maskiner at videresende (\"relay\") post for:" +msgstr "Maskiner at videresende (»relay«) post for:" #. Type: string #. Description #: ../exim4-config.templates:6001 -#, fuzzy msgid "" "Please enter a semicolon-separated list of IP address ranges for which this " "system will unconditionally relay mail, functioning as a smarthost." msgstr "" -"Angiv en lister adskilt med semikolon over IP-adresseområder, dette system " -"skal videresende post for, og dermed fungere som smarthost." +"Angiv en liste adskilt med semikolon over IP-adresseområder, dette system " +"ubetinget vil videresende post for, og dermed fungere som smarthost." # #. Type: string @@ -337,7 +322,7 @@ "You should use the standard address/prefix format (e.g. 194.222.242.0/24 or " "5f03:1200:836f::/48)." msgstr "" -"Du skal bruge det almindelige adresse/længde-format (f.eks. 194.222.242.0/24 " +"Du skal bruge det almindelige adresse-/længdeformat (f.eks. 194.222.242.0/24 " "eller 5f03:1200:836f::/48)." #. Type: string @@ -396,32 +381,30 @@ #. Type: string #. Description #: ../exim4-config.templates:8001 -#, fuzzy msgid "" "If the smarthost requires authentication, please refer to the Debian-" "specific README files in /usr/share/doc/exim4-base for notes about setting " "up SMTP authentication." msgstr "" -"Hvis smarthosten kræver autentifikation, kan du se, hvordan dette sættes op, " -"i bemærkningerne om opsætning af SMTP-autentifikation i filen /usr/share/doc/" -"exim4-base/README.Debian.gz." +"Hvis smarthosten kræver godkendelse, kan du se, hvordan dette sættes op, i " +"bemærkningerne om opsætning af SMTP-godkendelse i filen /usr/share/doc/exim4-" +"base/README.Debian.gz." #. Type: string #. Description #: ../exim4-config.templates:9001 msgid "Root and postmaster mail recipient:" -msgstr "Root og postmaster post-modtager:" +msgstr "Postmodtager for root og postmaster:" #. Type: string #. Description #: ../exim4-config.templates:9001 -#, fuzzy msgid "" "Mail for the 'postmaster', 'root', and other system accounts needs to be " "redirected to the user account of the actual system administrator." msgstr "" -"Post til \"postmaster\", \"root\" og andre systemkonti skal videresendes til " -"den virkelige systemadministrators brugerkonto." +"Post til 'postmaster', 'root' og andre systemkonti skal videresendes til den " +"virkelige systemadministrators brugerkonto." #. Type: string #. Description @@ -437,7 +420,6 @@ #. Type: string #. Description #: ../exim4-config.templates:9001 -#, fuzzy msgid "" "Note that postmaster's mail should be read on the system to which it is " "directed, rather than being forwarded elsewhere, so (at least one of) the " @@ -447,14 +429,13 @@ "Bemærk at post til postmaster normalt skal læses på det system, det er " "omdirigeret til, fremfor at videresende den til andre steder, så (mindst en " "af) de brugere, du vælger, bør ikke omdirigere deres post væk fra denne " -"maskine. Man kan gennemtvinge lokal levering ved at skrive \"real-\" foran " +"maskine. Man kan gennemtvinge lokal levering ved at skrive 'real-' foran " "adressen." # #. Type: string #. Description #: ../exim4-config.templates:9001 -#, fuzzy msgid "Multiple user names need to be separated by spaces." msgstr "Ved angivelse af flere brugernavne, skal disse adskilles af mellemrum." @@ -491,7 +472,6 @@ #. Type: string #. Description #: ../exim4-config.templates:10001 -#, fuzzy msgid "" "If this system only receives mail directly from local services (and not from " "other hosts), it is suggested to prohibit external connections to the local " @@ -500,11 +480,12 @@ "when 127.0.0.1 is entered here, as this will disable listening on public " "network interfaces." msgstr "" -"Hvis dette system kun modtager e-post direkte fra lokale servicessom " -"fetchmail eller dit e-post program (MUA), snakker til localhost (og ikke fra " -"andre maskiner), bør du forbyde eksterne forbindelser til den lokale Exim. " -"Dette gøres ved at sætte denne indstilling til 127.0.0.1. Dermed deaktiverer " -"du lytning på offentligt tilgængelige netforbindelser." +"Hvis dette system kun modtager e-post direkte fra lokale tjenester (og ikke " +"fra andre værter), anbefales det at forbyde eksterne forbindelser til den " +"lokale Eximdæmon. Sådanne tjenester inkluderer e-post-programmer (MUA'er) " +"som kun snakker med localhost (lokalvært) samt fetchmail. Eksterne " +"forbindelser er umulige når 127.0.0.1 indtastes her, da dette vil deaktivere " +"lytning på offentligt tilgængelige netforbindelser." # Template: exim4/dc_minimaldns # ddtp-prioritize: 43 @@ -541,9 +522,9 @@ msgstr "" "Hvis dette system ikke har permanent adgang til en DNS-navneserver (f.eks. " "hvis internetadgangen foregår via en opkaldsforbindelse), kan dette have " -"uønskede konsekvenser. For eksempel kan det opkaldsforbindelsen blive " -"aktiveret under opstarten eller når Exim kigger køen igennem (også selv om " -"der ikke er nogen ventende beskeder)." +"uønskede konsekvenser. For eksempel kan opstart af Exim eller kørsel af køen " +"(også selv om der ikke er nogen ventende beskeder) udløse en dyr " +"opringningshændelse." #. Type: boolean #. Description @@ -573,16 +554,15 @@ #. Type: boolean #. Description #: ../exim4-config.templates:13001 -#, fuzzy msgid "" "The Debian exim4 packages can either use 'unsplit configuration', a single " "monolithic file (/etc/exim4/exim4.conf.template) or 'split configuration', " "where the actual Exim configuration files are built from about 50 smaller " "files in /etc/exim4/conf.d/." msgstr "" -"Debians exim4-pakker kan enten bruge en \"ikke-opdelt opsætning\", en enkelt " -"monolitisk fil (/etc/exim4/exim4.conf.template) eller \"opdelt opsætning\", " -"hvor opsætningen beskrives i omkring 50 mindre filer i /etc/exim4/conf.d/." +"Debians exim4-pakker kan enten bruge en 'ikke-opdelt opsætning', en enkelt " +"monolitisk fil (/etc/exim4/exim4.conf.template) eller 'opdelt opsætning', " +"hvor opsætningen beskrives i omkring 50 mindre filer i /etc/exim4/conf.d/." #. Type: boolean #. Description @@ -600,13 +580,12 @@ #. Type: boolean #. Description #: ../exim4-config.templates:13001 -#, fuzzy msgid "" "A more detailed discussion of split and unsplit configuration can be found " "in the Debian-specific README files in /usr/share/doc/exim4-base." msgstr "" "Der er en mere detaljeret diskussion om ikke-opdelte og opdelte opsætninger " -"i /usr/share/doc/exim4-base/README.Debian.gz." +"i de Debianspecifikke README-filer i /usr/share/doc/exim4-base." #. Type: boolean #. Description @@ -617,7 +596,6 @@ #. Type: boolean #. Description #: ../exim4-config.templates:14001 -#, fuzzy msgid "" "The headers of outgoing mail can be rewritten to make it appear to have been " "generated on a different system. If this option is chosen, '${mailname}', " @@ -625,9 +603,9 @@ "Path are rewritten." msgstr "" "Brevhovederne i udgående post kan omskrives, så de lader til at være " -"genereret på det andet system. Hvis denne indstilling aktiveres, erstattes " -"\"${mailname}\" \"localhost\" og \"${dc_other_hostnames}\" i felterne From, " -"Reply-To, Sender og Return-Path." +"genereret på et andet system. Hvis denne indstilling vælges, genskrives " +"'${mailname}', 'localhost' og '${dc_other_hostnames}' i felterne From, Reply-" +"To, Sender og Return-Path." #. Type: select #. Choices @@ -668,326 +646,5 @@ "Please note that most mail tools in Debian expect the local delivery method " "to be mbox in their default." msgstr "" -"Bemærk, at de fleste postværktøjer i Debian som udgangspunkt forventer at " +"Bemærk, at de fleste postværktøjer i Debian som udgangspunkt forventer, at " "den lokale post leveres i mbox-formatet." - -#~ msgid "Leaving this list blank will have Exim do no local deliveries." -#~ msgstr "" -#~ "Hvis feltet efterlades tomt, vil Exim ikke gennemføre lokale leveringer." - -# -#~ msgid "" -#~ "Be aware that this works only one-way, exim4 can handle exim(v3)'s spool " -#~ "but not the other way round." -#~ msgstr "" -#~ "Bemærk at dette kun virker den ene vej. exim4 kan håndtere exim(v3)'s kø, " -#~ "men exim(3) kan ikke håndtere exim4's." - -# -#~ msgid "" -#~ "Move the mails only if you don't plan to go back to exim(v3), otherwise " -#~ "the mail shouldn't be moved now but manually once you've converted your " -#~ "setup." -#~ msgstr "" -#~ "Acceptér, hvis du ikke regner med at bruge exim(v3) igen, ellers bør " -#~ "posten ikke blive flyttet automatisk endnu, men flyttes manuelt når du " -#~ "har ændret din opsætning." - -# -#~ msgid "" -#~ "If there are any more, enter them here, separated by semicolons. You may " -#~ "leave this blank if there are none." -#~ msgstr "" -#~ "Hvis der er flere, kan du angive dem her adskilt med semikolon. Du kan " -#~ "lade feltet stå tomt, hvis der ikke er nogen." - -#~ msgid "" -#~ "Please enter here the domains for which this system will relay mail, for " -#~ "example as a fallback MX or mail gateway." -#~ msgstr "" -#~ "Angiv de domæner, dette system vil videresende (\"relay\") post for, for " -#~ "eksempel som en reserve-MX eller post-gateway." - -# -#~ msgid "" -#~ "Such domains are domains for which you are prepared to accept mail from " -#~ "anywhere on the Internet. Do not mention local domains here." -#~ msgstr "" -#~ "Disse domæner er domæner, som du er villig til at acceptere post til fra " -#~ "ethvert sted på internettet. Nævn ikke lokale domæner her." - -# -#~ msgid "" -#~ "The domains entered here should be separated by semicolons. Wildcards may " -#~ "be used." -#~ msgstr "" -#~ "De domæner, du angav her, skal adskilles med semikolon. Du kan godt bruge " -#~ "wildcards her." - -# -#~ msgid "" -#~ "Since you enabled hiding the local mailname in outgoing mail, you must " -#~ "specify the domain name to use for mail from local users; typically this " -#~ "is the machine on which you normally receive your mail." -#~ msgstr "" -#~ "Da du har aktiveret skjulning af det lokale postnavn i udgående post, " -#~ "skal du angive det domænenavn, der skal bruges i post fra lokale brugere. " -#~ "Det vil typisk være navnet på den maskine, du normalt modtager post på." - -# -#~ msgid "Where will your users read their mail?" -#~ msgstr "Hvor vil dine brugere læse deres post?" - -#~ msgid "Machine handling outgoing mail for this host (smarthost):" -#~ msgstr "Maskine, der håndterer udgående post for denne maskine (smarthost):" - -# -#~ msgid "Enter the hostname of the machine to which outgoing mail is sent." -#~ msgstr "Angiv værtsnavnet på den maskine, udgående post skal sendes til." - -#~ msgid "" -#~ "Mail for the \"postmaster\", \"root\", and other system accounts is " -#~ "usually redirected to the user account of the actual system " -#~ "administrator. If you leave this value empty, such mail will be saved in /" -#~ "var/mail/mail, which is not recommended. Note that postmaster's mail " -#~ "should be read on the system to which it is directed, rather than being " -#~ "forwarded elsewhere, so (at least one of) the users you choose should not " -#~ "redirect their mail off this machine. Use a \"real-\" prefix to force " -#~ "local delivery." -#~ msgstr "" -#~ "Post til \"postmaster\", \"root\" og andre systemkonti bliver normalt " -#~ "omdirigeret til systemadministratorens brugerkonto. Hvis du lader dette " -#~ "felt stå tomt, vil den slags post blive gemt i /var/mail/mail, hvilket " -#~ "ikke anbefales. Bemærk at postmasters post bør læses på det system, " -#~ "hvortil det er sendt, fremfor at blive videresendt andre steder hen, så " -#~ "(i det mindste en af) de brugere, du vælger, ikke bør videresende deres " -#~ "post væk fra denne maskine. Skriv \"real-\" foran brugernavnet for at " -#~ "gennemtvinge lokal levering." - -# -#~ msgid "" -#~ "Enable this feature if you are using Dial-on-Demand; otherwise, disable " -#~ "it." -#~ msgstr "" -#~ "Aktivér denne funktion hvis du bruger en opkaldsforbindelse, ellers ikke." - -#~ msgid "Select the mail server configuration type that best fits your needs." -#~ msgstr "" -#~ "Vælg den type postserver-opsætning, der bedst svarer til dine behov." - -#~ msgid "If you are unsure then you should not use split configuration." -#~ msgstr "Hvis du er usikker, bør du ikke benytte den opdelte opsætning." - -#~ msgid "manually convert from handcrafted Exim v3 configuration" -#~ msgstr "oversæt manuelt fra håndlavet Exim v3-opsætning" - -#~ msgid "Configure Exim4 manually?" -#~ msgstr "Sæt Exim4 op manuelt?" - -# -#~ msgid "" -#~ "You indicated that you have a handcrafted Exim 3 configuration. To " -#~ "convert this to Exim 4, you can use the exim_convert4r4(8) tool after the " -#~ "installation. Consult /usr/share/doc/exim4-base/examples/example.conf.gz " -#~ "and /usr/share/doc/exim4-base/README.Debian.gz!" -#~ msgstr "" -#~ "Du har angivet at du har en håndlavet Exim v3-opsætning. For at omsætte " -#~ "den til Exim v4, kan du bruge værktøjet exim_convert4r4(8) efter " -#~ "installationen. Se i /usr/share/doc/exim4-base/examples/example.conf.gz " -#~ "og /usr/share/doc/exim4-base/README.Debian.gz!" - -#~ msgid "" -#~ "Until your mail system is configured, it will be broken and cannot be " -#~ "used." -#~ msgstr "" -#~ "Indtil dit postsystem er sat op, vil det være ude af funktion og kan ikke " -#~ "benyttes." - -# -#~ msgid "" -#~ "Your \"mail name\" is the hostname portion of the address to be shown on " -#~ "outgoing news and mail messages (following the username and @ sign) " -#~ "unless hidden with rewriting." -#~ msgstr "" -#~ "Dit 'postnavn' (\"mail name\") er værtsnavn-delen af den adresse, der " -#~ "bliver vist i udgående nyheds- og postbeskeder (det der står efter " -#~ "brugernavnet og @-tegnet), medmindre det skjules med omskrivning." - -# -#~ msgid "" -#~ "Please enter here the networks of local machines for which you accept to " -#~ "relay the mail." -#~ msgstr "" -#~ "Angiv her de netværk af lokale maskiner, som du ønsker at at videresende " -#~ "(\"relay\") post for." - -#~ msgid "" -#~ "This should include a list of all machines that will use us as a " -#~ "smarthost." -#~ msgstr "" -#~ "Dette bør indeholde en liste over alle maskiner, der vil bruge os som " -#~ "\"smarthost\"." - -# -#~ msgid "" -#~ "You need to double the colons in IPv6 addresses (e.g. " -#~ "5f03::1200::836f::::/48)" -#~ msgstr "" -#~ "Du skal bruge dobbelt-kolon i IPv6-adressesr (f.eks. " -#~ "5f03::1200::836f::::/48)" - -# -#~ msgid "" -#~ "Enter a colon-separated list of IP-addresses to listen on. You need to " -#~ "double the colons in IPv6 addresses (e.g. 5f03::1200::836f::::)." -#~ msgstr "" -#~ "Angiv en kolon-separeret liste med IP-adresser, der skal lyttes på. Du " -#~ "skal bruge dobbelte koloner i IPv6-adresser (f.eks. 5f03::1200::836f::::)." - -#~ msgid "Configuring Exim v4 (exim4-config)" -#~ msgstr "Sætter Exim v4 op (exim4-config)" - -# -#~ msgid "" -#~ "If you are configuring this system without local mail delivery this name " -#~ "won't appear on From: lines of mail, as rewriting is used." -#~ msgstr "" -#~ "Hvis du sætter dette system op uden lokal postlevering, vil dette navn " -#~ "ikke optræde i brevenes From:-linjer, da der i så tilfælde benyttes " -#~ "omskrivning." - -# -#~ msgid "" -#~ "Obviously, any machines that use us as a smarthost have to be excluded " -#~ "from the relaying controls, as using us to relay mail for them is the " -#~ "whole point." -#~ msgstr "" -#~ "Selvfølgelig skal alle maskiner, der benytter os som postserver " -#~ "(smarthost) ekskluderes fra videresendelses-styringen, da det jo er hele " -#~ "idéen at videresende post for dem." - -# -#~ msgid "" -#~ "Mail for the \"postmaster\" and \"root\" accounts is usually redirected " -#~ "to one or more user accounts of the actual system administrators. The " -#~ "default is to set things up so that mail for \"postmaster\" and for " -#~ "various system accounts is redirected to \"root\", and mail for \"root\" " -#~ "is redirected to a real user. This can be changed by editing /etc/" -#~ "aliases." -#~ msgstr "" -#~ "Post til kontiene \"postmaster\" og \"root\" bliver normalt omdirigeret " -#~ "til en eller flere brugerkonti, som tilhører de virkelige " -#~ "systemadministratorer. Som udgangspunkt vil jeg sætte tingene op sådan at " -#~ "post til \"postmaster\" og diverse systemkonti bliver omadresseret til " -#~ "\"root\", og post til \"root\" bliver omadresseret til en virkelig " -#~ "bruger. Dette kan rettes ved at ændre i /etc/aliases." - -# -#~ msgid "" -#~ "System administrator mail goes to which user accounts? Enter one or more " -#~ "usernames separated by spaces or commas. Enter \"none\" if you do not " -#~ "want to redirect the mail. - NB this is strongly discouraged. Exim cannot " -#~ "run deliveries as root and will save the mail to /var/mail/mail Also, " -#~ "note that usernames should be lowercase!" -#~ msgstr "" -#~ "Hvilke brugerkonti skal systemadministratorens post sendes til? Angiv et " -#~ "eller flere brugernavne adskilt med mellemrum eller komma. Skriv \"none" -#~ "\", hvis du vil beholde posten i root's postboks. Bemærk at det sidste " -#~ "frarådes kraftigt. Husk også at brugernavne skal skrives med små " -#~ "bogstaver." - -#~ msgid "" -#~ "internet site; mail is sent and received directly using SMTP, mail sent " -#~ "by smarthost; received via SMTP or fetchmail, mail sent by smarthost; no " -#~ "local mail, local delivery only; not on a network, manually convert from " -#~ "handcrafted Exim v3 configuration, no configuration at this time" -#~ msgstr "" -#~ "internet-sted; post sendes og modtages direkte med SMTP, post sendt af " -#~ "smarthost; hentet via SMTP eller fetchmail, post sendt af smarthost; " -#~ "ingen lokal post, kun lokal levering; ikke på et netværk, oversæt manuelt " -#~ "fra håndlavet Exim v3-opsætning, ingen opsætning endnu" - -# -#~ msgid "" -#~ "Internet site - mail is sent and received directly using SMTP. If your " -#~ "needs don't fit neatly into any category, you probably want to start with " -#~ "this one and then edit the config file by hand." -#~ msgstr "" -#~ "Internetsted - post sendes og modtages direkte med SMTP. Hvis dit behov " -#~ "falder indenfor denne kategori, vil du sikkert starte med dette valg og " -#~ "redigere opsætningsfilen i hånden." - -# -#~ msgid "" -#~ "Internet site using smarthost - You receive Internet mail on this " -#~ "machine, either directly by SMTP or by running a utility such as " -#~ "fetchmail. Outgoing mail is sent using a smarthost. optionally with " -#~ "addresses rewritten. This is probably what you want for a dialup system." -#~ msgstr "" -#~ "Internetsted med 'smarthost' - Du modtager internet-post på denne " -#~ "maskine, enten direkte med SMTP eller ved hjælp af et værktøj som f.eks. " -#~ "fetchmail. Udgående post sendes til en postserver ('smarthost'), " -#~ "eventuelt med en omskrevet afsenderadresse. Hvis du bruger en " -#~ "opkaldsforbindelse, er det sikkert dette, du har brug for." - -# -#~ msgid "" -#~ "Satellite system - All mail is sent to another machine, called a \"smart " -#~ "host\" for delivery. root and postmaster mail is delivered according to /" -#~ "etc/aliases. No regular mail is delivered locally." -#~ msgstr "" -#~ "Sattelitsystem - Al post sendes via en anden maskine, en såkaldt " -#~ "'smarthost'. Post til root og postmaster leveres som beskrevet i /etc/" -#~ "aliases. Ingen post leveres lokalt." - -# -#~ msgid "" -#~ "Local delivery only - You are not on a network. Mail for local users is " -#~ "delivered." -#~ msgstr "" -#~ "Kun lokal levering - Du er ikke på et netværk. Post til lokale brugere " -#~ "vil blive leveret." - -# -#~ msgid "Should they be removed?" -#~ msgstr "Skal de fjernes?" - -# -#~ msgid "You must choose one of the options below:" -#~ msgstr "Du skal vælge en af nedenstående muligheder:" - -# Template: exim4/mailname -# ddtp-prioritize: 43 -# -#~ msgid "`mail name' of your system, (not visible for satellite-system)" -#~ msgstr "Dit systems 'postnavn' (ikke synligt for sattelitsystemer)" - -# Template: exim4/dc_other_hostnames -# ddtp-prioritize: 43 -# -#~ msgid "Accept mail for which other destinations? (blank for none)" -#~ msgstr "Hvilke andre destinationer vil du acceptere post fra?" - -# Template: exim4/dc_relay_domains -# ddtp-prioritize: 43 -# -#~ msgid "Relay for which domains?" -#~ msgstr "Videresend post for hvilke domæner?" - -# Template: exim4/dc_relay_nets -# ddtp-prioritize: 43 -# -#~ msgid "Allow relaying for which machines?" -#~ msgstr "For hvilke domæner skal videresendelse tillades?" - -# Template: exim4/dc_smarthost -# ddtp-prioritize: 43 -# -#~ msgid "Which machine will act as the smarthost and handle outgoing mail?" -#~ msgstr "Hvilken maskine fungerer som postserver og håndterer udgående post?" - -# Template: exim4/dc_postmaster -# ddtp-prioritize: 43 -# -#~ msgid "Who is to receive root and postmaster mail?" -#~ msgstr "Hvem skal modtage post til root og postmaster?" diff -Nru exim4-4.72/debian/po/ru.po exim4-4.72/debian/po/ru.po --- exim4-4.72/debian/po/ru.po 2010-06-03 18:16:35.000000000 +0200 +++ exim4-4.72/debian/po/ru.po 2010-10-30 13:38:43.000000000 +0200 @@ -318,8 +318,9 @@ "Please enter a semicolon-separated list of IP address ranges for which this " "system will unconditionally relay mail, functioning as a smarthost." msgstr "" -"Введите список диапазонов IP-адресов, разделённых двоеточиями, с которых вы " -"безусловно разрешаете релейную передачу почты, играя для них роль smarthost." +"Введите список диапазонов IP-адресов, разделённых точками с запятой, с " +"которых вы безусловно разрешаете релейную передачу почты, играя для них роль " +"smarthost." #. Type: string #. Description @@ -454,7 +455,7 @@ "Please enter a semicolon-separated list of IP addresses. The Exim SMTP " "listener daemon will listen on all IP addresses listed here." msgstr "" -"Введите список IP-адресов, разделённых двоеточиями. Демон Exim, " +"Введите список IP-адресов, разделённых точками с запятой. Демон Exim, " "прослушивающий SMTP, будет прослушивать все IP-адреса, указанные здесь." #. Type: stringAttachment: signature.asc
Description: Digital signature
--- End Message ---
--- Begin Message ---
- To: Andreas Metzler <ametzler@downhill.at.eu.org>, 603337-done@bugs.debian.org
- Subject: Re: Bug#603337: unblock: exim4/4.72-2
- From: "Adam D. Barratt" <adam@adam-barratt.org.uk>
- Date: Sat, 13 Nov 2010 11:47:06 +0000
- Message-id: <1289648826.3322.5107.camel@hathi.jungle.funky-badger.org>
- In-reply-to: <[🔎] 20101113081209.GA30609@downhill.g.la>
- References: <[🔎] 20101113081209.GA30609@downhill.g.la>
On Sat, 2010-11-13 at 09:12 +0100, Andreas Metzler wrote: > * 40_dkimnotinpaniclog.diff pulled from upstream git. Stop logging > non-critical DKIM errors in paniclog. Closes: #567876 > > Exim4's paniclog is reserved for serious issues. I could really like > to see this in squeeze. > > * Debconf translations updates: dk, ru. > * Documentation updates: > + fix exim4-config_files man page, mention > {host|sender}_local_deny_exceptions instead of > local_{host|sender}_whitelist. Thanks to Fabien André in #578176 > + Re-work config.autogenerated header to more exactly reflect > configuration source. (mh) Closes: #593984 > > Some minor stuff: > * add !acl = acl_local_deny_exceptions to defer stanzas in SPF code. > Thanks to Fabien André. Closes: #578176 > * Fix getopt invocation to make update-exim4.conf.template -o work. (Thank > you Matthew W. S. Bell) Closes: #590333 Unblocked; thanks. Regards, Adam
--- End Message ---