From 646e4354ff43e61380be4e8302c0bdff4d3bc8207feabb52cf2cf8cb50f62e07 Mon Sep 17 00:00:00 2001 From: David Anes Date: Tue, 13 Sep 2022 07:23:34 +0000 Subject: [PATCH] Accepting request 1003038 from home:mcepl:branches:server:mail - Update to 6.4.33: - Turns out the snapd version of HTMLDOC 1.9.16 is broken, so I have added a wrapper script that uses the flatpak version of HTMLDOC, for the benefit of rebuilding on distros that do not ship HTMLDOC natively. - Remove upstreamed 44-uncorrupt_runfetchmail.patch OBS-URL: https://build.opensuse.org/request/show/1003038 OBS-URL: https://build.opensuse.org/package/show/server:mail/fetchmail?expand=0&rev=141 --- 44-uncorrupt_runfetchmail.patch | 126 -------------------------------- fetchmail-6.4.32.tar.xz | 3 - fetchmail-6.4.32.tar.xz.asc | 16 ---- fetchmail-6.4.33.tar.xz | 3 + fetchmail-6.4.33.tar.xz.asc | 16 ++++ fetchmail.changes | 10 +++ fetchmail.spec | 5 +- 7 files changed, 30 insertions(+), 149 deletions(-) delete mode 100644 44-uncorrupt_runfetchmail.patch delete mode 100644 fetchmail-6.4.32.tar.xz delete mode 100644 fetchmail-6.4.32.tar.xz.asc create mode 100644 fetchmail-6.4.33.tar.xz create mode 100644 fetchmail-6.4.33.tar.xz.asc diff --git a/44-uncorrupt_runfetchmail.patch b/44-uncorrupt_runfetchmail.patch deleted file mode 100644 index 5b9cbb1..0000000 --- a/44-uncorrupt_runfetchmail.patch +++ /dev/null @@ -1,126 +0,0 @@ -From 74d986faab60fd1fa202ee973cc345ec7b2639ae Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Mat=C4=9Bj=20Cepl?= -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! $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 -- diff --git a/fetchmail-6.4.32.tar.xz b/fetchmail-6.4.32.tar.xz deleted file mode 100644 index 2cddea8..0000000 --- a/fetchmail-6.4.32.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3ee7444665606ad06fb5f7b15f91e3173b845bc98b646b1a4514a46aa48b7228 -size 1427072 diff --git a/fetchmail-6.4.32.tar.xz.asc b/fetchmail-6.4.32.tar.xz.asc deleted file mode 100644 index 846b2ea..0000000 --- a/fetchmail-6.4.32.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEE3EplW9mTzUhx+oIQ5BKxVu/zhVoFAmLlCKMACgkQ5BKxVu/z -hVoDvw//R55gzSl+eHP34KkVs+W47VQdjZDvVWuk4WfXEFoTzu/F/dX1z/mxYV96 -5nfo233Dly11bbaIFGD5fOB3fiffhr0xz0e6qaCEHZ+jjDCDtnJ8hAPL2gi90piu -FhMKvr4/tKglPVHp0FoiLS2eEc8XEceGKE3QYzuLbKyRfZxt/xwSEdzzvBjM+GoH -bF2qMCTmtUb9GxmDE2KzdrndCrwOK9tlT4GFpqjqsjvGwUmtlzMTFrYMtyaQaPX5 -5IqMMaazzeSDjgjgbpQD7Sj4ZPAUZjSMry4UJn2m2ImqqGSM1pTAb4fyIJMIHtU1 -I0JsyapEcE6o+FmEjNB18DHVlW+DeEUc3NcS9UBlXc9QuQbTqJeztDMsIqN9a9HU -kIYoZACpwYzB0ynpOsNqkxn7ObCzEzm5Kr1Cq2ULFG5zAdv4bojvbMPECUKk6XYb -uIOSat1MuZWVbMMSrumAHi/SgmdfwNKdbDmqUKIcB4WiKFC54ABGGt5eZw4ZFIPl -JQe8pLhKcQ418ks4AHA+gz68Ki8B2zw2Zv/7x6Ngw9Yo6TSrkvFzDHDVG0XhReI7 -Vt6kgLrLXKQhjUYcsqwdGTnSUO5zuqQKfu1dwC2eEQD7XfCDAQC1Q1jQWWfMsO1J -oNfEDR+ZpFSCWpoRBKhF/aHqvC2bi+rClw2yMJ8z+3yOYGh0AXo= -=xnsL ------END PGP SIGNATURE----- diff --git a/fetchmail-6.4.33.tar.xz b/fetchmail-6.4.33.tar.xz new file mode 100644 index 0000000..b287b08 --- /dev/null +++ b/fetchmail-6.4.33.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:82954ebd26c77906463ce20adca45cbcf8068957441e17941bd3052a5c15432e +size 1330708 diff --git a/fetchmail-6.4.33.tar.xz.asc b/fetchmail-6.4.33.tar.xz.asc new file mode 100644 index 0000000..9470b9e --- /dev/null +++ b/fetchmail-6.4.33.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEE3EplW9mTzUhx+oIQ5BKxVu/zhVoFAmMJwwoACgkQ5BKxVu/z +hVog/xAAr40nqKtJc1ob9wUqBfLomxvGs60JXdb+5SU3pHmCcU3swG20FTjeWLJE +aiObZ2oVoO2YKoTXbXiDGANV+sa73WEj0BbUMYfSnKiX108Wxo1VLdBEBZ/+Waqk +HYZf4IRnr/XsSCpDRvIgahVkSGhpK2mBYLd7k4uNHRXZREV2djI6SzAg8lTOwf2n +n2G2jq8iNRKcvGShx1ljiZOpx1TW6CdeAdlRr/ppOF1k7L9MWeaq+da7wjKuTAx3 +XejLqBDAo/oCrUCCWpO/AtklMxfW5EZCK6rnYW2ix57I9wgrVPbB95uiIyqkpp+b +FzPGA6MRF/RvFjOG9FE260nWpjm2xeYEuUpaOUsg0Xf454mHX9/X6/y2zZorHuKw +i6ShEZbGLCAP29SzN0QglbP+vAe9zQLvh23AqbJ3QHCnKZiCUp3umlLi4Pbxme1x +xziQtcWhvqMUXeyHFEFFWIeXeFKRQSkbvM7znKKJOREjNLjqr+S/ADijvOtokGy6 +GTCNiOWcvUsow0QB/hazBgo6ZF8u6dczHR8F3aEeekbLqbJjqmTTIK5rt+GYSVw9 +R+AqcEXPIJ4ZUVUsb00pzk0q48TfkqEva9g87/c0MeOcdyvr1uG43rtT28s2lWSv +9r3wu0P+j5kEd3bjuJwukzKCsYV6xCqh7kIFCViw5VHUgEOcZf8= +=pxiS +-----END PGP SIGNATURE----- diff --git a/fetchmail.changes b/fetchmail.changes index 8843098..fad962d 100644 --- a/fetchmail.changes +++ b/fetchmail.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu Sep 1 07:14:57 UTC 2022 - Matej Cepl + +- Update to 6.4.33: + - Turns out the snapd version of HTMLDOC 1.9.16 is broken, so I + have added a wrapper script that uses the flatpak version of + HTMLDOC, for the benefit of rebuilding on distros that do not + ship HTMLDOC natively. +- Remove upstreamed 44-uncorrupt_runfetchmail.patch + ------------------------------------------------------------------- Wed Aug 31 15:47:06 UTC 2022 - Stefan Schubert diff --git a/fetchmail.spec b/fetchmail.spec index 635087f..575a987 100644 --- a/fetchmail.spec +++ b/fetchmail.spec @@ -21,7 +21,7 @@ %define _fillupdir %{_localstatedir}/adm/fillup-templates %endif Name: fetchmail -Version: 6.4.32 +Version: 6.4.33 Release: 0 Summary: Full-Featured POP and IMAP Mail Retrieval Daemon License: GPL-2.0-or-later @@ -49,9 +49,6 @@ Patch10: fetchmail-oauth2-c-calculate-and-pass-in-correct-buffer-size-to- 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 mcepl@suse.com -# 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