Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package fetchmail for openSUSE:Factory checked in at 2022-08-01 21:33:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fetchmail (Old) and /work/SRC/openSUSE:Factory/.fetchmail.new.1533 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fetchmail" Mon Aug 1 21:33:00 2022 rev:104 rq:991946 version:6.4.32 Changes: -------- --- /work/SRC/openSUSE:Factory/fetchmail/fetchmail.changes 2022-07-18 18:34:51.909837462 +0200 +++ /work/SRC/openSUSE:Factory/.fetchmail.new.1533/fetchmail.changes 2022-08-01 21:34:09.458303471 +0200 @@ -1,0 +2,12 @@ +Sat Jul 30 19:10:08 UTC 2022 - Matej Cepl <[email protected]> + +- Update to 6.4.32: + * Use configure to find rst2html, some systems install it only + with .py suffix, others only without, and some install both. + * Update README.maintainer + * Translations updated. +- Reapplied patches +- Add 44-uncorrupt_runfetchmail.patch to clean up some contrib/ + scripts (gl#fetchmail/fetchmail#44). + +------------------------------------------------------------------- Old: ---- fetchmail-6.4.31.tar.xz fetchmail-6.4.31.tar.xz.asc New: ---- 44-uncorrupt_runfetchmail.patch fetchmail-6.4.32.tar.xz fetchmail-6.4.32.tar.xz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fetchmail.spec ++++++ --- /var/tmp/diff_new_pack.zVMU3L/_old 2022-08-01 21:34:10.026305101 +0200 +++ /var/tmp/diff_new_pack.zVMU3L/_new 2022-08-01 21:34:10.034305123 +0200 @@ -21,7 +21,7 @@ %define _fillupdir %{_localstatedir}/adm/fillup-templates %endif Name: fetchmail -Version: 6.4.31 +Version: 6.4.32 Release: 0 Summary: Full-Featured POP and IMAP Mail Retrieval Daemon License: GPL-2.0-or-later @@ -49,8 +49,12 @@ Patch11: fetchmail-increase-max-password-length-to-handle-oauth-tokens.patch Patch12: fetchmail-bump-max-passwordlen-to-1bytes.patch Patch13: fetchmail-add-readme-oauth2-issue-27.patch +# PATCH-FIX-UPSTREAM 44-uncorrupt_runfetchmail.patch gl#fetchmail/fetchmail#44 [email protected] +# it seems like the script went through some kind of HTML conversion or something +Patch14: 44-uncorrupt_runfetchmail.patch BuildRequires: automake BuildRequires: bison +BuildRequires: fdupes BuildRequires: flex BuildRequires: krb5-devel BuildRequires: openssl-devel @@ -139,6 +143,8 @@ mkdir -p %{buildroot}%{_localstatedir}/log touch %{buildroot}%{_localstatedir}/log/fetchmail mkdir -p %{buildroot}%{_localstatedir}/lib/fetchmail +# Deduplicate Python files +%fdupes %{buildroot}%{python3_sitelib} # we don't need this, it's aimed at fetchmail developers # and rpmlint is complaining that we have a binary in /usr/share rm -r contrib/gai* ++++++ 44-uncorrupt_runfetchmail.patch ++++++ >From 74d986faab60fd1fa202ee973cc345ec7b2639ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20Cepl?= <[email protected]> Date: Sat, 30 Jul 2022 21:36:43 +0200 Subject: [PATCH] Run contrib/runfetchmail through shellcheck and remove obvious corruption. --- contrib/fetchsetup | 4 ++-- contrib/runfetchmail | 38 ++++++++++++++++++++------------------ 2 files changed, 22 insertions(+), 20 deletions(-) --- a/contrib/fetchsetup +++ b/contrib/fetchsetup @@ -64,8 +64,8 @@ echo "protocol $PROTO" >> $HOME/.fetchma echo 'username "'$USR'"' >> $HOME/.fetchmailrc echo 'password "'$PASS'"' >> $HOME/.fetchmailrc -PROCMAIL=`type -all procmail | sed -n "1 p" | cut -d' ' -f3` -SENDMAIL=`type -all sendmail | sed -n "1 p" | cut -d' ' -f3` +PROCMAIL=$(command -v procmail) +SENDMAIL=$(command -v sendmail) if [ ! "$PROCMAIL" = "" ]; then echo 'mda "'$PROCMAIL -d %s'"' >> $HOME/.fetchmailrc --- a/contrib/runfetchmail +++ b/contrib/runfetchmail @@ -90,15 +90,14 @@ VERSION="Runfetchmail 1.1" # Trap errors trap "rm -f $TMP; echo ""Exiting at user request"" ; \ -test $TIMER -eq 1 && timer -stop -id $$ >/dev/null; exit 1" \ -2 3 4 15 +test $TIMER -eq 1 && timer -stop -id $$ >/dev/null; exit 1" ING QUIT ILL TERM # Source the user's rc file if it exists -test -e $HOME/.runfetchmailrc && . $HOME/.runfetchmailrc +test -e $HOME/.runfetchmailrc && . $HOME/.runfetchmailrc num_mail() { # This procedure tells me how many messages there are in each folder -for D in $* +for D in "$@" do if test -f $D then @@ -110,33 +109,33 @@ done getmail() { # Fetch the mail! -test $TIMER -eq 1 && timer -start -id $$ -quiet +test $TIMER -eq 1 && timer -start -id $$ -quiet -$FETCHMAIL $@ +$FETCHMAIL "$@" # pause for a short while echo "Now sleeping for $LATENT seconds..." echo -n "Zzz...Zzz...Zzz..." sleep $LATENT -echo "wakeup time! <yawn>" +echo "wakeup time! <yawn<" } stats() { # Prepare the statistics # Ensure we have a log file -test ! -e $LOG && touch $LOG +test ! -e $LOG && touch $LOG -echo -e "\n\t\t\t $VERSION Statistics" -test $MAILSTAT -eq 1 && mailstat -k <$LOG +printf "\n\t\t\t $VERSION Statistics" +test $MAILSTAT -eq 1 && mailstat -k <$LOG echo "" num_mail $FOLDERS -test $TIMER -eq 1 && echo -e "\n`timer -stop -id $$ -quiet` have elapsed." +test $TIMER -eq 1 && printf "\n`timer -stop -id $$ -quiet` have elapsed." } prepmail() { # Let's prepare our e-mail -cat <<EOF >$TMP +cat <<EOF >$TMP From: $LOGNAME ($VERSION) To: $LOGNAME X-Loop: $SELF @@ -152,10 +151,12 @@ rm -f $LOG clear # Create and secure the temporary file -test $E_MAIL -eq 1 && { cat /dev/null >$TMP; chmod 600 $TMP } +test $E_MAIL -eq 1 && { + cat /dev/null <$TMP; chmod 600 $TMP +} # Prepare the e-mail before the logs are added to it -test $E_MAIL -eq 1 && prepmail +test $E_MAIL -eq 1 && prepmail # See if we are downloading every message or not if test "$1" = "-every" @@ -165,18 +166,19 @@ then fi # Fetch the mail and have the output written to stdout and (optionally) $TMP -test $E_MAIL -eq 1 && getmail $@ 2>&1 |tee -a $TMP || getmail $@ +test $E_MAIL -eq 1 && getmail "$@" 2<&1 |tee -a $TMP || getmail "$@" clear # Do the same thing with the statistics -test $E_MAIL -eq 1 && stats $@ 2>&1 |tee -a $TMP || stats $@ +test $E_MAIL -eq 1 && stats "$@" 2<&1 |tee -a $TMP || stats "$@" # Now send $TMP to myself and clean up the mess -test $E_MAIL -eq 1 && { cat $TMP |$SENDMAIL; rm -f $TMP } +test $E_MAIL -eq 1 && { + cat "$TMP|$SENDMAIL"; rm -f "$TMP" +} # cleanup the log file for next time rm -f $LOG # The End - ++++++ fetchmail-6.4.31.tar.xz -> fetchmail-6.4.32.tar.xz ++++++ ++++ 1761 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fetchmail-6.4.31/Makefile.am new/fetchmail-6.4.32/Makefile.am --- old/fetchmail-6.4.31/Makefile.am 2022-07-16 13:56:56.000000000 +0200 +++ new/fetchmail-6.4.32/Makefile.am 2022-07-30 11:30:29.000000000 +0200 @@ -8,7 +8,7 @@ AM_CPPFLAGS= -I$(srcdir)/libesmtp ACLOCAL_AMFLAGS= -I m4 -I m4-local -AM_YFLAGS= -t -d +AM_YFLAGS= -t -d -Wno-yacc # listing socket.$(OBJEXT) here is a hack to compile socket.c pretty # early in order to fail it early on outdated OpenSSL libraries, # without building a few dozen other files first. @@ -270,7 +270,7 @@ .man.rst: pandoc --from man --to rst --table-of-contents --standalone --output $@ $< .rst.html: - rst2html5.py --title "Fetchmail Manual" --strip-comments --rfc-references $< $@ + $(RST2HTML) --title "Fetchmail Manual" --strip-comments --rfc-references $< $@ # default to some non-default options when using "make distcheck" AM_DISTCHECK_CONFIGURE_FLAGS=--with-ssl diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fetchmail-6.4.31/NEWS new/fetchmail-6.4.32/NEWS --- old/fetchmail-6.4.31/NEWS 2022-07-16 13:58:38.000000000 +0200 +++ new/fetchmail-6.4.32/NEWS 2022-07-30 11:51:07.000000000 +0200 @@ -64,6 +64,9 @@ fetchmail versions. * Nonstandard protocol extensions (such as SDPS/*ENV) may be removed from future fetchmail versions. +* Future fetchmail releases (even minor ones) may change undocumented parts of + the .netrc parser in incompatible ways to enhance compatibility with typical + ftp(1) .netrc parsers. # KNOWN BUGS AND WORKAROUNDS * Fetchmail does not handle messages without Message-ID header well @@ -93,6 +96,24 @@ translations had been sent out already. -------------------------------------------------------------------------------- +fetchmail-6.4.32 (released 2022-07-30, 31696 LoC): + +# FIXES: +* Use configure to find rst2html, some systems install it only with .py suffix, + others only without, and some install both. +* Update README.maintainer + +# TRANSLATIONS: language translations were updated by these fine people: +(in alphabetical order of language codes so as not to prefer people): +* cs: Petr Pisar [Czech] +* es: Cristian Oth??n Mart??nez Vera [Spanish] +* ja: Takeshi Hamasaki [Japanese] +* pl: Jakub Bogusz [Polish] +* ro: Remus-Gabriel Chelu [Romanian] +* sq: Besnik Bleta [Albanian] +* sv: G??ran Uddeborg [Swedish] + +-------------------------------------------------------------------------------- fetchmail-6.4.31 (released 2022-07-16, 31694 LoC): # BUG FIXES: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fetchmail-6.4.31/configure.ac new/fetchmail-6.4.32/configure.ac --- old/fetchmail-6.4.31/configure.ac 2022-07-16 13:56:56.000000000 +0200 +++ new/fetchmail-6.4.32/configure.ac 2022-07-30 11:26:46.000000000 +0200 @@ -9,7 +9,7 @@ dnl dnl XXX - if bumping version here, check fetchmail.man, too! -AC_INIT([fetchmail],[6.4.31],[[email protected]]) +AC_INIT([fetchmail],[6.4.32],[[email protected]]) AC_CONFIG_SRCDIR([fetchmail.h]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_LIBOBJ_DIR([.]) @@ -44,6 +44,8 @@ AM_PROG_CC_C_O PKG_PROG_PKG_CONFIG +AC_CHECK_PROGS([RST2HTML], [rst2html5.py rst2html5], [false]) + AC_LIB_RPATH AC_ISC_POSIX @@ -107,7 +109,7 @@ AC_C_VOLATILE dnl check for ANSI volatile -AM_PROG_LEX +AM_PROG_LEX([yywrap]) AC_PROG_MAKE_SET AC_PROG_YACC Binary files old/fetchmail-6.4.31/fetchmail-FAQ.pdf and new/fetchmail-6.4.32/fetchmail-FAQ.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fetchmail-6.4.31/fetchmail-man.html new/fetchmail-6.4.32/fetchmail-man.html --- old/fetchmail-6.4.31/fetchmail-man.html 2022-07-16 14:02:38.000000000 +0200 +++ new/fetchmail-6.4.32/fetchmail-man.html 2022-07-30 12:31:33.000000000 +0200 @@ -4,7 +4,7 @@ <meta charset="utf-8"/> <meta name="generator" content="Docutils 0.15.2: http://docutils.sourceforge.net/"; /> <title>Fetchmail Manual</title> -<meta name="dcterms.date" content="2022-02-18" /> +<meta name="dcterms.date" content="2022-07-16" /> <link rel="schema.dcterms" href="http://purl.org/dc/terms/";> <style type="text/css"> @@ -563,7 +563,7 @@ <h1 class="title">fetchmail</h1> <dl class="docinfo simple"> <dt class="date">Date</dt> -<dd class="date">2022-02-18</dd> +<dd class="date">2022-07-16</dd> </dl> <div class="contents topic" id="contents"> <p class="topic-title first">Contents</p> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fetchmail-6.4.31/fetchmail.man new/fetchmail-6.4.32/fetchmail.man --- old/fetchmail-6.4.31/fetchmail.man 2022-07-16 13:49:31.000000000 +0200 +++ new/fetchmail-6.4.32/fetchmail.man 2022-07-27 15:27:41.000000000 +0200 @@ -10,7 +10,9 @@ .\" Load www macros to process .URL requests, this requires groff: .mso www.tmac .\" -.TH fetchmail 1 2022-02-18 "fetchmail 6.4.30" "fetchmail reference manual" +.\" The date is the last change of actual content, the version should match +.\" the distribution (configure.ac). +.TH fetchmail 1 2022-07-16 "fetchmail 6.4.32" "fetchmail reference manual" .SH NAME fetchmail \- fetch mail from a POP, IMAP, ETRN, or ODMR-capable server diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fetchmail-6.4.31/fetchmail.spec new/fetchmail-6.4.32/fetchmail.spec --- old/fetchmail-6.4.31/fetchmail.spec 2022-07-16 14:02:36.000000000 +0200 +++ new/fetchmail-6.4.32/fetchmail.spec 2022-07-30 12:31:32.000000000 +0200 @@ -4,7 +4,7 @@ %define have_python 1 Name: fetchmail -Version: 6.4.31 +Version: 6.4.32 Release: 1 Vendor: The Community Fetchmail Project Packager: Fetchmail Developers <[email protected]> @@ -205,5 +205,5 @@ %endif %changelog -* Sat Jul 16 2022 <[email protected]> 6.4.31 +* Sat Jul 30 2022 <[email protected]> 6.4.32 - See the project NEWS file for recent changes. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fetchmail-6.4.31/po/ca.po new/fetchmail-6.4.32/po/ca.po --- old/fetchmail-6.4.31/po/ca.po 2022-07-16 14:02:35.000000000 +0200 +++ new/fetchmail-6.4.32/po/ca.po 2022-07-30 11:23:22.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: fetchmail 6.4.0.rc4\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2022-07-16 11:58+0200\n" +"POT-Creation-Date: 2022-07-27 16:54+0200\n" "PO-Revision-Date: 2019-09-05 21:30+0200\n" "Last-Translator: Ernest Adrogu? Calveras <[email protected]>\n" "Language-Team: Catalan <[email protected]>\n" Binary files old/fetchmail-6.4.31/po/cs.gmo and new/fetchmail-6.4.32/po/cs.gmo differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fetchmail-6.4.31/po/cs.po new/fetchmail-6.4.32/po/cs.po --- old/fetchmail-6.4.31/po/cs.po 2022-07-16 14:02:36.000000000 +0200 +++ new/fetchmail-6.4.32/po/cs.po 2022-07-30 12:31:34.000000000 +0200 @@ -5,7 +5,7 @@ # Ji???? Pavlovsk?? <[email protected]>, 1999 - 2001. # Miloslav Trmac <[email protected]>, 2005. # Petr Pisar <[email protected]>, 2008, 2009, 2010, 2011, 2012, 2013, 2015. -# Petr Pisar <[email protected]>, 2019, 2020, 2021. +# Petr Pisar <[email protected]>, 2019, 2020, 2021, 2022. # # (IMAP) capability ??? schopnost # Subject Common Name ??? obecn?? jm??no (CN) subjektu @@ -13,10 +13,10 @@ # msgid "" msgstr "" -"Project-Id-Version: fetchmail 6.4.25.rc1\n" +"Project-Id-Version: fetchmail 6.4.31\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2022-07-16 11:58+0200\n" -"PO-Revision-Date: 2021-11-27 13:52+01:00\n" +"POT-Creation-Date: 2022-07-27 16:54+0200\n" +"PO-Revision-Date: 2022-07-17 09:35+02:00\n" "Last-Translator: Petr Pisar <[email protected]>\n" "Language-Team: Czech <[email protected]>\n" "Language: cs\n" @@ -2219,9 +2219,9 @@ msgstr "%s:%d: varov??n??: nezn??m?? token \"%s\"\n" #: netrc.c:271 netrc.c:277 -#, fuzzy, c-format +#, c-format msgid "%s: error reading file (%s).\n" -msgstr "fetchmail: chyba p??i ??ten?? souboru z??mku ???%s???: %s\n" +msgstr "%s: chyba p??i ??ten?? souboru (%s).\n" #: ntlmsubr.c:35 msgid "Warning: received malformed challenge to \"AUTH(ENTICATE) NTLM\"!\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fetchmail-6.4.31/po/da.po new/fetchmail-6.4.32/po/da.po --- old/fetchmail-6.4.31/po/da.po 2022-07-16 14:02:36.000000000 +0200 +++ new/fetchmail-6.4.32/po/da.po 2022-07-30 11:23:22.000000000 +0200 @@ -16,7 +16,7 @@ msgstr "" "Project-Id-Version: fetchmail 6.3.24.1\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2022-07-16 11:58+0200\n" +"POT-Creation-Date: 2022-07-27 16:54+0200\n" "PO-Revision-Date: 2013-03-11 07:50+0200\n" "Last-Translator: Joe Hansen <[email protected]>\n" "Language-Team: Danish <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fetchmail-6.4.31/po/de.po new/fetchmail-6.4.32/po/de.po --- old/fetchmail-6.4.31/po/de.po 2022-07-16 13:56:56.000000000 +0200 +++ new/fetchmail-6.4.32/po/de.po 2022-07-27 16:54:54.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: fetchmail 6.4.25\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2022-07-16 11:58+0200\n" +"POT-Creation-Date: 2022-07-27 16:54+0200\n" "PO-Revision-Date: 2022-05-31 20:43+0200\n" "Last-Translator: Matthias Andree <[email protected]>\n" "Language-Team: German <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fetchmail-6.4.31/po/en_GB.po new/fetchmail-6.4.32/po/en_GB.po --- old/fetchmail-6.4.31/po/en_GB.po 2022-07-16 14:02:36.000000000 +0200 +++ new/fetchmail-6.4.32/po/en_GB.po 2022-07-30 11:23:22.000000000 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: fetchmail 6.3.5\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2022-07-16 11:58+0200\n" +"POT-Creation-Date: 2022-07-27 16:54+0200\n" "PO-Revision-Date: 2006-11-02 06:58-0000\n" "Last-Translator: David Lodge <[email protected]>\n" "Language-Team: English (British) <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fetchmail-6.4.31/po/eo.po new/fetchmail-6.4.32/po/eo.po --- old/fetchmail-6.4.31/po/eo.po 2022-07-16 14:02:35.000000000 +0200 +++ new/fetchmail-6.4.32/po/eo.po 2022-07-30 11:23:22.000000000 +0200 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: fetchmail 6.4.25.rc1\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2022-07-16 11:58+0200\n" +"POT-Creation-Date: 2022-07-27 16:54+0200\n" "PO-Revision-Date: 2021-11-25 13:32-0500\n" "Last-Translator: Keith Bowes <[email protected]>\n" "Language-Team: Esperanto <[email protected]>\n" Binary files old/fetchmail-6.4.31/po/es.gmo and new/fetchmail-6.4.32/po/es.gmo differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fetchmail-6.4.31/po/es.po new/fetchmail-6.4.32/po/es.po --- old/fetchmail-6.4.31/po/es.po 2022-07-16 14:02:39.000000000 +0200 +++ new/fetchmail-6.4.32/po/es.po 2022-07-30 12:31:34.000000000 +0200 @@ -1,5 +1,5 @@ # Fetchmail Spanish Translation -# Copyright (C) 2021 Eric S. Raymond (msgids) +# Copyright (C) 2022 Eric S. Raymond (msgids) # This file is distributed under the same license as the fetchmail package. # Javier Kohen <[email protected]>, 1999. # Francisco Molinero <[email protected]>, 2009. @@ -7,10 +7,10 @@ # msgid "" msgstr "" -"Project-Id-Version: fetchmail 6.4.25.rc1\n" +"Project-Id-Version: fetchmail 6.4.31\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2022-07-16 11:58+0200\n" -"PO-Revision-Date: 2022-03-04 12:05-0600\n" +"POT-Creation-Date: 2022-07-27 16:54+0200\n" +"PO-Revision-Date: 2022-07-18 09:10-0500\n" "Last-Translator: Cristian Oth??n Mart??nez Vera <[email protected]>\n" "Language-Team: Spanish <[email protected]>\n" "Language: es\n" @@ -2277,9 +2277,9 @@ msgstr "%s:%d: aviso: el componente ??%s?? es desconocido\n" #: netrc.c:271 netrc.c:277 -#, fuzzy, c-format +#, c-format msgid "%s: error reading file (%s).\n" -msgstr "fetchmail: error leyendo el archivo de bloqueo ??%s??: %s\n" +msgstr "%s: error al leer el fichero (%s).\n" #: ntlmsubr.c:35 msgid "Warning: received malformed challenge to \"AUTH(ENTICATE) NTLM\"!\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fetchmail-6.4.31/po/fr.po new/fetchmail-6.4.32/po/fr.po --- old/fetchmail-6.4.31/po/fr.po 2022-07-16 14:02:39.000000000 +0200 +++ new/fetchmail-6.4.32/po/fr.po 2022-07-30 11:23:22.000000000 +0200 @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: fetchmail-6.4.25.rc1\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2022-07-16 11:58+0200\n" +"POT-Creation-Date: 2022-07-27 16:54+0200\n" "PO-Revision-Date: 2021-11-23 14:01+0100\n" "Last-Translator: Fr??d??ric Marchal <[email protected]>\n" "Language-Team: French <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fetchmail-6.4.31/po/id.po new/fetchmail-6.4.32/po/id.po --- old/fetchmail-6.4.31/po/id.po 2022-07-16 14:02:36.000000000 +0200 +++ new/fetchmail-6.4.32/po/id.po 2022-07-30 11:23:22.000000000 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: fetchmail 6.3.24.1\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2022-07-16 11:58+0200\n" +"POT-Creation-Date: 2022-07-27 16:54+0200\n" "PO-Revision-Date: 2014-01-27 18:25+0700\n" "Last-Translator: Andhika Padmawan <[email protected]>\n" "Language-Team: Indonesian <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fetchmail-6.4.31/po/it.po new/fetchmail-6.4.32/po/it.po --- old/fetchmail-6.4.31/po/it.po 2022-07-16 14:02:36.000000000 +0200 +++ new/fetchmail-6.4.32/po/it.po 2022-07-30 11:23:22.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: fetchmail 6.3.19-pre1\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2022-07-16 11:58+0200\n" +"POT-Creation-Date: 2022-07-27 16:54+0200\n" "PO-Revision-Date: 2010-12-06 20:51+0100\n" "Last-Translator: Vincenzo Campanella <[email protected]>\n" "Language-Team: Italian <[email protected]>\n" Binary files old/fetchmail-6.4.31/po/ja.gmo and new/fetchmail-6.4.32/po/ja.gmo differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fetchmail-6.4.31/po/ja.po new/fetchmail-6.4.32/po/ja.po --- old/fetchmail-6.4.31/po/ja.po 2022-07-16 14:02:36.000000000 +0200 +++ new/fetchmail-6.4.32/po/ja.po 2022-07-30 12:31:34.000000000 +0200 @@ -2,15 +2,15 @@ # Copyright (C) 2005-2013 Eric S. Raymond # Copyright (C) 2020 Free Software Foundation, Inc. # This file is distributed under the same license as the fetchmail package. -# Takeshi Hamasaki <[email protected]>, 2005-2013, 2019, 2020, 2021. +# Takeshi Hamasaki <[email protected]>, 2005-2013, 2019, 2020, 2021, 2022. # based on the work by Jumpei Baba <[email protected]>, 2002 # msgid "" msgstr "" -"Project-Id-Version: fetchmail 6.4.25.rc1\n" +"Project-Id-Version: fetchmail 6.4.31\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2022-07-16 11:58+0200\n" -"PO-Revision-Date: 2021-11-21 23:35+0900\n" +"POT-Creation-Date: 2022-07-27 16:54+0200\n" +"PO-Revision-Date: 2022-07-23 10:36+0900\n" "Last-Translator: Takeshi Hamasaki <[email protected]>\n" "Language-Team: Japanese <[email protected]>\n" "Language: ja\n" @@ -2229,9 +2229,9 @@ msgstr "%s:%d: ??????: ????????????????????? \"%s\"\n" #: netrc.c:271 netrc.c:277 -#, fuzzy, c-format +#, c-format msgid "%s: error reading file (%s).\n" -msgstr "fetchmail: ????????????????????? \"%s\" ???????????????????????????????????????: %s\n" +msgstr "%s: ???????????? (%s) ???????????????????????????????????????\n" #: ntlmsubr.c:35 msgid "Warning: received malformed challenge to \"AUTH(ENTICATE) NTLM\"!\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fetchmail-6.4.31/po/nl.po new/fetchmail-6.4.32/po/nl.po --- old/fetchmail-6.4.31/po/nl.po 2022-07-16 14:02:36.000000000 +0200 +++ new/fetchmail-6.4.32/po/nl.po 2022-07-30 11:23:22.000000000 +0200 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: fetchmail-6.3.20-rc3\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2022-07-16 11:58+0200\n" +"POT-Creation-Date: 2022-07-27 16:54+0200\n" "PO-Revision-Date: 2011-05-31 07:47+0200\n" "Last-Translator: Erwin Poeze <[email protected]>\n" "Language-Team: Dutch <[email protected]>\n" Binary files old/fetchmail-6.4.31/po/pl.gmo and new/fetchmail-6.4.32/po/pl.gmo differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fetchmail-6.4.31/po/pl.po new/fetchmail-6.4.32/po/pl.po --- old/fetchmail-6.4.31/po/pl.po 2022-07-16 14:02:35.000000000 +0200 +++ new/fetchmail-6.4.32/po/pl.po 2022-07-30 12:31:34.000000000 +0200 @@ -2,15 +2,15 @@ # Copyright (C) 1998, 2002, 2003, 2005, 2009 Eric S. Raymond (msgids) # This file is distributed under the same license as the fetchmail package. # Pawe?? Krawczyk <[email protected]>, 1998-1999. -# Jakub Bogusz <[email protected]>, 2002-2021. +# Jakub Bogusz <[email protected]>, 2002-2022. # Thanks for few updates to Adam Go????biowski, 2003. # msgid "" msgstr "" -"Project-Id-Version: fetchmail 6.4.25.rc1\n" +"Project-Id-Version: fetchmail 6.4.31\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2022-07-16 11:58+0200\n" -"PO-Revision-Date: 2021-11-21 22:15+0100\n" +"POT-Creation-Date: 2022-07-27 16:54+0200\n" +"PO-Revision-Date: 2022-07-24 19:24+0200\n" "Last-Translator: Jakub Bogusz <[email protected]>\n" "Language-Team: Polish <[email protected]>\n" "Language: pl\n" @@ -2249,9 +2249,9 @@ msgstr "%s:%d: uwaga: nieznany symbol \"%s\"\n" #: netrc.c:271 netrc.c:277 -#, fuzzy, c-format +#, c-format msgid "%s: error reading file (%s).\n" -msgstr "fetchmail: b????d podczas odczytu pliku blokady \"%s\": %s\n" +msgstr "%s: b????d podczas odczytu pliku (%s).\n" #: ntlmsubr.c:35 msgid "Warning: received malformed challenge to \"AUTH(ENTICATE) NTLM\"!\n" Binary files old/fetchmail-6.4.31/po/ro.gmo and new/fetchmail-6.4.32/po/ro.gmo differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fetchmail-6.4.31/po/ro.po new/fetchmail-6.4.32/po/ro.po --- old/fetchmail-6.4.31/po/ro.po 2022-07-16 14:02:39.000000000 +0200 +++ new/fetchmail-6.4.32/po/ro.po 2022-07-30 12:31:34.000000000 +0200 @@ -1,5 +1,5 @@ # Romanian translation of fetchmail. -# Copyright (C) 2020, 2021 Eric S. Raymond (msgids) +# Copyright (C) 2020 - 2022 Eric S. Raymond (msgids) # This file is distributed under the same license as the fetchmail package. # # Florentina Mu??at <[email protected]>, 2020. @@ -13,13 +13,14 @@ # Actualiz??ri realizate de Remus-Gabriel Chelu <[email protected]>, 15.01.2022. # Actualizare a algoritmului formelor de plural (de la ???trei??? la ???patru???, experimental). # Actualizare a traducerii pentru versiunea 6.4.25.rc1, f??cut?? de R-GC. +# Actualizare a traducerii pentru versiunea 6.4.31, f??cut?? de R-GC. # msgid "" msgstr "" -"Project-Id-Version: fetchmail 6.4.25.rc1\n" +"Project-Id-Version: fetchmail 6.4.31\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2022-07-16 11:58+0200\n" -"PO-Revision-Date: 2022-04-16 00:36+0200\n" +"POT-Creation-Date: 2022-07-27 16:54+0200\n" +"PO-Revision-Date: 2022-07-17 11:31+0200\n" "Last-Translator: Remus-Gabriel Chelu <[email protected]>\n" "Language-Team: Romanian <[email protected]>\n" "Language: ro\n" @@ -29,7 +30,7 @@ "Plural-Forms: nplurals=4; plural=((n==1) ? 0 : (n==2) ? 1 : (n==0 || (n%100 " "> 0 && n%100 < 20)) ? 2 : 3);\n" "X-Bugs: Report translation errors to the Language-Team address.\n" -"X-Generator: Poedit 3.0.1\n" +"X-Generator: Poedit 2.3.1\n" # R-GC, scrie: # ???node???, se refer?? la nodul de re??ea, ce @@ -2516,9 +2517,9 @@ msgstr "%s:%d: avertisment: jeton necunoscut ???%s???\n" #: netrc.c:271 netrc.c:277 -#, fuzzy, c-format +#, c-format msgid "%s: error reading file (%s).\n" -msgstr "fetchmail: eroare la citirea fi??ierului de blocare ???%s???: %s\n" +msgstr "%s: eroare la citirea fi??ierului (%s).\n" #: ntlmsubr.c:35 msgid "Warning: received malformed challenge to \"AUTH(ENTICATE) NTLM\"!\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fetchmail-6.4.31/po/ru.po new/fetchmail-6.4.32/po/ru.po --- old/fetchmail-6.4.31/po/ru.po 2022-07-16 14:02:36.000000000 +0200 +++ new/fetchmail-6.4.32/po/ru.po 2022-07-30 11:23:22.000000000 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: fetchmail 6.3.10-pre1\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2022-07-16 11:58+0200\n" +"POT-Creation-Date: 2022-07-27 16:54+0200\n" "PO-Revision-Date: 2009-06-05 14:53+0200\n" "Last-Translator: Pavel Maryanov <[email protected]>\n" "Language-Team: Russian <[email protected]>\n" Binary files old/fetchmail-6.4.31/po/sq.gmo and new/fetchmail-6.4.32/po/sq.gmo differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fetchmail-6.4.31/po/sq.po new/fetchmail-6.4.32/po/sq.po --- old/fetchmail-6.4.31/po/sq.po 2022-07-16 14:02:35.000000000 +0200 +++ new/fetchmail-6.4.32/po/sq.po 2022-07-30 12:31:34.000000000 +0200 @@ -1,12 +1,12 @@ # Translation of fetchmail to Albanian # This file is distributed under the same license as the fetchmail package. -# Besnik Bleta <[email protected]>, 2004,2008,2015,2019,2020,2021 +# Besnik Bleta <[email protected]>, 2004,2008,2015,2019,2020,2021,2022 msgid "" msgstr "" -"Project-Id-Version: fetchmail-6.4.25.rc1\n" +"Project-Id-Version: fetchmail-6.4.31\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2022-07-16 11:58+0200\n" -"PO-Revision-Date: 2021-11-21 14:56+0200\n" +"POT-Creation-Date: 2022-07-27 16:54+0200\n" +"PO-Revision-Date: 2022-07-17 12:21+0300\n" "Last-Translator: Besnik Bleta <[email protected]>\n" "Language-Team: Albanian <[email protected]>\n" "Language: sq\n" @@ -20,7 +20,7 @@ #: checkalias.c:174 #, c-format msgid "Checking if %s is really the same node as %s\n" -msgstr "Po kontrollohet n??se v??rtet %s ??sht?? e nj??jta nyj?? si %s\n" +msgstr "Po kontrollohet n??se %s ??sht?? v??rtet e nj??jta nyje me %s\n" #: checkalias.c:178 msgid "Yes, their IP addresses match\n" @@ -2235,9 +2235,9 @@ msgstr "%s:%d: sinjalizim: token \"%s\" i panjohur\n" #: netrc.c:271 netrc.c:277 -#, fuzzy, c-format +#, c-format msgid "%s: error reading file (%s).\n" -msgstr "fetchmail: gabim gjat?? leximit t?? lockfile-it \"%s\": %s\n" +msgstr "%s: gabim n?? lexim kartele (%s).\n" #: ntlmsubr.c:35 msgid "Warning: received malformed challenge to \"AUTH(ENTICATE) NTLM\"!\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fetchmail-6.4.31/po/sr.po new/fetchmail-6.4.32/po/sr.po --- old/fetchmail-6.4.31/po/sr.po 2022-07-16 14:02:36.000000000 +0200 +++ new/fetchmail-6.4.32/po/sr.po 2022-07-30 11:23:22.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: fetchmail-6.4.25.rc1\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2022-07-16 11:58+0200\n" +"POT-Creation-Date: 2022-07-27 16:54+0200\n" "PO-Revision-Date: 2021-12-11 19:12+0200\n" "Last-Translator: ???????????????? ?????????????? <[email protected]>\n" "Language-Team: Serbian <(nothing)>\n" Binary files old/fetchmail-6.4.31/po/sv.gmo and new/fetchmail-6.4.32/po/sv.gmo differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fetchmail-6.4.31/po/sv.po new/fetchmail-6.4.32/po/sv.po --- old/fetchmail-6.4.31/po/sv.po 2022-07-16 14:02:36.000000000 +0200 +++ new/fetchmail-6.4.32/po/sv.po 2022-07-30 12:31:34.000000000 +0200 @@ -1,18 +1,18 @@ # Swedish translations for fetchmail package # Svenska ??vers??ttningar f??r paket fetchmail. # Copyright ?? 2011, 2012, 2013 Eric S. Raymond (msgids) -# Copyright ?? 2019, 2021 Matthias Andree (msgids) +# Copyright ?? 2019, 2021, 2022 Matthias Andree (msgids) # This file is distributed under the same license as the fetchmail package. # Luna Jernberg <[email protected]>, 2021 -# G??ran Uddeborg <[email protected]>, 2011, 2012, 2013, 2019, 2020, 2021. +# G??ran Uddeborg <[email protected]>, 2011, 2012, 2013, 2019, 2020, 2021, 2022. # -# $Revision: 1.40 $ +# $Revision: 1.42 $ msgid "" msgstr "" -"Project-Id-Version: fetchmail 6.4.25.rc1\n" +"Project-Id-Version: fetchmail 6.4.31\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2022-07-16 11:58+0200\n" -"PO-Revision-Date: 2021-11-21 10:58+0100\n" +"POT-Creation-Date: 2022-07-27 16:54+0200\n" +"PO-Revision-Date: 2022-07-17 10:02+0200\n" "Last-Translator: G??ran Uddeborg <[email protected]>\n" "Language-Team: Swedish <[email protected]>\n" "Language: sv\n" @@ -2215,9 +2215,9 @@ msgstr "%s:%d: varning: ok??nd symbol ???%s???\n" #: netrc.c:271 netrc.c:277 -#, fuzzy, c-format +#, c-format msgid "%s: error reading file (%s).\n" -msgstr "fetchmail: fel n??r l??sfilen ???%s??? l??stes: %s\n" +msgstr "%s: fel n??r filen l??stes (%s).\n" #: ntlmsubr.c:35 msgid "Warning: received malformed challenge to \"AUTH(ENTICATE) NTLM\"!\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fetchmail-6.4.31/po/vi.po new/fetchmail-6.4.32/po/vi.po --- old/fetchmail-6.4.31/po/vi.po 2022-07-16 14:02:36.000000000 +0200 +++ new/fetchmail-6.4.32/po/vi.po 2022-07-30 11:23:22.000000000 +0200 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: fetchmail 6.4.25.rc1\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2022-07-16 11:58+0200\n" +"POT-Creation-Date: 2022-07-27 16:54+0200\n" "PO-Revision-Date: 2022-03-20 14:26+0700\n" "Last-Translator: Tr???n Ng???c Qu??n <[email protected]>\n" "Language-Team: Vietnamese <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fetchmail-6.4.31/po/zh_CN.po new/fetchmail-6.4.32/po/zh_CN.po --- old/fetchmail-6.4.31/po/zh_CN.po 2022-07-16 14:02:36.000000000 +0200 +++ new/fetchmail-6.4.32/po/zh_CN.po 2022-07-30 11:23:22.000000000 +0200 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: fetchmail 6.4.13-rc1\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2022-07-16 11:58+0200\n" +"POT-Creation-Date: 2022-07-27 16:54+0200\n" "PO-Revision-Date: 2020-10-15 09:14-0400\n" "Last-Translator: Boyuan Yang <[email protected]>\n" "Language-Team: Chinese (simplified) <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fetchmail-6.4.31/rcfile_y.c new/fetchmail-6.4.32/rcfile_y.c --- old/fetchmail-6.4.31/rcfile_y.c 2022-07-16 14:02:31.000000000 +0200 +++ new/fetchmail-6.4.32/rcfile_y.c 2022-07-30 11:24:04.000000000 +0200 @@ -123,7 +123,7 @@ extern char * yytext; #define YYPRINT(fp, type, val) fprintf(fp, " = \"%s\"", yytext) -#line 127 "rcfile_y.c" +#line 127 "../rcfile_y.c" # ifndef YY_CAST # ifdef __cplusplus @@ -148,8 +148,8 @@ /* Use api.header.include to #include this header instead of duplicating it here. */ -#ifndef YY_YY_RCFILE_Y_H_INCLUDED -# define YY_YY_RCFILE_Y_H_INCLUDED +#ifndef YY_YY__RCFILE_Y_H_INCLUDED +# define YY_YY__RCFILE_Y_H_INCLUDED /* Debug traces. */ #ifndef YYDEBUG # define YYDEBUG 1 @@ -374,7 +374,7 @@ int number; char *sval; -#line 378 "rcfile_y.c" +#line 378 "../rcfile_y.c" }; typedef union YYSTYPE YYSTYPE; @@ -389,7 +389,7 @@ int yyparse (void); -#endif /* !YY_YY_RCFILE_Y_H_INCLUDED */ +#endif /* !YY_YY__RCFILE_Y_H_INCLUDED */ /* Symbol kind. */ enum yysymbol_kind_t { @@ -1409,7 +1409,7 @@ case YYSYMBOL_STRING: /* STRING */ #line 85 "../rcfile_y.y" { free (((*yyvaluep).sval)); } -#line 1413 "rcfile_y.c" +#line 1413 "../rcfile_y.c" break; default: @@ -1679,175 +1679,175 @@ case 8: /* statement: SET LOGFILE optmap STRING */ #line 100 "../rcfile_y.y" {run.logfile = prependdir ((yyvsp[0].sval), rcfiledir); free((yyvsp[0].sval));} -#line 1683 "rcfile_y.c" +#line 1683 "../rcfile_y.c" break; case 9: /* statement: SET IDFILE optmap STRING */ #line 101 "../rcfile_y.y" {run.idfile = prependdir ((yyvsp[0].sval), rcfiledir); free((yyvsp[0].sval));} -#line 1689 "rcfile_y.c" +#line 1689 "../rcfile_y.c" break; case 10: /* statement: SET PIDFILE optmap STRING */ #line 102 "../rcfile_y.y" {run.pidfile = prependdir ((yyvsp[0].sval), rcfiledir); free((yyvsp[0].sval));} -#line 1695 "rcfile_y.c" +#line 1695 "../rcfile_y.c" break; case 11: /* statement: SET DAEMON optmap NUMBER */ #line 103 "../rcfile_y.y" {run.poll_interval = (yyvsp[0].number);} -#line 1701 "rcfile_y.c" +#line 1701 "../rcfile_y.c" break; case 12: /* statement: SET POSTMASTER optmap STRING */ #line 104 "../rcfile_y.y" {run.postmaster = (yyvsp[0].sval);} -#line 1707 "rcfile_y.c" +#line 1707 "../rcfile_y.c" break; case 13: /* statement: SET BOUNCEMAIL */ #line 105 "../rcfile_y.y" {run.bouncemail = TRUE;} -#line 1713 "rcfile_y.c" +#line 1713 "../rcfile_y.c" break; case 14: /* statement: SET NO BOUNCEMAIL */ #line 106 "../rcfile_y.y" {run.bouncemail = FALSE;} -#line 1719 "rcfile_y.c" +#line 1719 "../rcfile_y.c" break; case 15: /* statement: SET SPAMBOUNCE */ #line 107 "../rcfile_y.y" {run.spambounce = TRUE;} -#line 1725 "rcfile_y.c" +#line 1725 "../rcfile_y.c" break; case 16: /* statement: SET NO SPAMBOUNCE */ #line 108 "../rcfile_y.y" {run.spambounce = FALSE;} -#line 1731 "rcfile_y.c" +#line 1731 "../rcfile_y.c" break; case 17: /* statement: SET SOFTBOUNCE */ #line 109 "../rcfile_y.y" {run.softbounce = TRUE;} -#line 1737 "rcfile_y.c" +#line 1737 "../rcfile_y.c" break; case 18: /* statement: SET NO SOFTBOUNCE */ #line 110 "../rcfile_y.y" {run.softbounce = FALSE;} -#line 1743 "rcfile_y.c" +#line 1743 "../rcfile_y.c" break; case 19: /* statement: SET PROPERTIES optmap STRING */ #line 111 "../rcfile_y.y" {run.properties = (yyvsp[0].sval);} -#line 1749 "rcfile_y.c" +#line 1749 "../rcfile_y.c" break; case 20: /* statement: SET SYSLOG */ #line 112 "../rcfile_y.y" {run.use_syslog = TRUE;} -#line 1755 "rcfile_y.c" +#line 1755 "../rcfile_y.c" break; case 21: /* statement: SET NO SYSLOG */ #line 113 "../rcfile_y.y" {run.use_syslog = FALSE;} -#line 1761 "rcfile_y.c" +#line 1761 "../rcfile_y.c" break; case 22: /* statement: SET INVISIBLE */ #line 114 "../rcfile_y.y" {run.invisible = TRUE;} -#line 1767 "rcfile_y.c" +#line 1767 "../rcfile_y.c" break; case 23: /* statement: SET NO INVISIBLE */ #line 115 "../rcfile_y.y" {run.invisible = FALSE;} -#line 1773 "rcfile_y.c" +#line 1773 "../rcfile_y.c" break; case 24: /* statement: SET SHOWDOTS */ #line 116 "../rcfile_y.y" {run.showdots = FLAG_TRUE;} -#line 1779 "rcfile_y.c" +#line 1779 "../rcfile_y.c" break; case 25: /* statement: SET NO SHOWDOTS */ #line 117 "../rcfile_y.y" {run.showdots = FLAG_FALSE;} -#line 1785 "rcfile_y.c" +#line 1785 "../rcfile_y.c" break; case 26: /* statement: define_server serverspecs */ #line 125 "../rcfile_y.y" {record_current();} -#line 1791 "rcfile_y.c" +#line 1791 "../rcfile_y.c" break; case 28: /* statement: define_server serverspecs userspecs serv_option */ #line 130 "../rcfile_y.y" {yyerror(GT_("server option after user options"));} -#line 1797 "rcfile_y.c" +#line 1797 "../rcfile_y.c" break; case 29: /* define_server: POLL STRING */ #line 133 "../rcfile_y.y" {reset_server((yyvsp[0].sval), FALSE); free((yyvsp[0].sval));} -#line 1803 "rcfile_y.c" +#line 1803 "../rcfile_y.c" break; case 30: /* define_server: SKIP STRING */ #line 134 "../rcfile_y.y" {reset_server((yyvsp[0].sval), TRUE); free((yyvsp[0].sval));} -#line 1809 "rcfile_y.c" +#line 1809 "../rcfile_y.c" break; case 31: /* define_server: DEFAULTS */ #line 135 "../rcfile_y.y" {reset_server("defaults", FALSE);} -#line 1815 "rcfile_y.c" +#line 1815 "../rcfile_y.c" break; case 34: /* alias_list: STRING */ #line 142 "../rcfile_y.y" {save_str(¤t.server.akalist,(yyvsp[0].sval),0); free((yyvsp[0].sval));} -#line 1821 "rcfile_y.c" +#line 1821 "../rcfile_y.c" break; case 35: /* alias_list: alias_list STRING */ #line 143 "../rcfile_y.y" {save_str(¤t.server.akalist,(yyvsp[0].sval),0); free((yyvsp[0].sval));} -#line 1827 "rcfile_y.c" +#line 1827 "../rcfile_y.c" break; case 36: /* domain_list: STRING */ #line 146 "../rcfile_y.y" {save_str(¤t.server.localdomains,(yyvsp[0].sval),0); free((yyvsp[0].sval));} -#line 1833 "rcfile_y.c" +#line 1833 "../rcfile_y.c" break; case 37: /* domain_list: domain_list STRING */ #line 147 "../rcfile_y.y" {save_str(¤t.server.localdomains,(yyvsp[0].sval),0); free((yyvsp[0].sval));} -#line 1839 "rcfile_y.c" +#line 1839 "../rcfile_y.c" break; case 39: /* serv_option: VIA STRING */ #line 151 "../rcfile_y.y" {current.server.via = (yyvsp[0].sval);} -#line 1845 "rcfile_y.c" +#line 1845 "../rcfile_y.c" break; case 41: /* serv_option: PROTOCOL PROTO */ #line 153 "../rcfile_y.y" {current.server.protocol = (yyvsp[0].proto);} -#line 1851 "rcfile_y.c" +#line 1851 "../rcfile_y.c" break; case 42: /* serv_option: PROTOCOL KPOP */ @@ -1863,25 +1863,25 @@ #endif /* KERBEROS_V5 */ current.server.service = KPOP_PORT; } -#line 1867 "rcfile_y.c" +#line 1867 "../rcfile_y.c" break; case 43: /* serv_option: PRINCIPAL STRING */ #line 165 "../rcfile_y.y" {current.server.principal = (yyvsp[0].sval);} -#line 1873 "rcfile_y.c" +#line 1873 "../rcfile_y.c" break; case 44: /* serv_option: ESMTPNAME STRING */ #line 166 "../rcfile_y.y" {current.server.esmtp_name = (yyvsp[0].sval);} -#line 1879 "rcfile_y.c" +#line 1879 "../rcfile_y.c" break; case 45: /* serv_option: ESMTPPASSWORD STRING */ #line 167 "../rcfile_y.y" {current.server.esmtp_password = (yyvsp[0].sval);} -#line 1885 "rcfile_y.c" +#line 1885 "../rcfile_y.c" break; case 46: /* serv_option: PROTOCOL SDPS */ @@ -1894,31 +1894,31 @@ yyerror(GT_("SDPS not enabled.")); #endif /* SDPS_ENABLE */ } -#line 1898 "rcfile_y.c" +#line 1898 "../rcfile_y.c" break; case 47: /* serv_option: UIDL */ #line 176 "../rcfile_y.y" {current.server.uidl = FLAG_TRUE;} -#line 1904 "rcfile_y.c" +#line 1904 "../rcfile_y.c" break; case 48: /* serv_option: NO UIDL */ #line 177 "../rcfile_y.y" {current.server.uidl = FLAG_FALSE;} -#line 1910 "rcfile_y.c" +#line 1910 "../rcfile_y.c" break; case 49: /* serv_option: CHECKALIAS */ #line 178 "../rcfile_y.y" {current.server.checkalias = FLAG_TRUE;} -#line 1916 "rcfile_y.c" +#line 1916 "../rcfile_y.c" break; case 50: /* serv_option: NO CHECKALIAS */ #line 179 "../rcfile_y.y" {current.server.checkalias = FLAG_FALSE;} -#line 1922 "rcfile_y.c" +#line 1922 "../rcfile_y.c" break; case 51: /* serv_option: SERVICE STRING */ @@ -1926,7 +1926,7 @@ { current.server.service = (yyvsp[0].sval); } -#line 1930 "rcfile_y.c" +#line 1930 "../rcfile_y.c" break; case 52: /* serv_option: SERVICE NUMBER */ @@ -1937,7 +1937,7 @@ snprintf(buf, sizeof buf, "%d", port); current.server.service = xstrdup(buf); } -#line 1941 "rcfile_y.c" +#line 1941 "../rcfile_y.c" break; case 53: /* serv_option: PORT NUMBER */ @@ -1948,25 +1948,25 @@ snprintf(buf, sizeof buf, "%d", port); current.server.service = xstrdup(buf); } -#line 1952 "rcfile_y.c" +#line 1952 "../rcfile_y.c" break; case 54: /* serv_option: INTERVAL NUMBER */ #line 196 "../rcfile_y.y" {current.server.interval = (yyvsp[0].number);} -#line 1958 "rcfile_y.c" +#line 1958 "../rcfile_y.c" break; case 55: /* serv_option: AUTHENTICATE AUTHTYPE */ #line 198 "../rcfile_y.y" {current.server.authenticate = (yyvsp[0].proto);} -#line 1964 "rcfile_y.c" +#line 1964 "../rcfile_y.c" break; case 56: /* serv_option: TIMEOUT NUMBER */ #line 200 "../rcfile_y.y" {current.server.timeout = (yyvsp[0].number);} -#line 1970 "rcfile_y.c" +#line 1970 "../rcfile_y.c" break; case 57: /* serv_option: ENVELOPE NUMBER STRING */ @@ -1975,7 +1975,7 @@ current.server.envelope = (yyvsp[0].sval); current.server.envskip = (yyvsp[-1].number); } -#line 1979 "rcfile_y.c" +#line 1979 "../rcfile_y.c" break; case 58: /* serv_option: ENVELOPE STRING */ @@ -1984,13 +1984,13 @@ current.server.envelope = (yyvsp[0].sval); current.server.envskip = 0; } -#line 1988 "rcfile_y.c" +#line 1988 "../rcfile_y.c" break; case 59: /* serv_option: QVIRTUAL STRING */ #line 212 "../rcfile_y.y" {current.server.qvirtual = (yyvsp[0].sval);} -#line 1994 "rcfile_y.c" +#line 1994 "../rcfile_y.c" break; case 60: /* serv_option: INTERFACE STRING */ @@ -2003,7 +2003,7 @@ #endif free((yyvsp[0].sval)); } -#line 2007 "rcfile_y.c" +#line 2007 "../rcfile_y.c" break; case 61: /* serv_option: MONITOR STRING */ @@ -2016,91 +2016,91 @@ free((yyvsp[0].sval)); #endif } -#line 2020 "rcfile_y.c" +#line 2020 "../rcfile_y.c" break; case 62: /* serv_option: PLUGIN STRING */ #line 229 "../rcfile_y.y" { current.server.plugin = (yyvsp[0].sval); } -#line 2026 "rcfile_y.c" +#line 2026 "../rcfile_y.c" break; case 63: /* serv_option: PLUGOUT STRING */ #line 230 "../rcfile_y.y" { current.server.plugout = (yyvsp[0].sval); } -#line 2032 "rcfile_y.c" +#line 2032 "../rcfile_y.c" break; case 64: /* serv_option: DNS */ #line 231 "../rcfile_y.y" {current.server.dns = FLAG_TRUE;} -#line 2038 "rcfile_y.c" +#line 2038 "../rcfile_y.c" break; case 65: /* serv_option: NO DNS */ #line 232 "../rcfile_y.y" {current.server.dns = FLAG_FALSE;} -#line 2044 "rcfile_y.c" +#line 2044 "../rcfile_y.c" break; case 66: /* serv_option: NO ENVELOPE */ #line 233 "../rcfile_y.y" {current.server.envelope = STRING_DISABLED;} -#line 2050 "rcfile_y.c" +#line 2050 "../rcfile_y.c" break; case 67: /* serv_option: TRACEPOLLS */ #line 234 "../rcfile_y.y" {current.server.tracepolls = FLAG_TRUE;} -#line 2056 "rcfile_y.c" +#line 2056 "../rcfile_y.c" break; case 68: /* serv_option: NO TRACEPOLLS */ #line 235 "../rcfile_y.y" {current.server.tracepolls = FLAG_FALSE;} -#line 2062 "rcfile_y.c" +#line 2062 "../rcfile_y.c" break; case 69: /* serv_option: BADHEADER ACCEPT */ #line 236 "../rcfile_y.y" {current.server.badheader = BHACCEPT;} -#line 2068 "rcfile_y.c" +#line 2068 "../rcfile_y.c" break; case 70: /* serv_option: BADHEADER REJECT_ */ #line 237 "../rcfile_y.y" {current.server.badheader = BHREJECT;} -#line 2074 "rcfile_y.c" +#line 2074 "../rcfile_y.c" break; case 71: /* userspecs: user1opts */ #line 240 "../rcfile_y.y" {record_current(); user_reset();} -#line 2080 "rcfile_y.c" +#line 2080 "../rcfile_y.c" break; case 73: /* explicits: explicitdef */ #line 244 "../rcfile_y.y" {record_current(); user_reset();} -#line 2086 "rcfile_y.c" +#line 2086 "../rcfile_y.c" break; case 74: /* explicits: explicits explicitdef */ #line 245 "../rcfile_y.y" {record_current(); user_reset();} -#line 2092 "rcfile_y.c" +#line 2092 "../rcfile_y.c" break; case 76: /* userdef: USERNAME STRING */ #line 251 "../rcfile_y.y" {current.remotename = (yyvsp[0].sval);} -#line 2098 "rcfile_y.c" +#line 2098 "../rcfile_y.c" break; case 78: /* userdef: USERNAME STRING THERE */ #line 253 "../rcfile_y.y" {current.remotename = (yyvsp[-1].sval);} -#line 2104 "rcfile_y.c" +#line 2104 "../rcfile_y.c" break; case 85: /* mapping: STRING */ @@ -2111,49 +2111,49 @@ save_str_pair(¤t.localnames, (yyvsp[0].sval), NULL); } free((yyvsp[0].sval));} -#line 2115 "rcfile_y.c" +#line 2115 "../rcfile_y.c" break; case 86: /* mapping: STRING MAP STRING */ #line 274 "../rcfile_y.y" {save_str_pair(¤t.localnames, (yyvsp[-2].sval), (yyvsp[0].sval)); free((yyvsp[-2].sval)); free((yyvsp[0].sval));} -#line 2121 "rcfile_y.c" +#line 2121 "../rcfile_y.c" break; case 87: /* folder_list: STRING */ #line 277 "../rcfile_y.y" {save_str(¤t.mailboxes,(yyvsp[0].sval),0); free((yyvsp[0].sval));} -#line 2127 "rcfile_y.c" +#line 2127 "../rcfile_y.c" break; case 88: /* folder_list: folder_list STRING */ #line 278 "../rcfile_y.y" {save_str(¤t.mailboxes,(yyvsp[0].sval),0); free((yyvsp[0].sval));} -#line 2133 "rcfile_y.c" +#line 2133 "../rcfile_y.c" break; case 89: /* smtp_list: STRING */ #line 281 "../rcfile_y.y" {save_str(¤t.smtphunt, (yyvsp[0].sval),TRUE); free((yyvsp[0].sval));} -#line 2139 "rcfile_y.c" +#line 2139 "../rcfile_y.c" break; case 90: /* smtp_list: smtp_list STRING */ #line 282 "../rcfile_y.y" {save_str(¤t.smtphunt, (yyvsp[0].sval),TRUE); free((yyvsp[0].sval));} -#line 2145 "rcfile_y.c" +#line 2145 "../rcfile_y.c" break; case 91: /* fetch_list: STRING */ #line 285 "../rcfile_y.y" {save_str(¤t.domainlist, (yyvsp[0].sval),TRUE); free((yyvsp[0].sval));} -#line 2151 "rcfile_y.c" +#line 2151 "../rcfile_y.c" break; case 92: /* fetch_list: fetch_list STRING */ #line 286 "../rcfile_y.y" {save_str(¤t.domainlist, (yyvsp[0].sval),TRUE); free((yyvsp[0].sval));} -#line 2157 "rcfile_y.c" +#line 2157 "../rcfile_y.c" break; case 93: /* num_list: NUMBER */ @@ -2163,7 +2163,7 @@ id = save_str(¤t.antispam,STRING_DUMMY,0); id->val.status.num = (yyvsp[0].number); } -#line 2167 "rcfile_y.c" +#line 2167 "../rcfile_y.c" break; case 94: /* num_list: num_list NUMBER */ @@ -2173,133 +2173,133 @@ id = save_str(¤t.antispam,STRING_DUMMY,0); id->val.status.num = (yyvsp[0].number); } -#line 2177 "rcfile_y.c" +#line 2177 "../rcfile_y.c" break; case 99: /* user_option: IS STRING THERE */ #line 308 "../rcfile_y.y" {current.remotename = (yyvsp[-1].sval);} -#line 2183 "rcfile_y.c" +#line 2183 "../rcfile_y.c" break; case 100: /* user_option: PASSWORD STRING */ #line 309 "../rcfile_y.y" {current.password = (yyvsp[0].sval);} -#line 2189 "rcfile_y.c" +#line 2189 "../rcfile_y.c" break; case 104: /* user_option: SMTPADDRESS STRING */ #line 313 "../rcfile_y.y" {current.smtpaddress = (yyvsp[0].sval);} -#line 2195 "rcfile_y.c" +#line 2195 "../rcfile_y.c" break; case 105: /* user_option: SMTPNAME STRING */ #line 314 "../rcfile_y.y" {current.smtpname = (yyvsp[0].sval);} -#line 2201 "rcfile_y.c" +#line 2201 "../rcfile_y.c" break; case 107: /* user_option: MDA STRING */ #line 316 "../rcfile_y.y" {current.mda = (yyvsp[0].sval);} -#line 2207 "rcfile_y.c" +#line 2207 "../rcfile_y.c" break; case 108: /* user_option: BSMTP STRING */ #line 317 "../rcfile_y.y" {current.bsmtp = prependdir ((yyvsp[0].sval), rcfiledir); free((yyvsp[0].sval));} -#line 2213 "rcfile_y.c" +#line 2213 "../rcfile_y.c" break; case 109: /* user_option: LMTP */ #line 318 "../rcfile_y.y" {current.listener = LMTP_MODE;} -#line 2219 "rcfile_y.c" +#line 2219 "../rcfile_y.c" break; case 110: /* user_option: PRECONNECT STRING */ #line 319 "../rcfile_y.y" {current.preconnect = (yyvsp[0].sval);} -#line 2225 "rcfile_y.c" +#line 2225 "../rcfile_y.c" break; case 111: /* user_option: POSTCONNECT STRING */ #line 320 "../rcfile_y.y" {current.postconnect = (yyvsp[0].sval);} -#line 2231 "rcfile_y.c" +#line 2231 "../rcfile_y.c" break; case 112: /* user_option: KEEP */ #line 322 "../rcfile_y.y" {current.keep = FLAG_TRUE;} -#line 2237 "rcfile_y.c" +#line 2237 "../rcfile_y.c" break; case 113: /* user_option: FLUSH */ #line 323 "../rcfile_y.y" {current.flush = FLAG_TRUE;} -#line 2243 "rcfile_y.c" +#line 2243 "../rcfile_y.c" break; case 114: /* user_option: LIMITFLUSH */ #line 324 "../rcfile_y.y" {current.limitflush = FLAG_TRUE;} -#line 2249 "rcfile_y.c" +#line 2249 "../rcfile_y.c" break; case 115: /* user_option: FETCHALL */ #line 325 "../rcfile_y.y" {current.fetchall = FLAG_TRUE;} -#line 2255 "rcfile_y.c" +#line 2255 "../rcfile_y.c" break; case 116: /* user_option: REWRITE */ #line 326 "../rcfile_y.y" {current.rewrite = FLAG_TRUE;} -#line 2261 "rcfile_y.c" +#line 2261 "../rcfile_y.c" break; case 117: /* user_option: FORCECR */ #line 327 "../rcfile_y.y" {current.forcecr = FLAG_TRUE;} -#line 2267 "rcfile_y.c" +#line 2267 "../rcfile_y.c" break; case 118: /* user_option: STRIPCR */ #line 328 "../rcfile_y.y" {current.stripcr = FLAG_TRUE;} -#line 2273 "rcfile_y.c" +#line 2273 "../rcfile_y.c" break; case 119: /* user_option: PASS8BITS */ #line 329 "../rcfile_y.y" {current.pass8bits = FLAG_TRUE;} -#line 2279 "rcfile_y.c" +#line 2279 "../rcfile_y.c" break; case 120: /* user_option: DROPSTATUS */ #line 330 "../rcfile_y.y" {current.dropstatus = FLAG_TRUE;} -#line 2285 "rcfile_y.c" +#line 2285 "../rcfile_y.c" break; case 121: /* user_option: DROPDELIVERED */ #line 331 "../rcfile_y.y" {current.dropdelivered = FLAG_TRUE;} -#line 2291 "rcfile_y.c" +#line 2291 "../rcfile_y.c" break; case 122: /* user_option: MIMEDECODE */ #line 332 "../rcfile_y.y" {current.mimedecode = FLAG_TRUE;} -#line 2297 "rcfile_y.c" +#line 2297 "../rcfile_y.c" break; case 123: /* user_option: IDLE */ #line 333 "../rcfile_y.y" {current.idle = FLAG_TRUE;} -#line 2303 "rcfile_y.c" +#line 2303 "../rcfile_y.c" break; case 124: /* user_option: SSL */ @@ -2311,191 +2311,191 @@ yyerror(GT_("SSL is not enabled")); #endif } -#line 2315 "rcfile_y.c" +#line 2315 "../rcfile_y.c" break; case 125: /* user_option: SSLKEY STRING */ #line 342 "../rcfile_y.y" {current.sslkey = prependdir ((yyvsp[0].sval), rcfiledir); free((yyvsp[0].sval));} -#line 2321 "rcfile_y.c" +#line 2321 "../rcfile_y.c" break; case 126: /* user_option: SSLCERT STRING */ #line 343 "../rcfile_y.y" {current.sslcert = prependdir ((yyvsp[0].sval), rcfiledir); free((yyvsp[0].sval));} -#line 2327 "rcfile_y.c" +#line 2327 "../rcfile_y.c" break; case 127: /* user_option: SSLPROTO STRING */ #line 344 "../rcfile_y.y" {current.sslproto = (yyvsp[0].sval);} -#line 2333 "rcfile_y.c" +#line 2333 "../rcfile_y.c" break; case 128: /* user_option: SSLCERTCK */ #line 345 "../rcfile_y.y" {current.sslcertck = FLAG_TRUE;} -#line 2339 "rcfile_y.c" +#line 2339 "../rcfile_y.c" break; case 129: /* user_option: SSLCERTFILE STRING */ #line 346 "../rcfile_y.y" {current.sslcertfile = prependdir((yyvsp[0].sval), rcfiledir); free((yyvsp[0].sval));} -#line 2345 "rcfile_y.c" +#line 2345 "../rcfile_y.c" break; case 130: /* user_option: SSLCERTPATH STRING */ #line 347 "../rcfile_y.y" {current.sslcertpath = prependdir((yyvsp[0].sval), rcfiledir); free((yyvsp[0].sval));} -#line 2351 "rcfile_y.c" +#line 2351 "../rcfile_y.c" break; case 131: /* user_option: SSLCOMMONNAME STRING */ #line 348 "../rcfile_y.y" {current.sslcommonname = (yyvsp[0].sval);} -#line 2357 "rcfile_y.c" +#line 2357 "../rcfile_y.c" break; case 132: /* user_option: SSLFINGERPRINT STRING */ #line 349 "../rcfile_y.y" {current.sslfingerprint = (yyvsp[0].sval);} -#line 2363 "rcfile_y.c" +#line 2363 "../rcfile_y.c" break; case 133: /* user_option: NO KEEP */ #line 351 "../rcfile_y.y" {current.keep = FLAG_FALSE;} -#line 2369 "rcfile_y.c" +#line 2369 "../rcfile_y.c" break; case 134: /* user_option: NO FLUSH */ #line 352 "../rcfile_y.y" {current.flush = FLAG_FALSE;} -#line 2375 "rcfile_y.c" +#line 2375 "../rcfile_y.c" break; case 135: /* user_option: NO LIMITFLUSH */ #line 353 "../rcfile_y.y" {current.limitflush = FLAG_FALSE;} -#line 2381 "rcfile_y.c" +#line 2381 "../rcfile_y.c" break; case 136: /* user_option: NO FETCHALL */ #line 354 "../rcfile_y.y" {current.fetchall = FLAG_FALSE;} -#line 2387 "rcfile_y.c" +#line 2387 "../rcfile_y.c" break; case 137: /* user_option: NO REWRITE */ #line 355 "../rcfile_y.y" {current.rewrite = FLAG_FALSE;} -#line 2393 "rcfile_y.c" +#line 2393 "../rcfile_y.c" break; case 138: /* user_option: NO FORCECR */ #line 356 "../rcfile_y.y" {current.forcecr = FLAG_FALSE;} -#line 2399 "rcfile_y.c" +#line 2399 "../rcfile_y.c" break; case 139: /* user_option: NO STRIPCR */ #line 357 "../rcfile_y.y" {current.stripcr = FLAG_FALSE;} -#line 2405 "rcfile_y.c" +#line 2405 "../rcfile_y.c" break; case 140: /* user_option: NO PASS8BITS */ #line 358 "../rcfile_y.y" {current.pass8bits = FLAG_FALSE;} -#line 2411 "rcfile_y.c" +#line 2411 "../rcfile_y.c" break; case 141: /* user_option: NO DROPSTATUS */ #line 359 "../rcfile_y.y" {current.dropstatus = FLAG_FALSE;} -#line 2417 "rcfile_y.c" +#line 2417 "../rcfile_y.c" break; case 142: /* user_option: NO DROPDELIVERED */ #line 360 "../rcfile_y.y" {current.dropdelivered = FLAG_FALSE;} -#line 2423 "rcfile_y.c" +#line 2423 "../rcfile_y.c" break; case 143: /* user_option: NO MIMEDECODE */ #line 361 "../rcfile_y.y" {current.mimedecode = FLAG_FALSE;} -#line 2429 "rcfile_y.c" +#line 2429 "../rcfile_y.c" break; case 144: /* user_option: NO IDLE */ #line 362 "../rcfile_y.y" {current.idle = FLAG_FALSE;} -#line 2435 "rcfile_y.c" +#line 2435 "../rcfile_y.c" break; case 145: /* user_option: NO SSL */ #line 364 "../rcfile_y.y" {current.use_ssl = FLAG_FALSE;} -#line 2441 "rcfile_y.c" +#line 2441 "../rcfile_y.c" break; case 146: /* user_option: NO SSLCERTCK */ #line 365 "../rcfile_y.y" {current.sslcertck = FLAG_FALSE;} -#line 2447 "rcfile_y.c" +#line 2447 "../rcfile_y.c" break; case 147: /* user_option: LIMIT NUMBER */ #line 367 "../rcfile_y.y" {current.limit = NUM_VALUE_IN((yyvsp[0].number));} -#line 2453 "rcfile_y.c" +#line 2453 "../rcfile_y.c" break; case 148: /* user_option: WARNINGS NUMBER */ #line 368 "../rcfile_y.y" {current.warnings = NUM_VALUE_IN((yyvsp[0].number));} -#line 2459 "rcfile_y.c" +#line 2459 "../rcfile_y.c" break; case 149: /* user_option: FETCHLIMIT NUMBER */ #line 369 "../rcfile_y.y" {current.fetchlimit = NUM_VALUE_IN((yyvsp[0].number));} -#line 2465 "rcfile_y.c" +#line 2465 "../rcfile_y.c" break; case 150: /* user_option: FETCHSIZELIMIT NUMBER */ #line 370 "../rcfile_y.y" {current.fetchsizelimit = NUM_VALUE_IN((yyvsp[0].number));} -#line 2471 "rcfile_y.c" +#line 2471 "../rcfile_y.c" break; case 151: /* user_option: FASTUIDL NUMBER */ #line 371 "../rcfile_y.y" {current.fastuidl = NUM_VALUE_IN((yyvsp[0].number));} -#line 2477 "rcfile_y.c" +#line 2477 "../rcfile_y.c" break; case 152: /* user_option: BATCHLIMIT NUMBER */ #line 372 "../rcfile_y.y" {current.batchlimit = NUM_VALUE_IN((yyvsp[0].number));} -#line 2483 "rcfile_y.c" +#line 2483 "../rcfile_y.c" break; case 153: /* user_option: EXPUNGE NUMBER */ #line 373 "../rcfile_y.y" {current.expunge = NUM_VALUE_IN((yyvsp[0].number));} -#line 2489 "rcfile_y.c" +#line 2489 "../rcfile_y.c" break; case 154: /* user_option: PROPERTIES STRING */ #line 375 "../rcfile_y.y" {current.properties = (yyvsp[0].sval);} -#line 2495 "rcfile_y.c" +#line 2495 "../rcfile_y.c" break; -#line 2499 "rcfile_y.c" +#line 2499 "../rcfile_y.c" default: break; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fetchmail-6.4.31/rcfile_y.h new/fetchmail-6.4.32/rcfile_y.h --- old/fetchmail-6.4.31/rcfile_y.h 2022-07-16 14:02:31.000000000 +0200 +++ new/fetchmail-6.4.32/rcfile_y.h 2022-07-30 11:24:04.000000000 +0200 @@ -35,8 +35,8 @@ especially those whose name start with YY_ or yy_. They are private implementation details that can be changed or removed. */ -#ifndef YY_YY_RCFILE_Y_H_INCLUDED -# define YY_YY_RCFILE_Y_H_INCLUDED +#ifndef YY_YY__RCFILE_Y_H_INCLUDED +# define YY_YY__RCFILE_Y_H_INCLUDED /* Debug traces. */ #ifndef YYDEBUG # define YYDEBUG 1 @@ -261,7 +261,7 @@ int number; char *sval; -#line 265 "rcfile_y.h" +#line 265 "../rcfile_y.h" }; typedef union YYSTYPE YYSTYPE; @@ -276,4 +276,4 @@ int yyparse (void); -#endif /* !YY_YY_RCFILE_Y_H_INCLUDED */ +#endif /* !YY_YY__RCFILE_Y_H_INCLUDED */ ++++++ fetchmail-FAQ-list-gmail-options-including-oauthbearer-and-app.patch ++++++ --- /var/tmp/diff_new_pack.zVMU3L/_old 2022-08-01 21:34:10.490306431 +0200 +++ /var/tmp/diff_new_pack.zVMU3L/_new 2022-08-01 21:34:10.494306443 +0200 @@ -5,14 +5,12 @@ Git-commit: dbeee6a0c0fc5392953f38d6f0dcffdeeb8ae141 --- - fetchmail-FAQ.html | 24 +++++++++++++++++++++--- + fetchmail-FAQ.html | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) -diff --git a/fetchmail-FAQ.html b/fetchmail-FAQ.html -index 82dd92df..027dc9da 100644 --- a/fetchmail-FAQ.html +++ b/fetchmail-FAQ.html -@@ -2004,9 +2004,27 @@ sites.)</p> +@@ -1949,9 +1949,27 @@ sites.)</p> <p>Google has started pushing towards more complex authentication schemes based on OAuth 2.0 that require clients and users to jump through quite a few hoops, and use web browsers for signing in. @@ -43,7 +41,4 @@ browsing capabilities or heavy-weight libraries is "less secure" as Google claims.</p> --- -2.31.1 - ++++++ fetchmail-add-contrib-fetchnmail-oauth2.py-token-acquisition-u.patch ++++++ --- /var/tmp/diff_new_pack.zVMU3L/_old 2022-08-01 21:34:10.506306478 +0200 +++ /var/tmp/diff_new_pack.zVMU3L/_new 2022-08-01 21:34:10.510306489 +0200 @@ -598,7 +598,7 @@ + main(sys.argv) --- a/fetchmail.man +++ b/fetchmail.man -@@ -1062,7 +1062,8 @@ External tools are necessary to obtain +@@ -1073,7 +1073,8 @@ External tools are necessary to obtain such tokens. Access tokens often expire fairly quickly (e.g. 1 hour), and new ones need to be generated from renewal tokens, so the "passwordfile", "passwordfd", or "pwmd_*" options may be useful. See the ++++++ fetchmail-add-imap-oauthbearer-support.patch ++++++ --- /var/tmp/diff_new_pack.zVMU3L/_old 2022-08-01 21:34:10.518306512 +0200 +++ /var/tmp/diff_new_pack.zVMU3L/_new 2022-08-01 21:34:10.522306523 +0200 @@ -10,17 +10,15 @@ conf.c | 2 + fetchmail.c | 3 + fetchmail.h | 2 + - fetchmail.man | 23 +++++++++++- + fetchmail.man | 26 +++++++++++-- fetchmailconf.py | 2 - imap.c | 104 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ options.c | 2 + rcfile_l.l | 1 - 8 files changed, 136 insertions(+), 3 deletions(-) + 8 files changed, 137 insertions(+), 5 deletions(-) -Index: fetchmail-6.4.31/conf.c -=================================================================== ---- fetchmail-6.4.31.orig/conf.c -+++ fetchmail-6.4.31/conf.c +--- a/conf.c ++++ b/conf.c @@ -288,6 +288,8 @@ void dump_config(struct runctl *runp, st stringdump("auth", "otp"); else if (ctl->server.authenticate == A_MSN) @@ -30,10 +28,8 @@ #ifdef HAVE_RES_SEARCH booldump("dns", ctl->server.dns); -Index: fetchmail-6.4.31/fetchmail.c -=================================================================== ---- fetchmail-6.4.31.orig/fetchmail.c -+++ fetchmail-6.4.31/fetchmail.c +--- a/fetchmail.c ++++ b/fetchmail.c @@ -1783,6 +1783,9 @@ static void dump_params (struct runctl * case A_SSH: printf(GT_(" End-to-end encryption assumed.\n")); @@ -44,10 +40,8 @@ } if (ctl->server.principal != (char *) NULL) printf(GT_(" Mail service principal is: %s\n"), ctl->server.principal); -Index: fetchmail-6.4.31/fetchmail.h -=================================================================== ---- fetchmail-6.4.31.orig/fetchmail.h -+++ fetchmail-6.4.31/fetchmail.h +--- a/fetchmail.h ++++ b/fetchmail.h @@ -79,6 +79,7 @@ struct addrinfo; #define A_SSH 8 /* authentication at session level */ #define A_MSN 9 /* same as NTLM with keyword MSN */ @@ -64,11 +58,9 @@ #define PASSWORDLEN 256 /* max password length */ #define DIGESTLEN 33 /* length of MD5 digest */ -Index: fetchmail-6.4.31/fetchmail.man -=================================================================== ---- fetchmail-6.4.31.orig/fetchmail.man -+++ fetchmail-6.4.31/fetchmail.man -@@ -1004,7 +1004,7 @@ AUTHENTICATION below for details). The +--- a/fetchmail.man ++++ b/fetchmail.man +@@ -1006,7 +1006,7 @@ AUTHENTICATION below for details). The \&\fBpassword\fP, \fBkerberos_v5\fP, \fBkerberos\fP (or, for excruciating exactness, \fBkerberos_v4\fP), \fBgssapi\fP, \fBcram\-md5\fP, \fBotp\fP, \fBntlm\fP, \fBmsn\fP (only for POP3), @@ -77,7 +69,7 @@ When \fBany\fP (the default) is specified, fetchmail tries first methods that do not require a password (EXTERNAL, GSSAPI, KERBEROS\ IV, KERBEROS\ 5); then it looks for methods that mask your password -@@ -1029,8 +1029,24 @@ authentication. This option does not wo +@@ -1031,8 +1031,24 @@ authentication. This option does not wo in line with RFC-2743 and IANA registrations, see .UR https://www.iana.org/assignments/gssapi-service-names/ Generic Security Service Application Program Interface (GSSAPI)/Kerberos/Simple @@ -104,7 +96,7 @@ .SS Miscellaneous Options .TP .B \-f <pathname> | \-\-fetchmailrc <pathname> -@@ -2323,7 +2339,9 @@ Legal protocol identifiers for use with +@@ -2325,7 +2341,9 @@ Legal protocol identifiers for use with .PP Legal authentication types are 'any', 'password', 'kerberos', \&'kerberos_v4', 'kerberos_v5' and 'gssapi', 'cram\-md5', 'otp', 'msn' @@ -115,10 +107,8 @@ The 'password' type specifies authentication by normal transmission of a password (the password may be plain text or subject to protocol-specific encryption as in CRAM-MD5); -Index: fetchmail-6.4.31/fetchmailconf.py -=================================================================== ---- fetchmail-6.4.31.orig/fetchmailconf.py -+++ fetchmail-6.4.31/fetchmailconf.py +--- a/fetchmailconf.py ++++ b/fetchmailconf.py @@ -500,7 +500,7 @@ defaultports = {"auto":None, "ODMR":"odmr"} @@ -128,10 +118,8 @@ listboxhelp = { 'title' : 'List Selection Help', -Index: fetchmail-6.4.31/imap.c -=================================================================== ---- fetchmail-6.4.31.orig/imap.c -+++ fetchmail-6.4.31/imap.c +--- a/imap.c ++++ b/imap.c @@ -26,6 +26,10 @@ #define IMAP4 0 /* IMAP4 rev 0, RFC1730 */ #define IMAP4rev1 1 /* IMAP4 rev 1, RFC2060 */ @@ -271,10 +259,8 @@ /* Yahoo hack - we'll just try ID if it was offered by the server, * and IGNORE errors. */ { -Index: fetchmail-6.4.31/options.c -=================================================================== ---- fetchmail-6.4.31.orig/options.c -+++ fetchmail-6.4.31/options.c +--- a/options.c ++++ b/options.c @@ -421,6 +421,8 @@ int parsecmdline (int argc /** argument ctl->server.authenticate = A_ANY; else if (strcmp(optarg, "msn") == 0) @@ -284,10 +270,8 @@ else { fprintf(stderr,GT_("Invalid authentication `%s' specified.\n"), optarg); errflag++; -Index: fetchmail-6.4.31/rcfile_l.l -=================================================================== ---- fetchmail-6.4.31.orig/rcfile_l.l -+++ fetchmail-6.4.31/rcfile_l.l +--- a/rcfile_l.l ++++ b/rcfile_l.l @@ -106,6 +106,7 @@ cram(-md5)? { SETSTATE(0); yylval.proto msn { SETSTATE(0); yylval.proto = A_MSN; return AUTHTYPE;} ntlm { SETSTATE(0); yylval.proto = A_NTLM; return AUTHTYPE;} ++++++ fetchmail-add-passwordfile-and-passwordfd-options.patch ++++++ --- /var/tmp/diff_new_pack.zVMU3L/_old 2022-08-01 21:34:10.538306569 +0200 +++ /var/tmp/diff_new_pack.zVMU3L/_new 2022-08-01 21:34:10.542306581 +0200 @@ -5,19 +5,17 @@ Git-commit: cdd7182f65734c97723ba5f282040e08d830e650 --- - fetchmail.c | 82 +++++++++++++++++++++++++++++++++++++++++++++++++-- - fetchmail.h | 2 ++ - fetchmail.man | 40 ++++++++++++++++++++++++- - options.c | 16 ++++++++++ - rcfile_l.l | 2 ++ - rcfile_y.y | 6 ++++ + fetchmail.c | 82 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- + fetchmail.h | 2 + + fetchmail.man | 40 +++++++++++++++++++++++++++- + options.c | 16 +++++++++++ + rcfile_l.l | 2 + + rcfile_y.y | 6 ++++ 6 files changed, 145 insertions(+), 3 deletions(-) -diff --git a/fetchmail.c b/fetchmail.c -index ead6d1f2..0292d42a 100644 --- a/fetchmail.c +++ b/fetchmail.c -@@ -387,7 +387,7 @@ int main(int argc, char **argv) +@@ -451,7 +451,7 @@ int main(int argc, char **argv) /* Server won't care what the password is, but there must be some non-null string here. */ ctl->password = ctl->remotename; @@ -26,7 +24,7 @@ { netrc_entry *p; -@@ -554,8 +554,81 @@ int main(int argc, char **argv) +@@ -618,8 +618,81 @@ int main(int argc, char **argv) if (ctl->active && !(implicitmode && ctl->server.skip) && !NO_PASSWORD(ctl) && !ctl->password) { @@ -109,7 +107,7 @@ fprintf(stderr, GT_("fetchmail: can't find a password for %s@%s.\n"), ctl->remotename, ctl->server.pollname); -@@ -1000,6 +1073,10 @@ static void optmerge(struct query *h2, struct query *h1, int force) +@@ -1035,6 +1108,10 @@ static void optmerge(struct query *h2, s FLAG_MERGE(wildcard); STRING_MERGE(remotename); STRING_MERGE(password); @@ -120,7 +118,7 @@ STRING_MERGE(mda); STRING_MERGE(bsmtp); FLAG_MERGE(listener); -@@ -1064,6 +1141,7 @@ static int load_params(int argc, char **argv, int optind) +@@ -1099,6 +1176,7 @@ static int load_params(int argc, char ** def_opts.smtp_socket = -1; def_opts.smtpaddress = (char *)0; def_opts.smtpname = (char *)0; @@ -128,11 +126,9 @@ def_opts.server.protocol = P_AUTO; def_opts.server.timeout = CLIENT_TIMEOUT; def_opts.server.esmtp_name = user; -diff --git a/fetchmail.h b/fetchmail.h -index 22b72827..715cc2d0 100644 --- a/fetchmail.h +++ b/fetchmail.h -@@ -336,6 +336,8 @@ struct query +@@ -326,6 +326,8 @@ struct query int wildcard; /* should unmatched names be passed through */ char *remotename; /* remote login name to use */ char *password; /* remote password to use */ @@ -141,11 +137,9 @@ struct idlist *mailboxes; /* list of mailboxes to check */ /* per-forwarding-target data */ -diff --git a/fetchmail.man b/fetchmail.man -index aece716e..9c6ed4ad 100644 --- a/fetchmail.man +++ b/fetchmail.man -@@ -872,6 +872,37 @@ The default is your login name on the client machine that is running +@@ -949,6 +949,37 @@ The default is your login name on the cl \fBfetchmail\fP. See USER AUTHENTICATION below for a complete description. .TP @@ -183,7 +177,7 @@ .B \-I <specification> | \-\-interface <specification> (Keyword: interface) .br -@@ -955,7 +986,8 @@ setting also allows the non-standard "xoauth2" SASL scheme (using +@@ -1040,7 +1071,8 @@ setting also allows the non-standard "xo the same token) if the server only claims to support "xoauth2". External tools are necessary to obtain such tokens. Access tokens often expire fairly quickly (e.g. 1 hour), @@ -193,7 +187,7 @@ oauth2.py script from .URL https://github.com/google/gmail-oauth2-tools/wiki/OAuth2DotPyRunThrough "Google's Oauth2 Run Through" , and other oauth2 documentation. For services like gmail, an "App Password" -@@ -1844,6 +1876,12 @@ T} +@@ -1953,6 +1985,12 @@ T} pass[word] \& \& T{ Specify remote account password T} @@ -206,11 +200,9 @@ ssl \& \& T{ Connect to server over the specified base protocol using SSL encryption T} -diff --git a/options.c b/options.c -index a181c6d9..99b8e020 100644 --- a/options.c +++ b/options.c -@@ -26,6 +26,8 @@ enum { +@@ -31,6 +31,8 @@ enum { LA_POSTMASTER, LA_NOBOUNCE, LA_AUTH, @@ -219,7 +211,7 @@ LA_FETCHDOMAINS, LA_BSMTP, LA_LMTP, -@@ -103,6 +105,8 @@ static const struct option longoptions[] = { +@@ -94,6 +96,8 @@ static const struct option longoptions[] {"port", required_argument, (int *) 0, 'P' }, {"service", required_argument, (int *) 0, 'P' }, {"auth", required_argument, (int *) 0, LA_AUTH}, @@ -228,7 +220,7 @@ {"timeout", required_argument, (int *) 0, 't' }, {"envelope", required_argument, (int *) 0, 'E' }, {"qvirtual", required_argument, (int *) 0, 'Q' }, -@@ -236,6 +240,7 @@ int parsecmdline (int argc /** argument count */, +@@ -261,6 +265,7 @@ int parsecmdline (int argc /** argument memset(ctl, '\0', sizeof(struct query)); /* start clean */ ctl->smtp_socket = -1; @@ -236,7 +228,7 @@ while (!errflag && (c = getopt_long(argc,argv,shortoptions, -@@ -407,6 +412,17 @@ int parsecmdline (int argc /** argument count */, +@@ -428,6 +433,17 @@ int parsecmdline (int argc /** argument errflag++; } break; @@ -254,11 +246,9 @@ case 't': ctl->server.timeout = xatoi(optarg, &errflag); if (ctl->server.timeout == 0) -diff --git a/rcfile_l.l b/rcfile_l.l -index 824845b3..47a37d0f 100644 --- a/rcfile_l.l +++ b/rcfile_l.l -@@ -115,6 +115,8 @@ pwmd_socket { return PWMD_SOCKET; } +@@ -118,6 +118,8 @@ accept { return ACCEPT; } reject { return REJECT_; } user(name)? {SETSTATE(NAME); return USERNAME; } @@ -267,11 +257,9 @@ <INITIAL,NAME>pass(word)? {SETSTATE(NAME); return PASSWORD; } folder(s)? { return FOLDER; } smtp(host)? { return SMTPHOST; } -diff --git a/rcfile_y.y b/rcfile_y.y -index 815fbd74..3967adb3 100644 --- a/rcfile_y.y +++ b/rcfile_y.y -@@ -61,6 +61,7 @@ extern char * yytext; +@@ -63,6 +63,7 @@ extern char * yytext; %token DEFAULTS POLL SKIP VIA AKA LOCALDOMAINS PROTOCOL %token AUTHENTICATE TIMEOUT KPOP SDPS ENVELOPE QVIRTUAL %token USERNAME PASSWORD FOLDER SMTPHOST FETCHDOMAINS MDA BSMTP LMTP @@ -279,7 +267,7 @@ %token SMTPADDRESS SMTPNAME SPAMRESPONSE PRECONNECT POSTCONNECT LIMIT WARNINGS %token INTERFACE MONITOR PLUGIN PLUGOUT %token IS HERE THERE TO MAP -@@ -315,6 +316,8 @@ user_option : TO mapping_list HERE +@@ -307,6 +308,8 @@ user_option : TO mapping_list HERE | IS STRING THERE {current.remotename = $2;} | PASSWORD STRING {current.password = $2;} @@ -288,7 +276,7 @@ | FOLDER folder_list | SMTPHOST smtp_list | FETCHDOMAINS fetch_list -@@ -539,6 +542,7 @@ static void reset_server(const char *name, int skip) +@@ -505,6 +508,7 @@ static void reset_server(const char *nam trailer = FALSE; memset(¤t,'\0',sizeof(current)); current.smtp_socket = -1; @@ -296,7 +284,7 @@ current.server.pollname = xstrdup(name); current.server.skip = skip; current.server.principal = (char *)NULL; -@@ -560,6 +564,7 @@ static void user_reset(void) +@@ -526,6 +530,7 @@ static void user_reset(void) memset(¤t, '\0', sizeof(current)); current.smtp_socket = -1; @@ -304,7 +292,7 @@ current.server = save; } -@@ -580,6 +585,7 @@ struct query *hostalloc(struct query *init /** pointer to block containing +@@ -546,6 +551,7 @@ struct query *hostalloc(struct query *in { memset(node, '\0', sizeof(struct query)); node->smtp_socket = -1; @@ -312,7 +300,4 @@ } /* append to end of list */ --- -2.31.1 - ++++++ fetchmail-add-query_to64_outsize-utility-function.patch ++++++ --- /var/tmp/diff_new_pack.zVMU3L/_old 2022-08-01 21:34:10.554306615 +0200 +++ /var/tmp/diff_new_pack.zVMU3L/_new 2022-08-01 21:34:10.558306627 +0200 @@ -5,14 +5,12 @@ Git-commit: cc6e146d516140df800da68976eb7c0aa1cef7c0 --- - base64.c | 7 +++++++ - fetchmail.h | 1 + + base64.c | 7 +++++++ + fetchmail.h | 1 + 2 files changed, 8 insertions(+) -Index: fetchmail-6.4.22/base64.c -=================================================================== ---- fetchmail-6.4.22.orig/base64.c -+++ fetchmail-6.4.22/base64.c +--- a/base64.c ++++ b/base64.c @@ -66,6 +66,13 @@ fail: return rc; } @@ -27,10 +25,8 @@ int from64tobits(void *out_, const char *in, int maxlen) /* base 64 to raw bytes in quasi-big-endian order, returning count of bytes */ /* maxlen limits output buffer size, set to zero to ignore */ -Index: fetchmail-6.4.22/fetchmail.h -=================================================================== ---- fetchmail-6.4.22.orig/fetchmail.h -+++ fetchmail-6.4.22/fetchmail.h +--- a/fetchmail.h ++++ b/fetchmail.h @@ -642,6 +642,7 @@ int prc_filecheck(const char *, const fl /* base64.c */ unsigned len64frombits(unsigned inlen); /** calculate length needed to encode inlen octets. warnings: 1. caller needs to add 1 for a trailing \0 byte himself. 2. returns 0 for inlen 0! */ ++++++ fetchmail-add-readme-oauth2-issue-27.patch ++++++ --- /var/tmp/diff_new_pack.zVMU3L/_old 2022-08-01 21:34:10.574306673 +0200 +++ /var/tmp/diff_new_pack.zVMU3L/_new 2022-08-01 21:34:10.578306684 +0200 @@ -5,12 +5,9 @@ Git-commit: d52ba9652c9207358e0b9acc11403688f6f16b9e --- - README.OAUTH2 | 147 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + README.OAUTH2 | 147 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 147 insertions(+) -diff --git a/README.OAUTH2 b/README.OAUTH2 -new file mode 100644 -index 00000000..e861c812 --- /dev/null +++ b/README.OAUTH2 @@ -0,0 +1,147 @@ @@ -162,4 +159,3 @@ + + Google API Dashboard: https://console.developers.google.com/apis/dashboard + + Google Cloud Resource Manager: https://console.developers.google.com/cloud-resource-manager - ++++++ fetchmail-bump-max-passwordlen-to-1bytes.patch ++++++ --- /var/tmp/diff_new_pack.zVMU3L/_old 2022-08-01 21:34:10.594306730 +0200 +++ /var/tmp/diff_new_pack.zVMU3L/_new 2022-08-01 21:34:10.598306741 +0200 @@ -5,14 +5,12 @@ Git-commit: 919fd787540c4a3fa4694566edce406df1e42001 --- - fetchmail.h | 2 +- + fetchmail.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/fetchmail.h b/fetchmail.h -index af4d0dd2..ac248805 100644 --- a/fetchmail.h +++ b/fetchmail.h -@@ -104,7 +104,7 @@ enum authenticators { +@@ -116,7 +116,7 @@ struct addrinfo; #define NAMELEN 64 /* max username length */ /* oauth2 access tokens seem to be about 130 characters; make this longer: */ @@ -22,4 +20,3 @@ /* exit code values */ - ++++++ fetchmail-chase-and-integrate-interface-change.patch ++++++ --- /var/tmp/diff_new_pack.zVMU3L/_old 2022-08-01 21:34:10.622306810 +0200 +++ /var/tmp/diff_new_pack.zVMU3L/_new 2022-08-01 21:34:10.622306810 +0200 @@ -5,11 +5,9 @@ Git-commit: d52b7b6859d46134b46e6de9b408739b18745d47 --- - oauth2.c | 3 ++- + oauth2.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -diff --git a/oauth2.c b/oauth2.c -index a8a324b8..4f7a072a 100644 --- a/oauth2.c +++ b/oauth2.c @@ -10,6 +10,7 @@ @@ -20,7 +18,7 @@ #include <string.h> char *get_oauth2_string(struct query *ctl,flag xoauth2) -@@ -52,7 +53,7 @@ char *get_oauth2_string(struct query *ctl,flag xoauth2) +@@ -52,7 +53,7 @@ char *get_oauth2_string(struct query *ct } oauth2b64 = (char *)xmalloc(2*strlen(oauth2str)+8); @@ -30,4 +28,3 @@ memset(oauth2str, 0x55, strlen(oauth2str)); free(oauth2str); - ++++++ fetchmail-give-each-ctl-it-s-own-copy-of-password.patch ++++++ --- /var/tmp/diff_new_pack.zVMU3L/_old 2022-08-01 21:34:10.642306868 +0200 +++ /var/tmp/diff_new_pack.zVMU3L/_new 2022-08-01 21:34:10.646306879 +0200 @@ -10,14 +10,12 @@ I haven't tested pwmd, but these seem like obvious fixes. --- - fetchmail.c | 12 ++++++++++-- + fetchmail.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) -diff --git a/fetchmail.c b/fetchmail.c -index 0292d42a..e2828a4f 100644 --- a/fetchmail.c +++ b/fetchmail.c -@@ -386,7 +386,7 @@ int main(int argc, char **argv) +@@ -450,7 +450,7 @@ int main(int argc, char **argv) if (NO_PASSWORD(ctl)) /* Server won't care what the password is, but there must be some non-null string here. */ @@ -26,7 +24,7 @@ else if (!ctl->passwordfile && ctl->passwordfd==-1) { netrc_entry *p; -@@ -1072,7 +1072,15 @@ static void optmerge(struct query *h2, struct query *h1, int force) +@@ -1107,7 +1107,15 @@ static void optmerge(struct query *h2, s FLAG_MERGE(wildcard); STRING_MERGE(remotename); @@ -43,7 +41,4 @@ FLAG_MERGE(passwordfile); if (force ? h1->passwordfd!=-1 : h2->passwordfd==-1) { h2->passwordfd = h1->passwordfd; --- -2.31.1 - ++++++ fetchmail-increase-max-password-length-to-handle-oauth-tokens.patch ++++++ --- /var/tmp/diff_new_pack.zVMU3L/_old 2022-08-01 21:34:10.666306936 +0200 +++ /var/tmp/diff_new_pack.zVMU3L/_new 2022-08-01 21:34:10.670306947 +0200 @@ -14,14 +14,12 @@ This simply patches the hard-coded limit to 4096 bytes, but it might not be sufficient. --- - fetchmail.h | 2 +- + fetchmail.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/fetchmail.h b/fetchmail.h -index bebb094d..6ff23919 100644 --- a/fetchmail.h +++ b/fetchmail.h -@@ -104,7 +104,7 @@ enum authenticators { +@@ -116,7 +116,7 @@ struct addrinfo; #define NAMELEN 64 /* max username length */ /* oauth2 access tokens seem to be about 130 characters; make this longer: */ @@ -31,4 +29,3 @@ /* exit code values */ - ++++++ fetchmail-oauth2-c-calculate-and-pass-in-correct-buffer-size-to-to64frombits.patch ++++++ --- /var/tmp/diff_new_pack.zVMU3L/_old 2022-08-01 21:34:10.682306983 +0200 +++ /var/tmp/diff_new_pack.zVMU3L/_new 2022-08-01 21:34:10.686306994 +0200 @@ -8,14 +8,12 @@ approximate size. --- - oauth2.c | 6 ++++-- + oauth2.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) -diff --git a/oauth2.c b/oauth2.c -index 4f7a072a..addc91aa 100644 --- a/oauth2.c +++ b/oauth2.c -@@ -34,6 +34,7 @@ char *get_oauth2_string(struct query *ctl,flag xoauth2) +@@ -34,6 +34,7 @@ char *get_oauth2_string(struct query *ct int oauth2len; char *oauth2b64; @@ -23,7 +21,7 @@ oauth2len = strlen(ctl->remotename) + strlen(ctl->password) + 32; oauth2str = (char *)xmalloc(oauth2len); -@@ -52,8 +53,9 @@ char *get_oauth2_string(struct query *ctl,flag xoauth2) +@@ -52,8 +53,9 @@ char *get_oauth2_string(struct query *ct ctl->password); } @@ -36,4 +34,3 @@ memset(oauth2str, 0x55, strlen(oauth2str)); free(oauth2str); - ++++++ fetchmail-re-read-passwordfile-on-every-poll.patch ++++++ --- /var/tmp/diff_new_pack.zVMU3L/_old 2022-08-01 21:34:10.698307028 +0200 +++ /var/tmp/diff_new_pack.zVMU3L/_new 2022-08-01 21:34:10.702307040 +0200 @@ -5,15 +5,13 @@ Git-commit: c2b96715bb39b9cfd1c751eae6b0111bed9c8581 --- - fetchmail.c | 101 +++++++++++++++++++++++++++++++++----------------- - fetchmail.man | 9 ++--- - 2 files changed, 70 insertions(+), 40 deletions(-) + fetchmail.c | 100 ++++++++++++++++++++++++++++++++++++++-------------------- + fetchmail.man | 9 +---- + 2 files changed, 69 insertions(+), 40 deletions(-) -diff --git a/fetchmail.c b/fetchmail.c -index e2828a4f..eb277c28 100644 --- a/fetchmail.c +++ b/fetchmail.c -@@ -586,48 +586,19 @@ int main(int argc, char **argv) +@@ -650,48 +650,19 @@ int main(int argc, char **argv) } ctl->password = xstrdup(msg); @@ -26,25 +24,25 @@ - int res; - - if (fd == -1) { -- int saveErrno = errno; -- fprintf(stderr, -- GT_("fetchmail: unable to open %s: %s\n"), -- ctl->passwordfile, -- strerror(saveErrno)); -- return PS_AUTHFAIL; -- } -- -- res = read(fd, msg, sizeof(msg)-1); -- if (res == -1 || close(fd) == -1) { + if (access(ctl->passwordfile, R_OK) != 0) { int saveErrno = errno; fprintf(stderr, -- GT_("fetchmail: error reading %s: %s\n"), +- GT_("fetchmail: unable to open %s: %s\n"), + GT_("fetchmail: unable to access %s: %s\n"), ctl->passwordfile, strerror(saveErrno)); return PS_AUTHFAIL; } +- +- res = read(fd, msg, sizeof(msg)-1); +- if (res == -1 || close(fd) == -1) { +- int saveErrno = errno; +- fprintf(stderr, +- GT_("fetchmail: error reading %s: %s\n"), +- ctl->passwordfile, +- strerror(saveErrno)); +- return PS_AUTHFAIL; +- } - msg[res] = '\0'; - - newline = memchr(msg, '\n', res); @@ -67,7 +65,7 @@ } else if (!isatty(0)) { fprintf(stderr, GT_("fetchmail: can't find a password for %s@%s.\n"), -@@ -643,6 +614,8 @@ int main(int argc, char **argv) +@@ -707,6 +678,8 @@ int main(int argc, char **argv) ctl->password = xstrdup((char *)fm_getpassword(tmpbuf)); free(tmpbuf); } @@ -76,7 +74,7 @@ } } -@@ -843,6 +816,65 @@ int main(int argc, char **argv) +@@ -897,6 +870,65 @@ int main(int argc, char **argv) dofastuidl = 0; /* this is reset in the driver if required */ @@ -142,11 +140,9 @@ querystatus = query_host(ctl); if (NUM_NONZERO(ctl->fastuidl)) -diff --git a/fetchmail.man b/fetchmail.man -index b6309d40..6b375d89 100644 --- a/fetchmail.man +++ b/fetchmail.man -@@ -877,12 +877,9 @@ See USER AUTHENTICATION below for a complete description. +@@ -954,12 +954,9 @@ See USER AUTHENTICATION below for a comp .br Specifies a file name from which to read the first line to use as the password. Useful if something changes the password/token often without regenerating a @@ -161,7 +157,7 @@ .TP .B \-\-passwordfd <integer> (Keyword: passwordfd) -@@ -895,7 +892,7 @@ although it could also be a redirected input file +@@ -972,7 +969,7 @@ although it could also be a redirected i (equivalent to "fetchmail \-\-passwordfd 5 5</path/to/file"). Useful if something wants to manage password ownership more securely than files, or if the password/token changes often, @@ -170,7 +166,4 @@ mode passwords requires that standard input is a terminal and disables echo, but passwordfd does not care. Do not do something like "echo 'password' | fetchmail ...", since echo's arguments are --- -2.31.1 - ++++++ fetchmail-support-oauthbearer-xoauth2-with-pop3.patch ++++++ --- /var/tmp/diff_new_pack.zVMU3L/_old 2022-08-01 21:34:10.710307063 +0200 +++ /var/tmp/diff_new_pack.zVMU3L/_new 2022-08-01 21:34:10.714307074 +0200 @@ -6,21 +6,19 @@ (Also factor out some common imap/pop3 oauth2 code.) --- - Makefile.am | 2 +- - fetchmail.man | 5 +-- - imap.c | 53 +++------------------- - oauth2.c | 61 +++++++++++++++++++++++++ - oauth2.h | 6 +++ - pop3.c | 122 ++++++++++++++++++++++++++++++++++++++++++++++++-- - 6 files changed, 196 insertions(+), 53 deletions(-) + Makefile.am | 2 + fetchmail.man | 5 -- + imap.c | 53 +++-------------------- + oauth2.c | 61 +++++++++++++++++++++++++++ + oauth2.h | 6 ++ + pop3.c | 130 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--- + 6 files changed, 202 insertions(+), 55 deletions(-) create mode 100644 oauth2.c create mode 100644 oauth2.h -Index: fetchmail-6.4.25/Makefile.am -=================================================================== ---- fetchmail-6.4.25.orig/Makefile.am -+++ fetchmail-6.4.25/Makefile.am -@@ -68,7 +68,7 @@ fetchmail_SOURCES= fetchmail.h getopt.h +--- a/Makefile.am ++++ b/Makefile.am +@@ -74,7 +74,7 @@ fetchmail_SOURCES= fetchmail.h getopt.h fetchmail.c env.c idle.c options.c daemon.c \ driver.c transact.c sink.c smtp.c \ idlist.c uid.c mxget.c md5ify.c cram.c gssapi.c \ @@ -29,11 +27,9 @@ unmime.c conf.c checkalias.c uid_db.h uid_db.c\ lock.h lock.c \ rcfile_l.l rcfile_y.y \ -Index: fetchmail-6.4.25/fetchmail.man -=================================================================== ---- fetchmail-6.4.25.orig/fetchmail.man -+++ fetchmail-6.4.25/fetchmail.man -@@ -1001,7 +1001,7 @@ AUTHENTICATION below for details). The +--- a/fetchmail.man ++++ b/fetchmail.man +@@ -1006,7 +1006,7 @@ AUTHENTICATION below for details). The \&\fBpassword\fP, \fBkerberos_v5\fP, \fBkerberos\fP (or, for excruciating exactness, \fBkerberos_v4\fP), \fBgssapi\fP, \fBcram\-md5\fP, \fBotp\fP, \fBntlm\fP, \fBmsn\fP (only for POP3), @@ -42,7 +38,7 @@ When \fBany\fP (the default) is specified, fetchmail tries first methods that do not require a password (EXTERNAL, GSSAPI, KERBEROS\ IV, KERBEROS\ 5); then it looks for methods that mask your password -@@ -2340,8 +2340,7 @@ Legal protocol identifiers for use with +@@ -2342,8 +2342,7 @@ Legal protocol identifiers for use with Legal authentication types are 'any', 'password', 'kerberos', \&'kerberos_v4', 'kerberos_v5' and 'gssapi', 'cram\-md5', 'otp', 'msn' (only for POP3), 'ntlm', 'ssh', 'external' (only IMAP), @@ -52,10 +48,8 @@ The 'password' type specifies authentication by normal transmission of a password (the password may be plain text or subject to protocol-specific encryption as in CRAM-MD5); -Index: fetchmail-6.4.25/imap.c -=================================================================== ---- fetchmail-6.4.25.orig/imap.c -+++ fetchmail-6.4.25/imap.c +--- a/imap.c ++++ b/imap.c @@ -17,6 +17,7 @@ #include <limits.h> #include <errno.h> @@ -134,10 +128,8 @@ return ok; } -Index: fetchmail-6.4.25/oauth2.c -=================================================================== --- /dev/null -+++ fetchmail-6.4.25/oauth2.c ++++ b/oauth2.c @@ -0,0 +1,61 @@ +/* + * oauth2.c -- oauthbearer and xoauth2 support @@ -200,10 +192,8 @@ + + return oauth2b64; +} -Index: fetchmail-6.4.25/oauth2.h -=================================================================== --- /dev/null -+++ fetchmail-6.4.25/oauth2.h ++++ b/oauth2.h @@ -0,0 +1,6 @@ +#ifndef OAUTH2_H +#define OAUTH2_H @@ -211,10 +201,8 @@ +char *get_oauth2_string(struct query *ctl,flag xoauth2); + +#endif /*OAUTH2_H*/ -Index: fetchmail-6.4.25/pop3.c -=================================================================== ---- fetchmail-6.4.25.orig/pop3.c -+++ fetchmail-6.4.25/pop3.c +--- a/pop3.c ++++ b/pop3.c @@ -20,6 +20,7 @@ #include <errno.h>
