From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: development@lists.ipfire.org Subject: Re: [PATCH] squid 3.5.20: latest patches from upstream Date: Thu, 18 Aug 2016 13:26:57 -0400 Message-ID: <1471541217.8452.1.camel@ipfire.org> In-Reply-To: <35525ab4-cf59-0f60-38f0-fc54451ac459@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0265675337890818076==" List-Id: --===============0265675337890818076== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Hi, actually not. Could you just upload the entire branch with those changes and I will have a look at it? Best, -Michael On Thu, 2016-08-18 at 18:07 +0200, Matthias Fischer wrote: > Hi, > > On 03.08.2016 12:47, Michael Tremer wrote: > > > > Hi, > > > > I didn't check the source, yet because it fails to apply before > > that: > > > > [root(a)rice-oxley ipfire-2.x]# pwclient git-am -s 692 > > Applying patch #692 using 'git am -s' > > Description: squid 3.5.20: latest patches from upstream > > Applying: squid 3.5.20: latest patches from upstream > > .git/rebase-apply/patch:50: trailing whitespace. > > #  > > .git/rebase-apply/patch:57: trailing whitespace. > >   > > .git/rebase-apply/patch:73: trailing whitespace. > >   > > .git/rebase-apply/patch:81: trailing whitespace. > >   > > .git/rebase-apply/patch:107: trailing whitespace. > >   > > error: patch failed: lfs/squid:70 > > error: lfs/squid: patch does not apply > > Patch failed at 0001 squid 3.5.20: latest patches from upstream > > The copy of the patch that failed is found in: .git/rebase- > > apply/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". > > 'git am' failed with exit status 128 > > ... > > Being curious: > Anything new about this problem? > > I doublechecked my sources - here its building without any problems. > > Best, > Matthias > --===============0265675337890818076== Content-Type: application/pgp-signature Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="signature.asc" MIME-Version: 1.0 LS0tLS1CRUdJTiBQR1AgU0lHTkFUVVJFLS0tLS0KVmVyc2lvbjogR251UEcgdjIKCmlRSWNCQUFC Q2dBR0JRSlh0ZS9qQUFvSkVJQjU4UDl2a0FrSEZVMFAvakF5RlBFNGVpeDZLdXRGQXRjYXNGZGUK M3BscEVuMGxEY2doazVZeE9Sb2NSemhrZEhSSU5mOXdWOGVHbU04bEIySzVZczNEd0t5YkNVS0li ZXhRSDZ2ZApIKytQRU5DUDhub2IwK0hTQXpBMTNNSERzbXZzanhaK2E4VXRPSXdBL3VIdTUreDgv VjlUNjVFT1hPaDF1UEFPCjZEN3dkcGtzQjNlTmp1UWlIU0NqLzJpQ0puSk80WktmVkJMdlZ6a0pI dS9lei94QjZiL1VTTW16UXJFNlFRQjYKSlBtV2JBNENLR1BIS094YnYrRlg1UTVvcEtvRCtpRWl3 M1p2bFg5WEFjam1FWVd0alVSdzdIdytCQzdiZk1oegp5eTBPS3lLTXFxbXMvS2tXMDIveWJHc2lV WDUvbkFacHVDa0toTVVoR2NORGlZNVAxYTZ1Y0NOam5tQ3FnN0JLCnBHc00ybzNxWmpPZzk1UU9J YWtxNVZEdFF5RmUyZDlyaGRRU2FlNHFCblFtV3lkMC9CdE1TOHNPeG5mR1NkTWsKWVdlMUluTC9s SGNOYThzVC91VjdkNE0wQWtXZ2RKbDVwZnNtbjBMOFVNMXZibTJvS01IVnlMcWVkT3lwSWVragpu Tlh2M2hBNUp5eFFRYWlCMFJXWmVoT1BiQVVIbC9Rb3p2OFh4N1hRZlRBSmFlbFZYblJUU1JhaE9t ZVJ5L1I0Clhzd1I3S2hVeFh3clIrU0ZMODBSV1FCKzFBc2dxT2pweTBSNUFMdGhFVy9SQkllTzhi NXp1dDhnUHlxUFg2TkQKVUZLRHZLSXhxejgrbk9OUldxNTZ4OW1MODBWVGdlTEJXTXZTcFd4M2RV bHJWSEhOSnMvcVJqS2hMT3h0d0dNcQo3cjZqQTVTQ3J5NjZWazJ5NHh0dAo9UkNTcgotLS0tLUVO RCBQR1AgU0lHTkFUVVJFLS0tLS0K --===============0265675337890818076==--