public inbox for development@lists.ipfire.org
 help / color / mirror / Atom feed
From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: [PATCH v2] Postfix: update to 3.3.1
Date: Thu, 16 Aug 2018 10:57:55 +0100	[thread overview]
Message-ID: <3f4ba530ce84b619bf9fe551fae8149e1f35bab7.camel@ipfire.org> (raw)
In-Reply-To: <ccec10ae800fb92763aa2609d930533da9354333.camel@ipfire.org>

[-- Attachment #1: Type: text/plain, Size: 3272 bytes --]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

I guess this is because the patch is unparsable:

[root(a)rice-oxley ipfire-2.x]# git am -s < \[PATCH_v2\]_Postfix\:_update_to_3.3.1.mbox
Applying: Postfix: update to 3.3.1
error: patch with only garbage at line 3
Patch failed at 0001 Postfix: update to 3.3.1
Use 'git am --show-current-patch' to see the failed patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

diff --git a/lfs/postfix b/lfs/postfix^M
index 0fe4dfe08..07a869594 100644^M
- - --- a/lfs/postfix^M
+++ b/lfs/postfix^M
@@ -24,7 +24,7 @@^M
 ^M
 include Config^M
 ^M
- - -VER        = 3.2.6^M
+VER        = 3.3.1^M
 ^M
 THISAPP    = postfix-$(VER)^M
 DL_FILE    = $(THISAPP).tar.gz^M

See the double - in the VER line.

Best,
- -Michael

On Wed, 2018-08-15 at 23:34 +0100, Michael Tremer wrote:
> Hmm, why hasn't patchwork seen this patch?
> 
> On Wed, 2018-08-15 at 16:54 +0200, Peter Müller wrote:
> > This updates Postfix to recent 3.3.x series, which contains
> > some new features. Release announcement available at
> > http://www.postfix.org/announcements/postfix-3.3.1.html
> > 
> > The second version of this patch supersedes the first one,
> > which contained crappy line wraps due to a bug in PGP/MIME
> > implementation in MUA.
> > 
> > Signed-off-by: Peter Müller <peter.mueller(a)link38.eu>
> > ---
> >  lfs/postfix | 6 +++---
> >  1 file changed, 3 insertions(+), 3 deletions(-)
> > 
> > diff --git a/lfs/postfix b/lfs/postfix
> > index 0fe4dfe08..07a869594 100644
> > --- a/lfs/postfix
> > +++ b/lfs/postfix
> > @@ -24,7 +24,7 @@
> >  
> >  include Config
> >  
> > -VER        = 3.2.6
> > +VER        = 3.3.1
> >  
> >  THISAPP    = postfix-$(VER)
> >  DL_FILE    = $(THISAPP).tar.gz
> > @@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
> >  DIR_APP    = $(DIR_SRC)/$(THISAPP)
> >  TARGET     = $(DIR_INFO)/$(THISAPP)
> >  PROG       = postfix
> > -PAK_VER    = 15
> > +PAK_VER    = 16
> >  
> >  DEPS       = ""
> >  
> > @@ -66,7 +66,7 @@ objects = $(DL_FILE)
> >  
> >  $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
> >  
> > -$(DL_FILE)_MD5 = d10f1fb551be86f6e48c2908dd8a12ff
> > +$(DL_FILE)_MD5 = 4381c6492f415e4a69cf5099d4acea76
> >  
> >  install : $(TARGET)
> >  
-----BEGIN PGP SIGNATURE-----

iQIzBAEBCgAdFiEE5/rW5l3GGe2ypktxgHnw/2+QCQcFAlt1SqMACgkQgHnw/2+Q
CQe0PQ/+KyqmRSZs/bq9is9GvxyG1gOuy6Xc6W4xFE+B91Ptstg6cNx0TTluNKLJ
FB41yRNz3bUSqeUgxqo23DEhrkEBHKW/LyUqD3LpwoR/Pqu3nBtijAdk3ro5WBFf
hGH1dkORM9buwMgxMKs8u19a0nGES47qgBNY0kAdpAQnaDJO8AZBclvqde1TabVs
e6QbDAl3osU09a6fBk/KFhSLE3BffpW1iuRVN/F1vGJYgZG4Ge0lWGOSKTQP9uL5
7IfOkn2jIULqxhyATpDIj3KT++jIwPb5blf+Qnlyad0Vl1l1tQn0olPI4X1ki001
Bd5IN2xYwvnIppPCTzmaCbMxRMXFK3l4juhyyuDYmaotLSWZiYXo5f4xdOqFA9Kh
e/gDPpKH1otKoXhmz+OAuJsfrQ10lu49Hxn21Eks1/Smzceswf+1pkve4kuKSEYA
mFxAgg4KzRTMXNM9AqRf/ezz/kd5CVc8UvrbD3WbBYOm5gnAzkEdaNQZ8SrV70Cu
LkTTwiO51foCQcl6AWyW4LpLfKc8zX7nQS8a5n2YmJ2MxR5oVMnohrAk0kV32ptg
a60o7yzKDn8VLZK7QshoiLEEQHhqMJS4sgjTfB2USypANTMAUJIYWlBgpy4NmP4T
f6uaz7FEiaaomsgLlLVNteeNobKxAnqpAY3gbc6Yp+pzze5VRx4=
=Or2B
-----END PGP SIGNATURE-----


      reply	other threads:[~2018-08-16  9:57 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-08-15 14:54 Peter Müller
2018-08-15 22:34 ` Michael Tremer
2018-08-16  9:57   ` Michael Tremer [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=3f4ba530ce84b619bf9fe551fae8149e1f35bab7.camel@ipfire.org \
    --to=michael.tremer@ipfire.org \
    --cc=development@lists.ipfire.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox