aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatarLarge Libravatar memdmp <memdmpestrogenzone>2026-01-14 01:48:45 +0100
committerLibravatarLarge Libravatar memdmp <memdmpestrogenzone>2026-01-14 01:48:45 +0100
commitb53557395d06d3c9ac8da8f96e022009e0d78ab9 (patch)
tree4b357e747bc2e7c3bf2501c4997242cf0ff3a81e
parentae90c39479861977ebe2bba909fedc5758c6dacd (diff)
downloadmem-estrogen-zone-b53557395d06d3c9ac8da8f96e022009e0d78ab9.tar.gz
mem-estrogen-zone-b53557395d06d3c9ac8da8f96e022009e0d78ab9.tar.bz2
mem-estrogen-zone-b53557395d06d3c9ac8da8f96e022009e0d78ab9.tar.lz
mem-estrogen-zone-b53557395d06d3c9ac8da8f96e022009e0d78ab9.zip

chore: update canary again because sig failed lmao

Diffstat
-rw-r--r--static/canaries/memdmp:estrogen.zone14
1 files changed, 7 insertions, 7 deletions
diff --git a/static/canaries/memdmp:estrogen.zone b/static/canaries/memdmp:estrogen.zone
index 11e5f33..0866acc 100644
--- a/static/canaries/memdmp:estrogen.zone
+++ b/static/canaries/memdmp:estrogen.zone
@@ -4,12 +4,12 @@ Hash: SHA512
┏━ Date & Time Information ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┅┅┅┅┅┅┅┄┄┄┄┄
┃
┃ Canary was created at:
- ┃ 2026-01-13 23:57:50 (UTC)
+ ┃ 2026-01-14 00:48:24 (UTC)
┃
┣━ Proof of Date & Time ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┅┅┅┅┅┅┅┄┄┄┄┄
┃
┃ Latest Monero block hash:
- ┃ fd718895bf38259a1ba5336b84dd3c25caeda7d86f00eb7c04b848383384c1bd
+ ┃ f4eaf2305351edb9ea8c545aa4bfc6d690041e0f3e8152eed77e4063c6348a0d
┃
┃ Latest Linux kernel.org `master` commit:
┃ b54345928fa1dbde534e32ecaa138678fd5d2135
@@ -94,7 +94,7 @@ Hash: SHA512
┃ where the time of publishing is defined as the lowest one of:
┃ - The date & time at the top of the canary
┃ - The creation time of the monero hash at the top of this canary
- ┃ (https://localmonero.co/blocks/block/fd718895bf38259a1ba5336b84dd3c25caeda7d86f00eb7c04b848383384c1bd)
+ ┃ (https://localmonero.co/blocks/block/f4eaf2305351edb9ea8c545aa4bfc6d690041e0f3e8152eed77e4063c6348a0d)
┃ - The creation time of the linux kernel commit at the top of this canary
┃ (https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=b54345928fa1dbde534e32ecaa138678fd5d2135)
┃
@@ -172,8 +172,8 @@ Hash: SHA512
┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┅┅┅┅┅┅┅┄┄┄┄┄
-----BEGIN PGP SIGNATURE-----
-iHUEARYKAB0WIQS1RnePBrvMjsFn2zzZGXBkh7i23gUCaWbcxwAKCRDZGXBkh7i2
-3vvSAP4y6dcjvpjwTZdPa2Tq7Dexx8bQP64WHCM4OZoMddqlJQD/XZSxypjkoxu6
-ZgFt47+aPS/7xXa8yeyatI/S+lY7xwg=
-=pZFA
+iHUEARYKAB0WIQS1RnePBrvMjsFn2zzZGXBkh7i23gUCaWbn3gAKCRDZGXBkh7i2
+3oGJAQDc2VXZ30RyyfrJlbEPPgMSE2q1fWuHttJr6hzf4Ws1PQEA88MSoq6kXRnu
+OUuD2ChP0V0MCeAdLX2wZST+LJ2wYgE=
+=hZMP
-----END PGP SIGNATURE-----
generated by cgit v1.2.3 (git 2.25.1) at 2026-02-28 23:50:30 +0000
t-extrabold', 'font-black'][section.weight / 100]}`
: ''}{typeof section.italic === 'undefined'
? ''
@@ -394,7 +400,7 @@
<div
class="line ttylines-openrc font-mono text-[#070505] flex flex-col"
>
- {#each ttyLines.filter(((maxidx) => (_, i) => i < (maxidx === -1 ? Infinity : maxidx))(ttyLines.findIndex((v) => v.kind === 'clear'))) as line}
+ {#each joinSimilarTTYLines(ttyLines.filter(((maxidx) => (_, i) => i < (maxidx === -1 ? Infinity : maxidx))(ttyLines.findIndex((v) => v.kind === 'clear')))) as line}
{@render ttyText(line)}
{/each}
</div>
@@ -415,7 +421,7 @@
>
<div class="mb-auto"></div>
<div class="font-mono leading-4 text-[#070505] flex flex-col p-4">
- {#each ttyLines.filter((v, i) => i >= idx && i < (nextIdx ?? Infinity) && (!skipAnimation || !('classes' in v) || !Array.isArray(v.classes) || !v.classes.includes('ttytext-removed-after-done'))) as line}
+ {#each joinSimilarTTYLines(ttyLines.filter((v, i) => i >= idx && i < (nextIdx ?? Infinity) && (!skipAnimation || !('classes' in v) || !Array.isArray(v.classes) || !v.classes.includes('ttytext-removed-after-done')))) as line}
{@render ttyText(line)}
{/each}
</div>
diff --git a/src/routes/anim-gen.ts b/src/routes/anim-gen.ts
index 67b1d6f..fcbb23d 100644
--- a/src/routes/anim-gen.ts
+++ b/src/routes/anim-gen.ts
@@ -475,9 +475,9 @@ ${ttyLines
...(v.kind === 'text'
? [
v.colour
- ? `.ttytext-block.text-\\[\\${v.colour}\\]{color:${v.colour};}`
+ ? `.ttytext-block.t\\${v.colour}{color:${v.colour};}`
: '',
- v.bg ? `.ttytext-block.bg-\\[\\${v.bg}\\]{background:${v.bg};}` : '',
+ v.bg ? `.ttytext-block.b\\${v.bg}{background:${v.bg};}` : '',
]
: []),
])
diff --git a/src/routes/distro-info.ts b/src/routes/distro-info.ts
index 84d7938..307a463 100644
--- a/src/routes/distro-info.ts
+++ b/src/routes/distro-info.ts
@@ -10,11 +10,11 @@
export const architecture = 'x86_64';
export const versions = {
alpine: {
- number: '3.21.2',
+ number: '3.23.2',
isEdge: false,
},
kernel: {
- id: '6.12.9-0-lts',
+ id: '6.18.5-0-lts',
humanReadable: 'Linux lts',
},
openrc: '0.55.1.ba16daf355',
diff --git a/src/routes/shared.ts b/src/routes/shared.ts
index e4a3e6d..5d20dd6 100644
--- a/src/routes/shared.ts
+++ b/src/routes/shared.ts
@@ -37,37 +37,37 @@ export type RenderBlock = {
italic?: boolean;
underlined?: boolean;
url?:
- | `newtab:${string}`
- | `currenttab:${string}`
- | ((textObj: TTYText & { kind: 'text' }) => void);
+ | `newtab:${string}`
+ | `currenttab:${string}`
+ | ((textObj: TTYText & { kind: 'text' }) => void);
bg?: string;
raw?: boolean;
dl?: string;
};
export type TTYText =
| {
- kind: 'text';
- renderrestriction?: 'everywhere' | 'js-only' | 'noscript';
- value: RenderBlock[];
- id: string;
- classes: string[];
- }
+ kind: 'text';
+ renderrestriction?: 'everywhere' | 'js-only' | 'noscript';
+ value: RenderBlock[];
+ id: string;
+ classes: string[];
+ }
| {
- kind: 'removeNode';
- removedId: string;
- removedItemClassList: string[];
- }
+ kind: 'removeNode';
+ removedId: string;
+ removedItemClassList: string[];
+ }
| {
- kind: 'time';
- delay: number;
- }
+ kind: 'time';
+ delay: number;
+ }
| {
- kind: 'cursorVisibility';
- visible: boolean;
- }
+ kind: 'cursorVisibility';
+ visible: boolean;
+ }
| {
- kind: 'clear';
- };
+ kind: 'clear';
+ };
export type Only<Obj, Keys extends keyof Obj> = {
[k in Keys]: Obj[k];
};
@@ -396,7 +396,7 @@ export const ttyLines: TTYText[] = (() => {
colour: '#7a7a7a',
},
],
- ['GPG Root Key: ', { colour: '#cdcdcd' }],
+ ['GPG Key: ', { colour: '#cdcdcd' }],
);
wait(1000);
replaceLast((v) => [
@@ -412,19 +412,9 @@ export const ttyLines: TTYText[] = (() => {
},
],
]);
- wait(100);
- replaceLast((v) => [
- ...v,
- [
- ' (root key)',
- {
- colour: '#999999',
- },
- ],
- ]);
wait(400);
text([
- ' - ',
+ ' - ',
{
colour: '#7a7a7a',
},
@@ -469,58 +459,6 @@ export const ttyLines: TTYText[] = (() => {
],
[')', { colour: '#999999' }],
]);
- wait(45);
- text([
- ' - ',
- {
- colour: '#7a7a7a',
- },
- ]);
- wait(70);
- replaceLast((v) => [
- ...v,
- [
- 'GPG Release Signing Key: ',
- {
- colour: '#cdcdcd',
- },
- ],
- ]);
- wait(100);
- replaceLast((v) => [
- ...v,
- [
- '0D93102265071798C7B65A4C9F0739B9E0C8FD60',
- {
- colour: '#ffffff',
- underlined: true,
- weight: 700,
- url: `currenttab:/keys/memdmp/release.pgp`,
- dl: 'memdmp-release.pgp',
- },
- ],
- ]);
- wait(100);
- replaceLast((v) => [
- ...v,
- [
- ' (',
- {
- colour: '#999999',
- },
- ],
- [
- 'signed',
- {
- colour: '#ffffff',
- underlined: true,
- weight: 500,
- url: `currenttab:/keys/memdmp/release.pgp.sig`,
- dl: 'memdmp-release.pgp.sig',
- },
- ],
- [')', { colour: '#999999' }],
- ]);
wait(100);
text([
' - ',
@@ -620,3 +558,25 @@ export const ttyLines: TTYText[] = (() => {
return lines;
})();
+export const joinSimilarTTYLines = (lines: TTYText[]) => {
+ for (const line of lines)
+ if (line.kind === 'text') {
+ const newvalues = [] as RenderBlock[];
+ let lastvalue: string = '';
+ for (const value of line.value) {
+ const thisvalue_raw = { ...value } as Omit<RenderBlock, 'value'> & {
+ value?: string
+ };
+ delete (thisvalue_raw as Partial<RenderBlock>)['value']
+ const thisvalue = Object.entries(thisvalue_raw).toSorted((a, b) => a[0] > b[0] ? 1 : a[0] === b[0] ? 0 : -1).map(v => v[1]).join('\r\n\n\r\r\n')
+ if (thisvalue === lastvalue) {
+ newvalues[newvalues.length - 1].value += value.value
+ } else {
+ lastvalue = thisvalue
+ newvalues.push(value)
+ }
+ }
+ line.value = newvalues
+ }
+ return lines
+}
generated by cgit v1.2.3 (git 2.25.1) at 2026-02-28 23:50:30 +0000