From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: [PATCH] pciutils: update to 3.5.6
Date: Wed, 08 Aug 2018 08:40:30 +0100
Message-ID: <8fa43c905c407e9e5ecda35710aae911ed814c77.camel@ipfire.org>
In-Reply-To: <f91239e5-73ba-3b7f-a713-12660fb7fc32@link38.eu>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============6655230902298480943=="
List-Id: <development.lists.ipfire.org>

--===============6655230902298480943==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

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

Hey,

this patch won't apply for some reason:

[root(a)hughes ipfire-2.x]# pwclient git-am -s 1874
Applying patch #1874 using 'git am -s'
Description: Postfix: update to 3.3.1
Patch is empty.
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".
'git am' failed with exit status 128
[root(a)hughes ipfire-2.x]# git am --abort

Downloading the mbox file and applying it with patch does work though.
Any idea what could have changed here?

Best,
- -Michael

On Tue, 2018-08-07 at 21:07 +0200, Peter M=C3=BCller wrote:
> Signed-off-by: Peter M=C3=BCller <peter.mueller(a)link38.eu>
> ---
>  config/rootfiles/common/pciutils | 2 +-
>  lfs/pciutils                     | 6 +++---
>  2 files changed, 4 insertions(+), 4 deletions(-)
>=20
> diff --git a/config/rootfiles/common/pciutils b/config/rootfiles/common/pci=
utils
> index 5bb11a259..da35ef6a1 100644
> --- a/config/rootfiles/common/pciutils
> +++ b/config/rootfiles/common/pciutils
> @@ -1,7 +1,7 @@
>  bin/lspci
>  bin/setpci
>  lib/libpci.so.3
> -lib/libpci.so.3.4.1
> +lib/libpci.so.3.5.6
>  sbin/update-pciids
>  #usr/include/pci
>  #usr/include/pci/config.h
> diff --git a/lfs/pciutils b/lfs/pciutils
> index 7c313ba3e..1ebfef0c8 100644
> --- a/lfs/pciutils
> +++ b/lfs/pciutils
> @@ -24,10 +24,10 @@
> =20
>  include Config
> =20
> -VER        =3D 3.4.1
> +VER        =3D 3.5.6
> =20
>  THISAPP    =3D pciutils-$(VER)
> -DL_FILE    =3D $(THISAPP).tar.xz
> +DL_FILE    =3D $(THISAPP).tar.gz
>  DL_FROM    =3D $(URL_IPFIRE)
>  DIR_APP    =3D $(DIR_SRC)/$(THISAPP)
>  TARGET     =3D $(DIR_INFO)/$(THISAPP)
> @@ -40,7 +40,7 @@ objects =3D $(DL_FILE)
> =20
>  $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE)
> =20
> -$(DL_FILE)_MD5 =3D 35763bb1eab7bc9bf6eb6efb72cbc8a1
> +$(DL_FILE)_MD5 =3D 63b347d2bb5719b7769c03a1bb72a5b7
> =20
>  install : $(TARGET)
> =20
-----BEGIN PGP SIGNATURE-----

iQIzBAEBCgAdFiEE5/rW5l3GGe2ypktxgHnw/2+QCQcFAltqnm4ACgkQgHnw/2+Q
CQfP1xAApVw8OjAk0v0sryKyzJ3Ps/pyPAvgLkmpVmrah69o+sDRD0D376JGQ1dz
K4oxRIuuU4nqVDMBslhZ9WfD+36NXlkFN8Np1Dqv7aZ/XNqrWbODW++0oPNNIxgD
O35XZtCGThG/7Oy3EK213wVKF/eunfC6dJwFUBdto8PakHvzhVvl0eokuC/YVfaT
WP3ujPFsgOsZ9SWmYu4BWtuIWXOtqrdVfiRxMLeevhVNckPQQTVBKQmwSdwgZJrg
nP05J8+I52fRqcaLfLdNsM/uEk7H2VzmgvE+NGJSixp8QLZMjaat790mJVFnttbe
i7nu6YFF7d7MmYTa7shL0JcuA7uDgbTz8r9a710ICQ80GzXhVEjhXqduf+QVVKsT
YYIa497g2uOvcIYCAXna75Gwe7CYSNCcNGgTmIQRXmwNCkMJCt1AogrwYwo2+IPd
WnLKPAW4vbi19bQXGUn2RljFSS1ylPgpe1r2i0DUJ+LaoEqINDB+Xtw1uwYoIxz/
MQ6CmE5EFu/fkP4sVE9jxhzDK2Qg5gb9coVGwHB1fbdzApiii8pOTYz2uCosq/d4
oyTEIelucYs6Uwo82qqkiGqKFSeP4Tt4gWTekByFKJ/nHfqjPHASMtyR2yHEp9Y2
VQ/nzshOFX6n83S2ZMEn0EbnRhnT5XH9tTlScVLPsRJ2bHSo6gU=3D
=3D7r72
-----END PGP SIGNATURE-----


--===============6655230902298480943==--