From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: development@lists.ipfire.org Subject: Re: [PATCH] gdbm: update to 1.13 Date: Sun, 16 Apr 2017 17:22:43 +0100 Message-ID: <1492359763.2083.6.camel@ipfire.org> In-Reply-To: <20170414074002.4869-1-marcel.lorenz@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============2017246561767322364==" List-Id: --===============2017246561767322364== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable [root(a)rice-oxley ipfire-2.x]# pwclient git-am -s 1071 Applying patch #1071 using 'git am -s' Description: gdbm: update to 1.13 Applying: gdbm: update to 1.13 fatal: corrupt patch at line 44 Patch failed at 0001 gdbm: update to 1.13 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 On Fri, 2017-04-14 at 09:40 +0200, Marcel Lorenz wrote: > Signed-off-by: Marcel Lorenz > --- > =C2=A0lfs/gdbm | 19 ++++++++++++++----- > =C2=A01 file changed, 14 insertions(+), 5 deletions(-) >=20 > diff --git a/lfs/gdbm b/lfs/gdbm > index 4db986c..e2f7025 100644 > --- a/lfs/gdbm > +++ b/lfs/gdbm > @@ -1,7 +1,7 @@ > =C2=A0#################################################################### > ########### > =C2=A0#=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0# > =C2=A0# IPFire.org - A linux based > firewall=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0# > -# Copyright (C) 2007=C2=A0=C2=A0Michael Tremer & Christian > Schmidt=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0# > +# Copyright (C) 2017=C2=A0=C2=A0IPFire Team=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0 > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0# > =C2=A0#=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0# > =C2=A0# This program is free software: you can redistribute it and/or > modify=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0# > =C2=A0# it under the terms of the GNU General Public License as published > by=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0# > @@ -24,7 +24,7 @@ > =C2=A0 > =C2=A0include Config > =C2=A0 > -VER=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=3D 1.8.3 > +VER=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=3D 1.13 > =C2=A0 > =C2=A0THISAPP=C2=A0=C2=A0=C2=A0=C2=A0=3D gdbm-$(VER) > =C2=A0DL_FILE=C2=A0=C2=A0=C2=A0=C2=A0=3D $(THISAPP).tar.gz > @@ -32,6 +32,16 @@ DL_FROM=C2=A0=C2=A0=C2=A0=C2=A0=3D $(URL_IPFIRE) > =C2=A0DIR_APP=C2=A0=C2=A0=C2=A0=C2=A0=3D $(DIR_SRC)/$(THISAPP) > =C2=A0TARGET=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=3D $(DIR_INFO)/$(THISAPP) > =C2=A0 > =C2=A0#################################################################### > ########### > =C2=A0# Top-level Rules > =C2=A0#################################################################### > ########### > @@ -40,7 +50,7 @@ objects =3D $(DL_FILE) > =C2=A0 > =C2=A0$(DL_FILE) =3D $(DL_FROM)/$(DL_FILE) > =C2=A0 > -$(DL_FILE)_MD5 =3D 1d1b1d5c0245b1c00aff92da751e9aa1 > +$(DL_FILE)_MD5 =3D 8929dcda2a8de3fd2367bdbf66769376 > =C2=A0 > =C2=A0install : $(TARGET) > =C2=A0 > @@ -70,9 +80,8 @@ $(subst %,%_MD5,$(objects)) : > =C2=A0$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) > =C2=A0 @$(PREBUILD) > =C2=A0 @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf > $(DIR_DL)/$(DL_FILE) > - cd $(DIR_APP) && ./configure --prefix=3D/usr --disable-nls > + cd $(DIR_APP) && ./configure --prefix=3D$(PREFIX) --disable- > nls --disable-static --enable-libgdbm-compat > =C2=A0 cd $(DIR_APP) && make $(MAKETUNING) > =C2=A0 cd $(DIR_APP) && make BINOWN=3Droot BINGRP=3Droot install > - cd $(DIR_APP) && make BINOWN=3Droot BINGRP=3Droot install-compat > =C2=A0 @rm -rf $(DIR_APP) > =C2=A0 @$(POSTBUILD) --===============2017246561767322364== Content-Type: application/pgp-signature Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="signature.asc" MIME-Version: 1.0 LS0tLS1CRUdJTiBQR1AgU0lHTkFUVVJFLS0tLS0KVmVyc2lvbjogR251UEcgdjIKCmlRSWNCQUFC Q2dBR0JRSlk4NXBUQUFvSkVJQjU4UDl2a0FrSGlRVVAvajFldGd2WHpvcHk4Z3ZDNUluS0dXalYK YmhKNjRhUUpid0d0Y0lhNU9PN3JxclNGQm0wRFdPWldQeFhrYWMwai9DcFBmbkRxSkcrZm51M0Vs a001aitGWgpZbWdwRmNzUm5ORUpUVERhb1pmODN3eHZhcHgxeU5LYlN2eEpqdTVOWGhWc09DVVo2 RElpTVdZOStBSmhVQXVzCmhodHAzVWhQTHpVOHdTQnRzRTdRVTBIR0twdkF5SFdpMVZnYkd5ZGJy bzN4c3JWbWhtYmtwbVhBQy9nenZlaVIKeGkrT0dKdmYzbHk4eTFjdDFQb200TDN3MmcraEFlbnNp QW5mZE5KWFMrZDFTMUp0aTVWYlR3bDY4dXI1U01XdgpMVzVTVG1keUlDTm1LeG9Qc203YlV5OTFL TmZsdzZBSHdHaUt3ZitCcGxVR0VYNFBwTVRLWXg4NEJZUEc1c3dZCkx0RC81ejRLdFJSWWE0djg4 Y1l0U2pId2UwTmd4Z1A0MjN0SHA0Mk01dDdKT1pDZkVDQXRNWHBDdi84MlpaeVAKK284V200SWda Zi9aQXBiNWZCRVp6bzFjYVVsa3Qrd2djWXV1MmpCeGZkVytScVEwUmFmODJadWRQZkp3b3BVMQpB anZ1QS83bGJISGNMbllveE4vUkNtclZHSXJSd1YvMjFaRGJnR3ZwMGVybFJYZSszK01heHhOeWky L2Rjb01oClIydldwaWgveEY0MWpad1VXNCs0Y081K1k3U0hSeWhhRkRELzNDVnl0THQ0cUlTeHlZ djI5ei9ua0JZTTh4WFUKSFpqbkx5N1pZN0pSR081QlVyRk1WSks3UENPdENENXZPZjhmMStadTh0 Z05CamkxdHlHMVZ4eUM1UmEvcHAwSwpWekxtYmgwYUMxTUlQM3U2bFU5VAo9R0c0dgotLS0tLUVO RCBQR1AgU0lHTkFUVVJFLS0tLS0K --===============2017246561767322364==--