From mboxrd@z Thu Jan 1 00:00:00 1970 From: Peter =?utf-8?q?M=C3=BCller?= To: development@lists.ipfire.org Subject: Re: [PATCH] pciutils: update to 3.5.6 Date: Wed, 08 Aug 2018 18:18:03 +0200 Message-ID: <0f133420-b5c8-9132-8bc7-5d90aef4b4e7@link38.eu> In-Reply-To: <8fa43c905c407e9e5ecda35710aae911ed814c77.camel@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============6572818980998827572==" List-Id: --===============6572818980998827572== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Hello Michael, > Hey, >=20 > this patch won't apply for some reason: >=20 > [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 >=20 > Downloading the mbox file and applying it with patch does work though. > Any idea what could have changed here? I have absolutely no idea and did not change my patch submitting procedure. At least I am unaware of it. Do you know if PGP/MIME is a problem for the software? This is the only thing I can imagine, but it was not changed, either. Best regards, Peter M=C3=BCller >=20 > Best, > -Michael >=20 > On Tue, 2018-08-07 at 21:07 +0200, Peter M=C3=BCller wrote: >> Signed-off-by: Peter M=C3=BCller >> --- >> 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/pc= iutils >> 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 >=20 --=20 "We don't care. We don't have to. We're the Phone Company." --===============6572818980998827572== Content-Type: application/pgp-signature Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="signature.asc" MIME-Version: 1.0 LS0tLS1CRUdJTiBQR1AgU0lHTkFUVVJFLS0tLS0KCmlRSXpCQUVCQ2dBZEZpRUV2UDRTaUdoRVlE SnlyUkxrMlVqeUQzMTduMmdGQWx0ckY4TUFDZ2tRMlVqeUQzMTcKbjJnY29CQUFvWE4vSnBUM2Zt RGZLSXN4aXlSYlBmdGxBY3RKMjBjQWt5SjAyMEdkMXYvNVNHcVdwb0tVSDJPUwpXMnlyb0VscXht YlovU1BTMjJiSDJ3ejZDcDRrdG80SmhqK25TK0pZdm1PdE1JL3pQR3YwaWFOclNZRmJZY2tNClBN UFdUc1JhSFdramtpNU1GckYxblFlclAxbUdKakovM0pEV2NhMFBOemVWVGl1WVNJK2p6NENGSW1Y ZUhmRnMKaVV5RTNiUEdvY3Bhc2FadGR3MkN0c3NMRXB0ZVcxUTdDRFIvT2VFNEs1cGxHQzB3ZTNj OUJnWTE4eVpPQ2ZyYQp2ekhKTG5RNVNKeXhpR0dPQVNtL0toaFU3cGRteXhRMkY3SGpDL1RsMXRz L05pWWV6cEZzZzdTbEhLcWx2VU1aCmdsUElBN0dwTDkxYkRCNHBOb29sZkZrRkNDVHl5eU5hd3pB N0cvV2RBSnRqM2UwSCtJK2phaE9lOE5jS3E5dFoKR2J6T0NxUzBBL25zZlpiREZxQmVVV2daZ2VP QTlTdkxXRWhNMkNhYzEwSnI1eWRUd0VTckduemdCWndEWGQwUwp2Ri9ONVVVN2lrMjg0bnBjZ0dL Qm9ZU3BxK1A1YW5VMW5LNWdhNjVUbExMblpMMEZ6VkNHZG9rei9UTmswOUROCm5ZQVcxM3Y1OHBw Wm12N0Y3N3lIRDBvd0NPTUxtUmQ0ZDFGcE9Ha1FTYnlkaDVqQzh3RkdnY0c1V1NjZEx2dysKdUYx L1E4QVRnMXNBMUh2SjdxNzcwKzJQMzR2KzRTTTFmYlJTVk5aaitIY2FxMnBtTTFRcWpsejhkNXdw NTFMUApudzEyWDQwYVU3OE52ajNWcnZXTnNBeG9NdmRBZ2d3M200ZEI3UUdxOHZVYWZGSnlMa1U9 Cj1wZUovCi0tLS0tRU5EIFBHUCBTSUdOQVRVUkUtLS0tLQo= --===============6572818980998827572==--