On 2020-10-22, Brennan Vincent <bren...@umanwizard.com> wrote:
> On 10/22/20 4:31 AM, Antoine Jacoutot wrote:
>> On Wed, Oct 21, 2020 at 06:43:13PM -0400, Brennan Vincent wrote:
>>>
>>> On 10/21/20 4:40 AM, Stuart Henderson wrote:
>>>> On 2020-10-21, Chris Bennett <cpb_m...@bennettconstruction.us> wrote:
>>>>> On Tue, Oct 20, 2020 at 08:26:05PM -0400, Brennan Vincent wrote:
>>>>>> Updated yesterday from 6.7 to a snapshot, and now:
>>>>>>
>>>>>> $ doas pkg_add -u
>>>>> doas pkg_add -u -Dsnap
>>>>>
>>>>> You need to do some things different once you change to -current
>>>>> snapshots.
>>>>> Might also have to wait for -current packages to match the -current
>>>>> snapshot sometimes.
>>>> -Dsnap does nothing for most of the year. The only thing it's useful for is
>>>> pointing to the snapshots directory whdn you're running a kernel with no
>>>> -beta/-current suffix (i.e. a release, or snapshot in the short period in
>>>> the run-up to release).
>>>>
>>>>>> quirks-3.458 signed on 2020-10-18T13:56:14Z
>>>> This shows that it is indeed looking at a snapshot directory not release.
>>>>
>>>>>> Can't update spidermonkey-60.9.0v1->spidermonkey78-78.3.1v1: no update
>>>>>> found
>>>>>> for spidermonkey-60.9.0v1
>>>>>> Can't install polkit-0.116p1->0.118: can't resolve
>>>>>> spidermonkey78-78.3.1v1
>>>>>>
>>>>>> Is this expected soon after updating? Do I just need to wait for some
>>>>>> inconsistency in the pkg repo to be resolved?
>>>> This could either be:
>>>>
>>>> - a bug in some port
>>>>
>>>> - a package source that does not have a consistent set of files from one
>>>> build (can happen when a mirror is updating)
>>>>
>>>> First thing to do if this happens is check file dates in the mirror's
>>>> directory listing and see if they're consistent (no big jump between the
>>>> a* and z* files).
>>>
>>> Will the URL to check look something like
>>> https://cdn.openbsd.org/pub/OpenBSD/snapshots/packages/amd64/ ?
>>>
>>> I checked there; all the files were touched within a 10 minute period.
>>>
>>> Issue is persisting.
>>
>> Should be fixed in a current.
>> Wait a few days for new packages.
>>
>
> Thanks.
>
> What was the issue? Can you link to the diff that fixed it? (Just
> curious for my own culture).
>
>
$ cd /usr/ports/devel/spidermonkey78
$ cvs log Makefile
RCS file: /cvs/ports/devel/spidermonkey78/Makefile,v
Working file: Makefile
head: 1.3
branch:
locks: strict
access list:
symbolic names:
jasper_20201610: 1.1.1.1
jasper: 1.1.1
keyword substitution: kv
total revisions: 4; selected revisions: 4
description:
----------------------------
revision 1.3
date: 2020/10/22 08:30:39; author: ajacoutot; state: Exp; lines: +2 -1;
commitid: Rg9G9qi3oLdQwfzw;
Provide an upgrade path from spidermonkey (there is no spidermonkey60).
----------------------------
revision 1.2
date: 2020/10/18 18:03:48; author: ajacoutot; state: Exp; lines: +2 -3;
commitid: pssTfqvwb5L15vgl;
Tweak comment.
----------------------------
revision 1.1
date: 2020/10/16 19:39:41; author: jasper; state: Exp; commitid:
O9U4pqFDdhK1VJcO;
branches: 1.1.1;
Initial revision
----------------------------
revision 1.1.1.1
date: 2020/10/16 19:39:41; author: jasper; state: Exp; lines: +0 -0;
commitid: O9U4pqFDdhK1VJcO;
import spidermonkey 78.3.1
as discussed with aja i'm not hooking this up just yet
ok aja@
=============================================================================
$ cvs di -D 2020/10/20 -D now
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/spidermonkey78/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- Makefile 18 Oct 2020 18:03:48 -0000 1.2
+++ Makefile 22 Oct 2020 08:30:39 -0000 1.3
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2020/10/18 18:03:48 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.3 2020/10/22 08:30:39 ajacoutot Exp $
# see patch-js_src_old-configure_in
USE_WXNEEDED = Yes
@@ -20,6 +20,7 @@ DISTNAME = firefox-${V}esr.source
EXTRACT_SUFX = .tar.bz2
PKGNAME = spidermonkey${MOZILLA_VERSION}-${V}
EPOCH = 1
+REVISION = 0
SHARED_LIBS = mozjs-78 0.0
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/spidermonkey78/pkg/PLIST,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -p -r1.1.1.1 -r1.2
--- pkg/PLIST 16 Oct 2020 19:39:41 -0000 1.1.1.1
+++ pkg/PLIST 22 Oct 2020 08:30:39 -0000 1.2
@@ -1,5 +1,7 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2020/10/16 19:39:41 jasper Exp $
-@conflict spidermonkey-<=68.11.0v1
+@comment $OpenBSD: PLIST,v 1.2 2020/10/22 08:30:39 ajacoutot Exp $
+@conflict spidermonkey-*
+@conflict spidermonkey68-*
+@pkgpath devel/spidermonkey60
@pkgpath devel/spidermonkey68
include/mozjs-${MOZILLA_VERSION}/
include/mozjs-${MOZILLA_VERSION}/BaseProfiler.h
