Date: Fri, 8 Jul 2022 12:08:12 +0300 From: Vasily Postnicov <shamaz.mazum@gmail.com> To: Nuno Teixeira <eduardo@freebsd.org> Cc: FreeBSD Mailing List <freebsd-ports@freebsd.org> Subject: Re: Ressurect port Message-ID: <CADnZ6BkVvs%2ByMpUmaf3dMKTZukPckTC4vPz3WujKCE1aBdNgBA@mail.gmail.com> In-Reply-To: <CAFDf7U%2B3mDtBkB5UDpVkBrPKKWWZZ5juGasOOoTAjFtwy-DAyg@mail.gmail.com> References: <CAFDf7U%2B17bqG1vMQnJ1o%2Bmu4CNqYjBJDxHuf3=6ecb77z19rhg@mail.gmail.com> <CADnZ6Bn4JQ05spnnw_rHPEiZm2v5_7jd63pmynRAFiGUZXqfeg@mail.gmail.com> <CAFDf7U%2B3mDtBkB5UDpVkBrPKKWWZZ5juGasOOoTAjFtwy-DAyg@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
--000000000000673cd805e3478b82 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Yes. You can also do git revert 266495a, then apply patches, then do git add <all stuff you changed> and git commit --amend to have a working port in one commit. Then you can try to submit the resurrected port according to the porter's handbook. =D0=BF=D1=82, 8 =D0=B8=D1=8E=D0=BB. 2022 =D0=B3., 11:59 Nuno Teixeira <edua= rdo@freebsd.org>: > Hello! > > Thanks for the tip. > > I've found a better commit to revert: > --- > commit 266495ae1ca8e417c22d01644daa28cb0c4938ce > Author: Michael Landin <mich@FreeBSD.org> > Date: Wed Nov 7 10:02:00 2018 +0000 > > - fix build on 12.x (remove obsolete network support / IFM_FDDI) > - add LICENSE > - update patch format to make portlint happy > - bump port revision > > Reported by: pkg-fallout@ > --- > > With this revert I got Makefile and files/ back (misses pkg-descr and > distinfo) but it will be ok so it can be updated. > > When update is ready I'm thinking do 'git revert > 266495ae1ca8e417c22d01644daa28cb0c4938ce' and commit it, and second, appl= y > update patch and commit it. > > Is that procedure correct? > > > Vasily Postnicov <shamaz.mazum@gmail.com> escreveu no dia sexta, > 8/07/2022 =C3=A0(s) 09:08: > >> git revert 5771a96 >> >> But if it is broken this won't help you :) >> >> =D0=BF=D1=82, 8 =D0=B8=D1=8E=D0=BB. 2022 =D0=B3., 11:01 Nuno Teixeira <e= duardo@freebsd.org>: >> >>> Hello, >>> >>> I need to ressurect net/slurm port for PR265070 >>> <https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D265070>; and I can >>> see it in log: >>> >>> git log -- net/slurm: >>> --- >>> commit 5771a967158e217b1e70655b459ce9769124bd49 >>> Author: Antoine Brodin <antoine@FreeBSD.org> >>> Date: Sat Apr 4 20:51:40 2020 +0000 >>> >>> Deprecate ports broken for more than 6 months >>> --- >>> (...) >>> >>> What git cmd should I do to get it back? >>> >>> Thanks, >>> >>> Nuno Teixeira >>> >> --000000000000673cd805e3478b82 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable <div dir=3D"auto"><div>Yes. You can also do git revert 266495a, then apply = patches, then do git add <all stuff you changed> and git commit --ame= nd to have a working port in one commit. Then you can try to submit the res= urrected port according to the porter's handbook.<br><br><div class=3D"= gmail_quote"><div dir=3D"ltr" class=3D"gmail_attr">=D0=BF=D1=82, 8 =D0=B8= =D1=8E=D0=BB. 2022 =D0=B3., 11:59 Nuno Teixeira <<a href=3D"mailto:eduar= do@freebsd.org">eduardo@freebsd.org</a>>:<br></div><blockquote class=3D"= gmail_quote" style=3D"margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-= left:1ex"><div dir=3D"ltr"><div>Hello!<br><br></div><div>Thanks for the tip= .</div><div><br></div><div>I've found a better commit to revert:</div>-= --<br>commit 266495ae1ca8e417c22d01644daa28cb0c4938ce<br>Author: Michael La= ndin <mich@FreeBSD.org><br>Date: =C2=A0 Wed Nov 7 10:02:00 2018 +0000= <br><br>=C2=A0 =C2=A0 - fix build on 12.x (remove obsolete network support = / IFM_FDDI)<br>=C2=A0 =C2=A0 - add LICENSE<br>=C2=A0 =C2=A0 - update patch = format to make portlint happy<br>=C2=A0 =C2=A0 - bump port revision<br><br>= =C2=A0 =C2=A0 Reported by: =C2=A0 =C2=A0pkg-fallout@<br><div>---</div><div>= <br></div><div>With this revert I got Makefile and files/ back (misses pkg-= descr and distinfo) but it will be ok so it can be updated.<br><br></div><d= iv>When update is ready I'm thinking do 'git revert 266495ae1ca8e41= 7c22d01644daa28cb0c4938ce' and commit it, and second, apply update patc= h and commit it.<br><br></div><div>Is that procedure correct?<br></div><br>= </div><br><div class=3D"gmail_quote"><div dir=3D"ltr" class=3D"gmail_attr">= Vasily Postnicov <<a href=3D"mailto:shamaz.mazum@gmail.com" target=3D"_b= lank" rel=3D"noreferrer">shamaz.mazum@gmail.com</a>> escreveu no dia sex= ta, 8/07/2022 =C3=A0(s) 09:08:<br></div><blockquote class=3D"gmail_quote" s= tyle=3D"margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);pad= ding-left:1ex"><div dir=3D"auto">git revert=C2=A0<span style=3D"font-size:1= 2.8px">5771a96</span><div dir=3D"auto"><span style=3D"font-size:12.8px"><br= ></span></div><div dir=3D"auto">But if it is broken this won't help you= :)</div></div><br><div class=3D"gmail_quote"><div dir=3D"ltr" class=3D"gma= il_attr">=D0=BF=D1=82, 8 =D0=B8=D1=8E=D0=BB. 2022 =D0=B3., 11:01 Nuno Teixe= ira <<a href=3D"mailto:eduardo@freebsd.org" target=3D"_blank" rel=3D"nor= eferrer">eduardo@freebsd.org</a>>:<br></div><blockquote class=3D"gmail_q= uote" style=3D"margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,2= 04);padding-left:1ex"><div dir=3D"ltr"><div>Hello,</div><div><br></div><div= >I need to ressurect net/slurm port for <a href=3D"https://bugs.freebsd.org= /bugzilla/show_bug.cgi?id=3D265070" rel=3D"noreferrer noreferrer" target=3D= "_blank">PR265070</a> and I can see it in log:</div><div><br></div><div>git= log -- net/slurm:</div><div>---</div><div>commit 5771a967158e217b1e70655b4= 59ce9769124bd49<br>Author: Antoine Brodin <antoine@FreeBSD.org><br>Da= te: =C2=A0 Sat Apr 4 20:51:40 2020 +0000<br><br>=C2=A0 =C2=A0 Deprecate por= ts broken for more than 6 months</div><div>---<br></div><div>(...)</div><di= v><br></div><div>What git cmd should I do to get it back?</div><div><br></d= iv><div>Thanks,<br><br></div><div>Nuno Teixeira<br></div></div> </blockquote></div> </blockquote></div> </blockquote></div></div></div> --000000000000673cd805e3478b82--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CADnZ6BkVvs%2ByMpUmaf3dMKTZukPckTC4vPz3WujKCE1aBdNgBA>