wip

Author: mxcl

brewkit/fixups/Stripper.ts

@@ -15,6 +15,8 @@ export default class Stripper {
   }
 
   execute() {
+    // on linux we don’t want to accidentally use eg. the just built llvm’s strip
+    const strip = Deno.build.os == "linux" ? `${Deno.env.get("PKGX_BIN")}/strip` : "strip";
     for (const path of this.paths) {
       if (path.string.endsWith(".dylib") || /\.so(\.\d)*$/.test(path.string)) {
         run`strip -x ${path}`;

projects/php.net/package.yml

@@ -23,32 +23,32 @@ programs:
 
 dependencies:
   # re2c.org: ^3
-  # apache.org/apr: ^1
-  # apache.org/apr-util: ^1
+  apache.org/apr: ^1
+  apache.org/apr-util: ^1
   # bcrypt.sourceforge.net: ^1
   gnu.org/gettext: ^0.24
   gnu.org/gmp: ^6
   libsodium.org: ^1
-  # libzip.org: ^1.9
+  libzip.org: ^1.9
   github.com/kkos/oniguruma: ^6
   openssl.org: ^3
   pcre.org: ^10.30
   unicode.org: ^77
   gnu.org/libiconv: ^1
   kerberos.org: ^1
-  gnome.org/libxml2: ^2
   gnome.org/libxslt: ^1
   libpng.org: ^1
-  # google.com/webp: ^1
-  # ijg.org: ^9
-  # openldap.org: ^2
+  google.com/webp: ^1
+  ijg.org: ^9
+  openldap.org: ^2
 
 linux:
   dependencies:
     sourceware.org/libffi: ^3.4.7
     gnu.org/gcc/libstdcxx: ^14
     sourceware.org/bzip2: ^1
     thrysoee.dk/editline: ^3
+    gnome.org/libxml2: ^2
     sqlite.org: ^3
     zlib.net: ^1
     curl.se: ^8

projects/sf.net/bcrypt/build.ts

@@ -0,0 +1,6 @@
+import { BuildOptions, unarchive, run } from "brewkit";
+
+export default async function ({ prefix, version, deps, tag, props }: BuildOptions) {
+  await unarchive(`https://bcrypt.sourceforge.net/bcrypt-${version.marketing}.tar.gz`);
+  run`make LDFLAGS=-lz PREFIX=${prefix} install`;
+}

projects/sf.net/bcrypt/package.yml

@@ -0,0 +1,13 @@
+platforms:
+  - darwin/aarch64
+  - linux/x86-64
+
+versions:
+  - 1.1.0
+
+programs:
+  - bin/bcrypt
+
+linux:
+  dependencies:
+    zlib.net: ^1

projects/sf.net/bcrypt/test.ts

@@ -0,0 +1,28 @@
+import { nonce } from "brewkit";
+import { assertStringIncludes } from "jsr:@std/assert@1/string-includes";
+import { assertEquals } from "jsr:@std/assert@1/equals";
+
+export default async function () {
+  const nonced = nonce();
+  Deno.writeTextFileSync("test.txt", nonced);
+
+  {
+    const proc = new Deno.Command("bcrypt", {args: ["-r", "./test.txt"], stdin: "piped"}).spawn();
+    const stdin = proc.stdin.getWriter();
+    stdin.write(new TextEncoder().encode("12345678\n12345678\n"));
+    stdin.close();
+    const { code } = await proc.status;
+    assertEquals(code, 0);
+
+    Deno.removeSync("test.txt");
+  }
+
+  const proc = new Deno.Command("bcrypt", {args: ["-r", "./test.txt.bfe"], stdin: "piped"}).spawn();
+  const stdin = proc.stdin.getWriter();
+  stdin.write(new TextEncoder().encode("12345678\n"));
+  stdin.close();
+  const { code } = await proc.status;
+  assertEquals(code, 0);
+
+  assertStringIncludes(Deno.readTextFileSync("test.txt"), nonced);
+}