Re: UPDATE: Nextcloud-17.0.1
Thank you very much Stuart, Gonzalo and all other people for the help. For some reason, when I download the patch from Gmail, the file comes with ^M line breaks. After downloading the patch using curl from marc.info as Stuart did, the patch process works perfectly. Sorry for all that noise! Update is ok here. Em qui., 28 de nov. de 2019 às 09:58, Stuart Henderson escreveu: > > On 2019/11/27 20:44, Adriano Barbosa wrote: > > Sorry for insisting, but I'm trying to figure out what I'm doing wrong. > > > > I update my ports tree with `cvs -qd > > anon...@anoncvs.usa.openbsd.org:/cvs up -Pd -rOPENBSD_6_6` > > I end up with Makefile with the following header: # $OpenBSD: > > Makefile,v 1.44.2.1 2019/10/29 07:27:41 gonzalo Exp $ > > Apply the diff you provided with `patch < /tmp/nextcloud-17.0.1.diff` > > while in /usr/ports/www/nextcloud directory > > I end up with the same errors: > > Either something strange is wrong with your tree, or with the patch you > have downloaded. > > > $ cd /usr/ports/www/nextcloud > $ acvs up -r OPENBSD_6_6 -Pd > [ no output; the tree is up to date and there are no local changes ] > $ curl -s 'https://marc.info/?l=openbsd-ports=157414828023645=p3' | patch > Hmm... Looks like a unified diff to me... > The text leading up to this was: > -- > |Index: Makefile > |=== > |RCS file: /cvs/ports/www/nextcloud/Makefile,v > |retrieving revision 1.45 > |diff -u -p -r1.45 Makefile > |--- Makefile 29 Oct 2019 07:24:03 - 1.45 > |+++ Makefile 19 Nov 2019 07:17:43 - > -- > Patching file Makefile using Plan A... > Hunk #1 succeeded at 2. > Hmm... The next patch looks like a unified diff to me... > The text leading up to this was: > -- > |Index: distinfo > |=== > |RCS file: /cvs/ports/www/nextcloud/distinfo,v > |retrieving revision 1.29 > |diff -u -p -r1.29 distinfo > |--- distinfo 29 Oct 2019 07:24:03 - 1.29 > |+++ distinfo 19 Nov 2019 07:17:43 - > -- > Patching file distinfo using Plan A... > Hunk #1 succeeded at 1. > Hmm... The next patch looks like a unified diff to me... > The text leading up to this was: > -- > |Index: pkg/PLIST > |=== > |RCS file: /cvs/ports/www/nextcloud/pkg/PLIST,v > |retrieving revision 1.32 > |diff -u -p -r1.32 PLIST > |--- pkg/PLIST 29 Oct 2019 07:24:03 - 1.32 > |+++ pkg/PLIST 19 Nov 2019 07:17:44 - > -- > Patching file pkg/PLIST using Plan A... > Hunk #1 succeeded at 5393. > Hunk #2 succeeded at 5447. > Hunk #3 succeeded at 6208. > Hunk #4 succeeded at 9412. > Hunk #5 succeeded at 10085. > Hunk #6 succeeded at 10145. > Hunk #7 succeeded at 10193. > Hunk #8 succeeded at 10353. > Hunk #9 succeeded at 11142. > Hunk #10 succeeded at 12452. > Hunk #11 succeeded at 12486. > Hunk #12 succeeded at 13485. > Hunk #13 succeeded at 13969. > Hunk #14 succeeded at 14106. > Hunk #15 succeeded at 14309. > done -- Adriano Barbosa
Re: UPDATE: Nextcloud-17.0.1
On 2019/11/27 20:44, Adriano Barbosa wrote: > Sorry for insisting, but I'm trying to figure out what I'm doing wrong. > > I update my ports tree with `cvs -qd > anon...@anoncvs.usa.openbsd.org:/cvs up -Pd -rOPENBSD_6_6` > I end up with Makefile with the following header: # $OpenBSD: > Makefile,v 1.44.2.1 2019/10/29 07:27:41 gonzalo Exp $ > Apply the diff you provided with `patch < /tmp/nextcloud-17.0.1.diff` > while in /usr/ports/www/nextcloud directory > I end up with the same errors: Either something strange is wrong with your tree, or with the patch you have downloaded. $ cd /usr/ports/www/nextcloud $ acvs up -r OPENBSD_6_6 -Pd [ no output; the tree is up to date and there are no local changes ] $ curl -s 'https://marc.info/?l=openbsd-ports=157414828023645=p3' | patch Hmm... Looks like a unified diff to me... The text leading up to this was: -- |Index: Makefile |=== |RCS file: /cvs/ports/www/nextcloud/Makefile,v |retrieving revision 1.45 |diff -u -p -r1.45 Makefile |--- Makefile 29 Oct 2019 07:24:03 - 1.45 |+++ Makefile 19 Nov 2019 07:17:43 - -- Patching file Makefile using Plan A... Hunk #1 succeeded at 2. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -- |Index: distinfo |=== |RCS file: /cvs/ports/www/nextcloud/distinfo,v |retrieving revision 1.29 |diff -u -p -r1.29 distinfo |--- distinfo 29 Oct 2019 07:24:03 - 1.29 |+++ distinfo 19 Nov 2019 07:17:43 - -- Patching file distinfo using Plan A... Hunk #1 succeeded at 1. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -- |Index: pkg/PLIST |=== |RCS file: /cvs/ports/www/nextcloud/pkg/PLIST,v |retrieving revision 1.32 |diff -u -p -r1.32 PLIST |--- pkg/PLIST 29 Oct 2019 07:24:03 - 1.32 |+++ pkg/PLIST 19 Nov 2019 07:17:44 - -- Patching file pkg/PLIST using Plan A... Hunk #1 succeeded at 5393. Hunk #2 succeeded at 5447. Hunk #3 succeeded at 6208. Hunk #4 succeeded at 9412. Hunk #5 succeeded at 10085. Hunk #6 succeeded at 10145. Hunk #7 succeeded at 10193. Hunk #8 succeeded at 10353. Hunk #9 succeeded at 11142. Hunk #10 succeeded at 12452. Hunk #11 succeeded at 12486. Hunk #12 succeeded at 13485. Hunk #13 succeeded at 13969. Hunk #14 succeeded at 14106. Hunk #15 succeeded at 14309. done
Re: UPDATE: Nextcloud-17.0.1
Hi Ian, Em qui., 28 de nov. de 2019 às 01:50, Ian McWilliam escreveu: > > > On Wed, 27 Nov 2019 20:44:30 -0300 > Adriano Barbosa wrote: > > > Sorry for insisting, but I'm trying to figure out what I'm doing wrong. > > > > I update my ports tree with `cvs -qd > > anon...@anoncvs.usa.openbsd.org:/cvs up -Pd -rOPENBSD_6_6` > > Your trying to apply a patch destined for current against the 6.6-stable > ports tree. It's supposed to work on updated 6.6 ports tree as stated by Gonzalo: https://marc.info/?l=openbsd-ports=157487738810755=2 > > > Ian McWilliam > > From: owner-po...@openbsd.org on behalf of George > Koehler > Sent: Thursday, 28 November 2019 2:12 PM > To: Adriano Barbosa > Cc: Gonzalo L. Rodriguez ; ports@openbsd.org > > Subject: Re: UPDATE: Nextcloud-17.0.1 > > On Wed, 27 Nov 2019 20:44:30 -0300 > Adriano Barbosa wrote: > > > Sorry for insisting, but I'm trying to figure out what I'm doing wrong. > > > > I update my ports tree with `cvs -qd > > anon...@anoncvs.usa.openbsd.org:/cvs up -Pd -rOPENBSD_6_6` > > I end up with Makefile with the following header: # $OpenBSD: > > Makefile,v 1.44.2.1 2019/10/29 07:27:41 gonzalo Exp $ > > Apply the diff you provided with `patch < /tmp/nextcloud-17.0.1.diff` > > while in /usr/ports/www/nextcloud directory > > I end up with the same errors: > > Hmm... Looks like a unified diff to me... > > The text leading up to this was: > > -- > > |Index: Makefile > > |=== > > |RCS file: /cvs/ports/www/nextcloud/Makefile,v > > |retrieving revision 1.45 > > |diff -u -p -r1.45 Makefile > > |--- Makefile 29 Oct 2019 07:24:03 - 1.45 > > |+++ Makefile 19 Nov 2019 07:17:43 - > > -- > > Patching file Makefile using Plan A... > > Hunk #1 failed at 2. > > 1 out of 1 hunks failed--saving rejects to Makefile.rej > > This hunk would change the "V= 17.0.0" line to say "V= 17.0.1", but > failed to find the "V= 17.0.0" line. Your Makefile might differ from > the one in cvs, and these differences might conflict with the patch. > Try to revert your local modifications, then apply the patch again. > > You might have modifications if you patched nextcloud in the past, and > didn't undo the patch before cvs update. > > You can check for local modifications with > $ cd /usr/ports/www/nextcloud > $ cvs -nq up -Pd > > It might show lines like: > M Makefile > C distinfo > > Those files have 'M' local modification or 'C' conflict. To revert > them, you might rm(1) those files, then do another cvs update. > > -- > George Koehler > -- Adriano Barbosa
Re: UPDATE: Nextcloud-17.0.1
Hi George,
Em qui., 28 de nov. de 2019 às 00:12, George Koehler
escreveu:
>
> On Wed, 27 Nov 2019 20:44:30 -0300
> Adriano Barbosa wrote:
>
> > Sorry for insisting, but I'm trying to figure out what I'm doing wrong.
> >
> > I update my ports tree with `cvs -qd
> > anon...@anoncvs.usa.openbsd.org:/cvs up -Pd -rOPENBSD_6_6`
> > I end up with Makefile with the following header: # $OpenBSD:
> > Makefile,v 1.44.2.1 2019/10/29 07:27:41 gonzalo Exp $
> > Apply the diff you provided with `patch < /tmp/nextcloud-17.0.1.diff`
> > while in /usr/ports/www/nextcloud directory
> > I end up with the same errors:
> > Hmm... Looks like a unified diff to me...
> > The text leading up to this was:
> > --
> > |Index: Makefile
> > |===
> > |RCS file: /cvs/ports/www/nextcloud/Makefile,v
> > |retrieving revision 1.45
> > |diff -u -p -r1.45 Makefile
> > |--- Makefile 29 Oct 2019 07:24:03 - 1.45
> > |+++ Makefile 19 Nov 2019 07:17:43 -
> > --
> > Patching file Makefile using Plan A...
> > Hunk #1 failed at 2.
> > 1 out of 1 hunks failed--saving rejects to Makefile.rej
>
> This hunk would change the "V= 17.0.0" line to say "V= 17.0.1", but
> failed to find the "V= 17.0.0" line. Your Makefile might differ from
> the one in cvs, and these differences might conflict with the patch.
> Try to revert your local modifications, then apply the patch again.
There is a line saying "V= 17.0.0" in my Makefile. `head Makefile` returns:
# $OpenBSD: Makefile,v 1.44.2.1 2019/10/29 07:27:41 gonzalo Exp $
COMMENT=easy and universal access to shared and/or
personal files
V= 17.0.0
DISTNAME= nextcloud-${V}
EXTRACT_SUFX= .tar.bz2
CATEGORIES= www
>
> You might have modifications if you patched nextcloud in the past, and
> didn't undo the patch before cvs update.
I didn't do any modification. Just updated the tree and applied the patch.
>
> You can check for local modifications with
> $ cd /usr/ports/www/nextcloud
> $ cvs -nq up -Pd
`cvs -nq up -Pd` returns nothing.
>
> It might show lines like:
> M Makefile
> C distinfo
>
> Those files have 'M' local modification or 'C' conflict. To revert
> them, you might rm(1) those files, then do another cvs update.
>
> --
> George Koehler
--
Adriano Barbosa
Re: UPDATE: Nextcloud-17.0.1
On Wed, 27 Nov 2019 20:44:30 -0300 Adriano Barbosa wrote: > Sorry for insisting, but I'm trying to figure out what I'm doing wrong. > > I update my ports tree with `cvs -qd > anon...@anoncvs.usa.openbsd.org:/cvs up -Pd -rOPENBSD_6_6` Your trying to apply a patch destined for current against the 6.6-stable ports tree. Ian McWilliam From: owner-po...@openbsd.org on behalf of George Koehler Sent: Thursday, 28 November 2019 2:12 PM To: Adriano Barbosa Cc: Gonzalo L. Rodriguez ; ports@openbsd.org Subject: Re: UPDATE: Nextcloud-17.0.1 On Wed, 27 Nov 2019 20:44:30 -0300 Adriano Barbosa wrote: > Sorry for insisting, but I'm trying to figure out what I'm doing wrong. > > I update my ports tree with `cvs -qd > anon...@anoncvs.usa.openbsd.org:/cvs up -Pd -rOPENBSD_6_6` > I end up with Makefile with the following header: # $OpenBSD: > Makefile,v 1.44.2.1 2019/10/29 07:27:41 gonzalo Exp $ > Apply the diff you provided with `patch < /tmp/nextcloud-17.0.1.diff` > while in /usr/ports/www/nextcloud directory > I end up with the same errors: > Hmm... Looks like a unified diff to me... > The text leading up to this was: > -- > |Index: Makefile > |=== > |RCS file: /cvs/ports/www/nextcloud/Makefile,v > |retrieving revision 1.45 > |diff -u -p -r1.45 Makefile > |--- Makefile 29 Oct 2019 07:24:03 - 1.45 > |+++ Makefile 19 Nov 2019 07:17:43 - > -- > Patching file Makefile using Plan A... > Hunk #1 failed at 2. > 1 out of 1 hunks failed--saving rejects to Makefile.rej This hunk would change the "V= 17.0.0" line to say "V= 17.0.1", but failed to find the "V= 17.0.0" line. Your Makefile might differ from the one in cvs, and these differences might conflict with the patch. Try to revert your local modifications, then apply the patch again. You might have modifications if you patched nextcloud in the past, and didn't undo the patch before cvs update. You can check for local modifications with $ cd /usr/ports/www/nextcloud $ cvs -nq up -Pd It might show lines like: M Makefile C distinfo Those files have 'M' local modification or 'C' conflict. To revert them, you might rm(1) those files, then do another cvs update. -- George Koehler
Re: UPDATE: Nextcloud-17.0.1
On Wed, 27 Nov 2019 20:44:30 -0300 Adriano Barbosa wrote: > Sorry for insisting, but I'm trying to figure out what I'm doing wrong. > > I update my ports tree with `cvs -qd > anon...@anoncvs.usa.openbsd.org:/cvs up -Pd -rOPENBSD_6_6` > I end up with Makefile with the following header: # $OpenBSD: > Makefile,v 1.44.2.1 2019/10/29 07:27:41 gonzalo Exp $ > Apply the diff you provided with `patch < /tmp/nextcloud-17.0.1.diff` > while in /usr/ports/www/nextcloud directory > I end up with the same errors: > Hmm... Looks like a unified diff to me... > The text leading up to this was: > -- > |Index: Makefile > |=== > |RCS file: /cvs/ports/www/nextcloud/Makefile,v > |retrieving revision 1.45 > |diff -u -p -r1.45 Makefile > |--- Makefile 29 Oct 2019 07:24:03 - 1.45 > |+++ Makefile 19 Nov 2019 07:17:43 - > -- > Patching file Makefile using Plan A... > Hunk #1 failed at 2. > 1 out of 1 hunks failed--saving rejects to Makefile.rej This hunk would change the "V= 17.0.0" line to say "V= 17.0.1", but failed to find the "V= 17.0.0" line. Your Makefile might differ from the one in cvs, and these differences might conflict with the patch. Try to revert your local modifications, then apply the patch again. You might have modifications if you patched nextcloud in the past, and didn't undo the patch before cvs update. You can check for local modifications with $ cd /usr/ports/www/nextcloud $ cvs -nq up -Pd It might show lines like: M Makefile C distinfo Those files have 'M' local modification or 'C' conflict. To revert them, you might rm(1) those files, then do another cvs update. -- George Koehler
Re: UPDATE: Nextcloud-17.0.1
Sorry for insisting, but I'm trying to figure out what I'm doing wrong. I update my ports tree with `cvs -qd anon...@anoncvs.usa.openbsd.org:/cvs up -Pd -rOPENBSD_6_6` I end up with Makefile with the following header: # $OpenBSD: Makefile,v 1.44.2.1 2019/10/29 07:27:41 gonzalo Exp $ Apply the diff you provided with `patch < /tmp/nextcloud-17.0.1.diff` while in /usr/ports/www/nextcloud directory I end up with the same errors: Hmm... Looks like a unified diff to me... The text leading up to this was: -- |Index: Makefile |=== |RCS file: /cvs/ports/www/nextcloud/Makefile,v |retrieving revision 1.45 |diff -u -p -r1.45 Makefile |--- Makefile 29 Oct 2019 07:24:03 - 1.45 |+++ Makefile 19 Nov 2019 07:17:43 - -- Patching file Makefile using Plan A... Hunk #1 failed at 2. 1 out of 1 hunks failed--saving rejects to Makefile.rej Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -- |Index: distinfo |=== |RCS file: /cvs/ports/www/nextcloud/distinfo,v |retrieving revision 1.29 |diff -u -p -r1.29 distinfo |--- distinfo 29 Oct 2019 07:24:03 - 1.29 |+++ distinfo 19 Nov 2019 07:17:43 - -- Patching file distinfo using Plan A... Hunk #1 succeeded at 1 with fuzz 1. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -- |Index: pkg/PLIST |=== |RCS file: /cvs/ports/www/nextcloud/pkg/PLIST,v |retrieving revision 1.32 |diff -u -p -r1.32 PLIST |--- pkg/PLIST 29 Oct 2019 07:24:03 - 1.32 |+++ pkg/PLIST 19 Nov 2019 07:17:44 - -- Patching file pkg/PLIST using Plan A... Hunk #1 failed at 5393. Hunk #2 failed at 5447. Hunk #3 failed at 6208. Hunk #4 failed at 9412. Hunk #5 failed at 10085. Hunk #6 failed at 10145. Hunk #7 failed at 10193. Hunk #8 failed at 10353. Hunk #9 failed at 11142. Hunk #10 failed at 12452. Hunk #11 failed at 12486. Hunk #12 failed at 13485. Hunk #13 failed at 13969. Hunk #14 failed at 14106. Hunk #15 failed at 14309. 15 out of 15 hunks failed--saving rejects to pkg/PLIST.rej done Em qua., 27 de nov. de 2019 às 14:55, Gonzalo L. Rodriguez escreveu: > > On Tue, 26 Nov 2019 at 18:17:31 -0300, Adriano Barbosa wrote: > > Yes, my ports tree is updated, but its *6.6* tree. So, my Makefile, for > > example, is on version 1.44.2.1. > > > > -- > > Adriano Barbosa > > sent from my Android, sorry for typos > > > > Em ter, 26 de nov de 2019 16:37, Gonzalo L. Rodriguez > > escreveu: > > > > > > > > > > > > On 24. Nov 2019, at 02:27, Adriano Barbosa > > > wrote: > > > > > > > > Hi Gonzalo, > > > > I'm getting the follow while trying to `patch < > > > > /tmp/nextcloud-17.0.1.diff` on 6.6. > > > > Am I doing anything wrong? > > > > > > Hello, do you have your cvs tree updated? Should be a clear path. > > > > > > > Best > > > > > > > > Hmm... Looks like a unified diff to me... > > > > The text leading up to this was: > > > > -- > > > > |Index: Makefile > > > > |=== > > > > |RCS file: /cvs/ports/www/nextcloud/Makefile,v > > > > |retrieving revision 1.45 > > > > |diff -u -p -r1.45 Makefile > > > > |--- Makefile 29 Oct 2019 07:24:03 - 1.45 > > > > |+++ Makefile 19 Nov 2019 07:17:43 - > > > > -- > > > > Patching file Makefile using Plan A... > > > > Hunk #1 failed at 2. > > > > 1 out of 1 hunks failed--saving rejects to Makefile.rej > > > > Hmm... The next patch looks like a unified diff to me... > > > > The text leading up to this was: > > > > -- > > > > |Index: distinfo > > > > |=== > > > > |RCS file: /cvs/ports/www/nextcloud/distinfo,v > > > > |retrieving revision 1.29 > > > > |diff -u -p -r1.29 distinfo > > > > |--- distinfo 29 Oct 2019 07:24:03 - 1.29 > > > > |+++ distinfo 19 Nov 2019 07:17:43 - > > > > -- > > > > Patching file distinfo using Plan A... > > > > Hunk #1 succeeded at 1 with fuzz 1. > > > > Hmm... The next patch looks like a unified diff to me... > > > > The text leading up to this was: > > > > -- > > > > |Index: pkg/PLIST > > > > |=== > > > > |RCS file: /cvs/ports/www/nextcloud/pkg/PLIST,v > > > > |retrieving revision 1.32 > > > > |diff -u -p -r1.32 PLIST > > > > |--- pkg/PLIST 29 Oct 2019 07:24:03 - 1.32 > > > > |+++ pkg/PLIST 19 Nov 2019 07:17:44 - > > > > -- > > > > Patching file pkg/PLIST using Plan A... > > > > Hunk #1 failed at 5393. > > > > Hunk #2 failed at 5447. > >
Re: UPDATE: Nextcloud-17.0.1
On Tue, 26 Nov 2019 at 18:17:31 -0300, Adriano Barbosa wrote: > Yes, my ports tree is updated, but its *6.6* tree. So, my Makefile, for > example, is on version 1.44.2.1. > > -- > Adriano Barbosa > sent from my Android, sorry for typos > > Em ter, 26 de nov de 2019 16:37, Gonzalo L. Rodriguez > escreveu: > > > > > > > > On 24. Nov 2019, at 02:27, Adriano Barbosa > > wrote: > > > > > > Hi Gonzalo, > > > I'm getting the follow while trying to `patch < > > > /tmp/nextcloud-17.0.1.diff` on 6.6. > > > Am I doing anything wrong? > > > > Hello, do you have your cvs tree updated? Should be a clear path. > > > > > Best > > > > > > Hmm... Looks like a unified diff to me... > > > The text leading up to this was: > > > -- > > > |Index: Makefile > > > |=== > > > |RCS file: /cvs/ports/www/nextcloud/Makefile,v > > > |retrieving revision 1.45 > > > |diff -u -p -r1.45 Makefile > > > |--- Makefile 29 Oct 2019 07:24:03 - 1.45 > > > |+++ Makefile 19 Nov 2019 07:17:43 - > > > -- > > > Patching file Makefile using Plan A... > > > Hunk #1 failed at 2. > > > 1 out of 1 hunks failed--saving rejects to Makefile.rej > > > Hmm... The next patch looks like a unified diff to me... > > > The text leading up to this was: > > > -- > > > |Index: distinfo > > > |=== > > > |RCS file: /cvs/ports/www/nextcloud/distinfo,v > > > |retrieving revision 1.29 > > > |diff -u -p -r1.29 distinfo > > > |--- distinfo 29 Oct 2019 07:24:03 - 1.29 > > > |+++ distinfo 19 Nov 2019 07:17:43 - > > > -- > > > Patching file distinfo using Plan A... > > > Hunk #1 succeeded at 1 with fuzz 1. > > > Hmm... The next patch looks like a unified diff to me... > > > The text leading up to this was: > > > -- > > > |Index: pkg/PLIST > > > |=== > > > |RCS file: /cvs/ports/www/nextcloud/pkg/PLIST,v > > > |retrieving revision 1.32 > > > |diff -u -p -r1.32 PLIST > > > |--- pkg/PLIST 29 Oct 2019 07:24:03 - 1.32 > > > |+++ pkg/PLIST 19 Nov 2019 07:17:44 - > > > -- > > > Patching file pkg/PLIST using Plan A... > > > Hunk #1 failed at 5393. > > > Hunk #2 failed at 5447. > > > Hunk #3 failed at 6208. > > > Hunk #4 failed at 9412. > > > Hunk #5 failed at 10085. > > > Hunk #6 failed at 10145. > > > Hunk #7 failed at 10193. > > > Hunk #8 failed at 10353. > > > Hunk #9 failed at 11142. > > > Hunk #10 failed at 12452. > > > Hunk #11 failed at 12486. > > > Hunk #12 failed at 13485. > > > Hunk #13 failed at 13969. > > > Hunk #14 failed at 14106. > > > Hunk #15 failed at 14309. > > > 15 out of 15 hunks failed--saving rejects to pkg/PLIST.rej > > > done > > > > > > > > >> Em ter., 19 de nov. de 2019 às 04:32, Gonzalo L. Rodriguez > > >> escreveu: > > >> > > >> Hello, > > >> > > >> Update for Nextcloud to 17.0.1: > > >> > > >> https://nextcloud.com/changelog/ > > >> > > >> OK? Comments? > > >> > > >> Cheers.- > > >> > > >> -- > > >> > > >>- gonzalo > > > > > > > > > > > > -- > > > Adriano > > > > > > > Yes, but your *6.6* looks like not updated, I just tried on: Sticky Tag: OPENBSD_6_6 (branch: 1.44.2) and it works without problems. I usually commit nextcloud to the last -release and -current. Cheers.- -- - gonzalo
Re: UPDATE: Nextcloud-17.0.1
Yes, my ports tree is updated, but its *6.6* tree. So, my Makefile, for example, is on version 1.44.2.1. -- Adriano Barbosa sent from my Android, sorry for typos Em ter, 26 de nov de 2019 16:37, Gonzalo L. Rodriguez escreveu: > > > > On 24. Nov 2019, at 02:27, Adriano Barbosa > wrote: > > > > Hi Gonzalo, > > I'm getting the follow while trying to `patch < > > /tmp/nextcloud-17.0.1.diff` on 6.6. > > Am I doing anything wrong? > > Hello, do you have your cvs tree updated? Should be a clear path. > > > Best > > > > Hmm... Looks like a unified diff to me... > > The text leading up to this was: > > -- > > |Index: Makefile > > |=== > > |RCS file: /cvs/ports/www/nextcloud/Makefile,v > > |retrieving revision 1.45 > > |diff -u -p -r1.45 Makefile > > |--- Makefile 29 Oct 2019 07:24:03 - 1.45 > > |+++ Makefile 19 Nov 2019 07:17:43 - > > -- > > Patching file Makefile using Plan A... > > Hunk #1 failed at 2. > > 1 out of 1 hunks failed--saving rejects to Makefile.rej > > Hmm... The next patch looks like a unified diff to me... > > The text leading up to this was: > > -- > > |Index: distinfo > > |=== > > |RCS file: /cvs/ports/www/nextcloud/distinfo,v > > |retrieving revision 1.29 > > |diff -u -p -r1.29 distinfo > > |--- distinfo 29 Oct 2019 07:24:03 - 1.29 > > |+++ distinfo 19 Nov 2019 07:17:43 - > > -- > > Patching file distinfo using Plan A... > > Hunk #1 succeeded at 1 with fuzz 1. > > Hmm... The next patch looks like a unified diff to me... > > The text leading up to this was: > > -- > > |Index: pkg/PLIST > > |=== > > |RCS file: /cvs/ports/www/nextcloud/pkg/PLIST,v > > |retrieving revision 1.32 > > |diff -u -p -r1.32 PLIST > > |--- pkg/PLIST 29 Oct 2019 07:24:03 - 1.32 > > |+++ pkg/PLIST 19 Nov 2019 07:17:44 - > > -- > > Patching file pkg/PLIST using Plan A... > > Hunk #1 failed at 5393. > > Hunk #2 failed at 5447. > > Hunk #3 failed at 6208. > > Hunk #4 failed at 9412. > > Hunk #5 failed at 10085. > > Hunk #6 failed at 10145. > > Hunk #7 failed at 10193. > > Hunk #8 failed at 10353. > > Hunk #9 failed at 11142. > > Hunk #10 failed at 12452. > > Hunk #11 failed at 12486. > > Hunk #12 failed at 13485. > > Hunk #13 failed at 13969. > > Hunk #14 failed at 14106. > > Hunk #15 failed at 14309. > > 15 out of 15 hunks failed--saving rejects to pkg/PLIST.rej > > done > > > > > >> Em ter., 19 de nov. de 2019 às 04:32, Gonzalo L. Rodriguez > >> escreveu: > >> > >> Hello, > >> > >> Update for Nextcloud to 17.0.1: > >> > >> https://nextcloud.com/changelog/ > >> > >> OK? Comments? > >> > >> Cheers.- > >> > >> -- > >> > >>- gonzalo > > > > > > > > -- > > Adriano > > > >
Re: UPDATE: Nextcloud-17.0.1
> On 24. Nov 2019, at 02:27, Adriano Barbosa wrote: > > Hi Gonzalo, > I'm getting the follow while trying to `patch < > /tmp/nextcloud-17.0.1.diff` on 6.6. > Am I doing anything wrong? Hello, do you have your cvs tree updated? Should be a clear path. > Best > > Hmm... Looks like a unified diff to me... > The text leading up to this was: > -- > |Index: Makefile > |=== > |RCS file: /cvs/ports/www/nextcloud/Makefile,v > |retrieving revision 1.45 > |diff -u -p -r1.45 Makefile > |--- Makefile 29 Oct 2019 07:24:03 - 1.45 > |+++ Makefile 19 Nov 2019 07:17:43 - > -- > Patching file Makefile using Plan A... > Hunk #1 failed at 2. > 1 out of 1 hunks failed--saving rejects to Makefile.rej > Hmm... The next patch looks like a unified diff to me... > The text leading up to this was: > -- > |Index: distinfo > |=== > |RCS file: /cvs/ports/www/nextcloud/distinfo,v > |retrieving revision 1.29 > |diff -u -p -r1.29 distinfo > |--- distinfo 29 Oct 2019 07:24:03 - 1.29 > |+++ distinfo 19 Nov 2019 07:17:43 - > -- > Patching file distinfo using Plan A... > Hunk #1 succeeded at 1 with fuzz 1. > Hmm... The next patch looks like a unified diff to me... > The text leading up to this was: > -- > |Index: pkg/PLIST > |=== > |RCS file: /cvs/ports/www/nextcloud/pkg/PLIST,v > |retrieving revision 1.32 > |diff -u -p -r1.32 PLIST > |--- pkg/PLIST 29 Oct 2019 07:24:03 - 1.32 > |+++ pkg/PLIST 19 Nov 2019 07:17:44 - > -- > Patching file pkg/PLIST using Plan A... > Hunk #1 failed at 5393. > Hunk #2 failed at 5447. > Hunk #3 failed at 6208. > Hunk #4 failed at 9412. > Hunk #5 failed at 10085. > Hunk #6 failed at 10145. > Hunk #7 failed at 10193. > Hunk #8 failed at 10353. > Hunk #9 failed at 11142. > Hunk #10 failed at 12452. > Hunk #11 failed at 12486. > Hunk #12 failed at 13485. > Hunk #13 failed at 13969. > Hunk #14 failed at 14106. > Hunk #15 failed at 14309. > 15 out of 15 hunks failed--saving rejects to pkg/PLIST.rej > done > > >> Em ter., 19 de nov. de 2019 às 04:32, Gonzalo L. Rodriguez >> escreveu: >> >> Hello, >> >> Update for Nextcloud to 17.0.1: >> >> https://nextcloud.com/changelog/ >> >> OK? Comments? >> >> Cheers.- >> >> -- >> >>- gonzalo > > > > -- > Adriano >
Re: UPDATE: Nextcloud-17.0.1
Hi Gonzalo, I'm getting the follow while trying to `patch < /tmp/nextcloud-17.0.1.diff` on 6.6. Am I doing anything wrong? Best Hmm... Looks like a unified diff to me... The text leading up to this was: -- |Index: Makefile |=== |RCS file: /cvs/ports/www/nextcloud/Makefile,v |retrieving revision 1.45 |diff -u -p -r1.45 Makefile |--- Makefile 29 Oct 2019 07:24:03 - 1.45 |+++ Makefile 19 Nov 2019 07:17:43 - -- Patching file Makefile using Plan A... Hunk #1 failed at 2. 1 out of 1 hunks failed--saving rejects to Makefile.rej Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -- |Index: distinfo |=== |RCS file: /cvs/ports/www/nextcloud/distinfo,v |retrieving revision 1.29 |diff -u -p -r1.29 distinfo |--- distinfo 29 Oct 2019 07:24:03 - 1.29 |+++ distinfo 19 Nov 2019 07:17:43 - -- Patching file distinfo using Plan A... Hunk #1 succeeded at 1 with fuzz 1. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -- |Index: pkg/PLIST |=== |RCS file: /cvs/ports/www/nextcloud/pkg/PLIST,v |retrieving revision 1.32 |diff -u -p -r1.32 PLIST |--- pkg/PLIST 29 Oct 2019 07:24:03 - 1.32 |+++ pkg/PLIST 19 Nov 2019 07:17:44 - -- Patching file pkg/PLIST using Plan A... Hunk #1 failed at 5393. Hunk #2 failed at 5447. Hunk #3 failed at 6208. Hunk #4 failed at 9412. Hunk #5 failed at 10085. Hunk #6 failed at 10145. Hunk #7 failed at 10193. Hunk #8 failed at 10353. Hunk #9 failed at 11142. Hunk #10 failed at 12452. Hunk #11 failed at 12486. Hunk #12 failed at 13485. Hunk #13 failed at 13969. Hunk #14 failed at 14106. Hunk #15 failed at 14309. 15 out of 15 hunks failed--saving rejects to pkg/PLIST.rej done Em ter., 19 de nov. de 2019 às 04:32, Gonzalo L. Rodriguez escreveu: > > Hello, > > Update for Nextcloud to 17.0.1: > > https://nextcloud.com/changelog/ > > OK? Comments? > > Cheers.- > > -- > > - gonzalo -- Adriano
