Commit: 5118426a3c351fb0cb5f32b75a3bc19bff3bf082 Parent: b5018beb98efe2a11649f826ebe9dc2324b20086 Author: Randy Palamar Date: Sat, 11 Apr 2026 06:18:32 -0600 remove pkg subdirectory sorting this was a pointless change that just makes importing changes from oasis very tedious Diffstat:
380 files changed, 2466 insertions(+), 2479 deletions(-)
diff --git a/.gitmodules b/.gitmodules @@ -1,99 +1,99 @@ -[submodule "pkg/admin/pwgen/src"] - path = pkg/admin/pwgen/src - url = https://github.com/tytso/pwgen.git -[submodule "pkg/admin/spm/src"] - path = pkg/admin/spm/src - url = https://github.com/rnpnr/spm.git -[submodule "pkg/arch/pax/src"] - path = pkg/arch/pax/src - url = https://git.sr.ht/~mcf/pax -[submodule "pkg/arch/pigz/src"] - path = pkg/arch/pigz/src - url = https://github.com/madler/pigz.git -[submodule "pkg/arch/zstd/src"] - path = pkg/arch/zstd/src - url = https://github.com/facebook/zstd.git - ignore = all -[submodule "pkg/crypt/b3sum/src"] - path = pkg/crypt/b3sum/src +[submodule "pkg/awk/src"] + path = pkg/awk/src + url = https://github.com/onetrueawk/awk.git +[submodule "pkg/b3sum/src"] + path = pkg/b3sum/src url = https://git.sr.ht/~mcf/b3sum -[submodule "pkg/crypt/fspec-sync/src"] - path = pkg/devel/fspec-sync/src - url = https://github.com/oasislinux/fspec-sync.git -[submodule "pkg/devel/cproc/src"] - path = pkg/devel/cproc/src +[submodule "pkg/bearssl/src"] + path = pkg/bearssl/src + url = https://www.bearssl.org/git/BearSSL + ignore = all +[submodule "pkg/cproc/src"] + path = pkg/cproc/src url = https://git.sr.ht/~mcf/cproc -[submodule "pkg/devel/git/src"] - path = pkg/devel/git/src +[submodule "pkg/fspec-sync/src"] + path = pkg/fspec-sync/src + url = https://github.com/oasislinux/fspec-sync.git +[submodule "pkg/git/src"] + path = pkg/git/src url = https://github.com/git/git.git ignore = all -[submodule "pkg/devel/qbe/src"] - path = pkg/devel/qbe/src - url = git://c9x.me/qbe.git - ignore = all -[submodule "pkg/devel/samurai/src"] - path = pkg/devel/samurai/src - url = https://github.com/michaelforney/samurai.git -[submodule "pkg/devel/the_silver_searcher/src"] - path = pkg/devel/the_silver_searcher/src - url = https://github.com/ggreer/the_silver_searcher.git - ignore = all -[submodule "pkg/devel/u-config/src"] - path = pkg/devel/u-config/src - url = https://github.com/skeeto/u-config.git -[submodule "pkg/editors/vis/src"] - path = pkg/editors/vis/src - url = https://github.com/martanne/vis.git - ignore = all -[submodule "pkg/lang/awk/src"] - path = pkg/lang/awk/src - url = https://github.com/onetrueawk/awk.git -[submodule "pkg/lang/rc/src"] - path = pkg/lang/rc/src - url = https://github.com/benavento/rc.git - ignore = all -[submodule "pkg/libs/bearssl/src"] - path = pkg/libs/bearssl/src - url = https://www.bearssl.org/git/BearSSL - ignore = all -[submodule "pkg/libs/libevent/src"] - path = pkg/libs/libevent/src +[submodule "pkg/libevent/src"] + path = pkg/libevent/src url = https://github.com/libevent/libevent.git -[submodule "pkg/libs/libgit2/src"] - path = pkg/libs/libgit2/src +[submodule "pkg/libgit2/src"] + path = pkg/libgit2/src url = https://github.com/libgit2/libgit2.git -[submodule "pkg/libs/libpng/src"] - path = pkg/libs/libpng/src +[submodule "pkg/libpng/src"] + path = pkg/libpng/src url = https://github.com/glennrp/libpng.git -[submodule "pkg/libs/libtls-bearssl/src"] - path = pkg/libs/libtls-bearssl/src +[submodule "pkg/libtls-bearssl/src"] + path = pkg/libtls-bearssl/src url = https://git.sr.ht/~mcf/libtls-bearssl ignore = all -[submodule "pkg/libs/libutp/src"] - path = pkg/libs/libutp/src +[submodule "pkg/libutp/src"] + path = pkg/libutp/src url = https://github.com/oasislinux/libutp.git -[submodule "pkg/libs/netbsd-curses/src"] - path = pkg/libs/netbsd-curses/src - url = https://github.com/oasislinux/netbsd-curses.git - ignore = all -[submodule "pkg/libs/zlib/src"] - path = pkg/libs/zlib/src - url = https://github.com/madler/zlib.git -[submodule "pkg/net/mblaze/src"] - path = pkg/net/mblaze/src +[submodule "pkg/mblaze/src"] + path = pkg/mblaze/src url = https://github.com/leahneukirchen/mblaze.git -[submodule "pkg/net/msmtp/src"] - path = pkg/net/msmtp/src +[submodule "pkg/md4c/src"] + path = pkg/md4c/src + url = https://github.com/mity/md4c.git +[submodule "pkg/msmtp/src"] + path = pkg/msmtp/src url = https://github.com/marlam/msmtp-mirror.git -[submodule "pkg/net/sfeed/src"] - path = pkg/net/sfeed/src - url = git://git.codemadness.org/sfeed -[submodule "pkg/sys/sbase/src"] - path = pkg/sys/sbase/src +[submodule "pkg/netbsd-curses/src"] + path = pkg/netbsd-curses/src + url = https://github.com/oasislinux/netbsd-curses.git + ignore = all +[submodule "pkg/pax/src"] + path = pkg/pax/src + url = https://git.sr.ht/~mcf/pax +[submodule "pkg/pigz/src"] + path = pkg/pigz/src + url = https://github.com/madler/pigz.git +[submodule "pkg/pwgen/src"] + path = pkg/pwgen/src + url = https://github.com/tytso/pwgen.git +[submodule "pkg/qbe/src"] + path = pkg/qbe/src + url = git://c9x.me/qbe.git + ignore = all +[submodule "pkg/rc/src"] + path = pkg/rc/src + url = https://github.com/benavento/rc.git + ignore = all +[submodule "pkg/samurai/src"] + path = pkg/samurai/src + url = https://github.com/michaelforney/samurai.git +[submodule "pkg/sbase/src"] + path = pkg/sbase/src url = git://git.suckless.org/sbase -[submodule "pkg/textproc/md4c/src"] - path = pkg/textproc/md4c/src - url = https://github.com/mity/md4c.git -[submodule "pkg/www/stagit/src"] - path = pkg/www/stagit/src +[submodule "pkg/sfeed/src"] + path = pkg/sfeed/src + url = git://git.codemadness.org/sfeed +[submodule "pkg/spm/src"] + path = pkg/spm/src + url = https://github.com/rnpnr/spm.git +[submodule "pkg/stagit/src"] + path = pkg/stagit/src url = git://git.codemadness.org/stagit +[submodule "pkg/the_silver_searcher/src"] + path = pkg/the_silver_searcher/src + url = https://github.com/ggreer/the_silver_searcher.git + ignore = all +[submodule "pkg/u-config/src"] + path = pkg/u-config/src + url = https://github.com/skeeto/u-config.git +[submodule "pkg/vis/src"] + path = pkg/vis/src + url = https://github.com/martanne/vis.git + ignore = all +[submodule "pkg/zlib/src"] + path = pkg/zlib/src + url = https://github.com/madler/zlib.git +[submodule "pkg/zstd/src"] + path = pkg/zstd/src + url = https://github.com/facebook/zstd.git + ignore = all diff --git a/README.md b/README.md @@ -10,7 +10,6 @@ The majority of things are unchanged. Most notably: Changes ------- -* Packages have been moved to sorted directories. * The set of packages is curated to my personal preferences. * OpenBSD `xargs` instead of sbase for parallel processing support. * cmark was replaced with [md4c][]. diff --git a/ninja.lua b/ninja.lua @@ -400,7 +400,7 @@ function fetch(method) end if method ~= 'git' then table.insert(deps, '||') - table.insert(deps, '$builddir/pkg/arch/pax/host/pax') + table.insert(deps, '$builddir/pkg/pax/host/pax') end build('fetch', '$dir/fetch', deps, {script=script}) if basedir ~= '.' then diff --git a/pkg/admin/gen.lua b/pkg/admin/gen.lua @@ -1,3 +0,0 @@ -subgen('pwgen') -subgen('skeleton') -subgen('spm') diff --git a/pkg/admin/pwgen/src b/pkg/admin/pwgen/src @@ -1 +0,0 @@ -Subproject commit c25787fce93b2c99efd87219585c0531e80b6d1c diff --git a/pkg/admin/spm/src b/pkg/admin/spm/src @@ -1 +0,0 @@ -Subproject commit 9fb6b1172b51490570ffa6a010c59253cffe556e diff --git a/pkg/arch/gen.lua b/pkg/arch/gen.lua @@ -1,3 +0,0 @@ -subgen('pax') -subgen('pigz') -subgen('zstd') diff --git a/pkg/arch/pax/src b/pkg/arch/pax/src @@ -1 +0,0 @@ -Subproject commit e5f599fd61cdf650bd3f4726b28200f5fcaefd9c diff --git a/pkg/arch/pigz/gen.lua b/pkg/arch/pigz/gen.lua @@ -1,18 +0,0 @@ -cflags({ - '-Wall', '-Wextra', '-Wno-clobbered', '-Wno-stringop-overflow', - '-D NOZOPFLI', - '-isystem $builddir/pkg/libs/zlib/include', -}) - -exe('pigz', [[ - pigz.c yarn.c try.c - $builddir/pkg/libs/zlib/libz.a -]], {'pkg/libs/zlib/headers'}) -file('bin/pigz', '755', '$outdir/pigz') -man({'pigz.1'}) -for _, alias in ipairs({'gzip', 'gunzip', 'zcat'}) do - sym('bin/'..alias, 'pigz') - sym('share/man/man1/'..alias..'.1', 'pigz.1') -end - -fetch('git') diff --git a/pkg/arch/pigz/src b/pkg/arch/pigz/src @@ -1 +0,0 @@ -Subproject commit fe4894f57739e3039a2ffc2a2a360d35e19bacbe diff --git a/pkg/arch/zstd/src b/pkg/arch/zstd/src @@ -1 +0,0 @@ -Subproject commit f8745da6ff1ad1e7bab384bd1f9d742439278e99 diff --git a/pkg/lang/awk/.gitignore b/pkg/awk/.gitignore diff --git a/pkg/lang/awk/gen.lua b/pkg/awk/gen.lua diff --git a/pkg/awk/src b/pkg/awk/src @@ -0,0 +1 @@ +Subproject commit 61a7c75e225e3035390be32d635545e40d8c5faf diff --git a/pkg/lang/awk/ver b/pkg/awk/ver diff --git a/pkg/arch/pax/.gitignore b/pkg/b3sum/.gitignore diff --git a/pkg/crypt/b3sum/gen.lua b/pkg/b3sum/gen.lua diff --git a/pkg/b3sum/src b/pkg/b3sum/src @@ -0,0 +1 @@ +Subproject commit d995c3d31b42d09a568a0a658bcbcd3814164ca9 diff --git a/pkg/crypt/b3sum/ver b/pkg/b3sum/ver diff --git a/pkg/libs/bearssl/gen.lua b/pkg/bearssl/gen.lua diff --git a/pkg/libs/bearssl/patch/0001-Add-missing-return-in-client-single-EC-choose-functi.patch b/pkg/bearssl/patch/0001-Add-missing-return-in-client-single-EC-choose-functi.patch diff --git a/pkg/libs/bearssl/patch/0002-Add-functions-to-retrieve-certificate-validity-perio.patch b/pkg/bearssl/patch/0002-Add-functions-to-retrieve-certificate-validity-perio.patch diff --git a/pkg/libs/bearssl/patch/0003-Add-flag-to-send-CertificateRequest.patch b/pkg/bearssl/patch/0003-Add-flag-to-send-CertificateRequest.patch diff --git a/pkg/bearssl/src b/pkg/bearssl/src @@ -0,0 +1 @@ +Subproject commit 79c060eea3eea1257797f15ea1608a9a9923aa6f diff --git a/pkg/libs/bearssl/ver b/pkg/bearssl/ver diff --git a/pkg/devel/cproc/config.h b/pkg/cproc/config.h diff --git a/pkg/devel/cproc/gen.lua b/pkg/cproc/gen.lua diff --git a/pkg/cproc/src b/pkg/cproc/src @@ -0,0 +1 @@ +Subproject commit d1d23429f5dc3d78b03b318a7d349ad71a6c97fa diff --git a/pkg/devel/cproc/ver b/pkg/cproc/ver diff --git a/pkg/crypt/b3sum/src b/pkg/crypt/b3sum/src @@ -1 +0,0 @@ -Subproject commit d995c3d31b42d09a568a0a658bcbcd3814164ca9 diff --git a/pkg/crypt/gen.lua b/pkg/crypt/gen.lua @@ -1 +0,0 @@ -subgen('b3sum') diff --git a/pkg/net/curl/.gitignore b/pkg/curl/.gitignore diff --git a/pkg/net/curl/README.md b/pkg/curl/README.md diff --git a/pkg/net/curl/curl_config.h b/pkg/curl/curl_config.h diff --git a/pkg/curl/gen.lua b/pkg/curl/gen.lua @@ -0,0 +1,133 @@ +cflags({ + '-std=c99', '-Wall', '-Wpedantic', '-Wno-maybe-uninitialized', + '-D _DEFAULT_SOURCE', + '-D HAVE_CONFIG_H', + '-D BUILDING_LIBCURL', + '-D CURL_STATICLIB', + '-I $outdir', + '-I $outdir/include/curl', + '-I $outdir/include', + '-I $srcdir/lib', + '-I $srcdir/src', + '-isystem $builddir/pkg/bearssl/include', + '-isystem $builddir/pkg/linux-headers/include', + '-isystem $builddir/pkg/zlib/include', +}) + +build('cat', '$outdir/curl_config.h', { + '$dir/curl_config.h', + '$builddir/probe/SIZEOF_LONG', + '$builddir/probe/SIZEOF_SIZE_T', + '$builddir/probe/SIZEOF_TIME_T', +}) + +-- src/include/curl/Makefile.am:/^pkginclude_HEADERS +pkg.hdrs = copy('$outdir/include/curl', '$srcdir/include/curl', { + 'curl.h', 'curlver.h', 'easy.h', 'mprintf.h', 'stdcheaders.h', 'multi.h', + 'typecheck-gcc.h', 'system.h', 'urlapi.h', 'options.h', 'header.h', 'websockets.h', +}) +pkg.deps = { + '$outdir/curl_config.h', + '$gendir/headers', + 'pkg/bearssl/headers', + 'pkg/linux-headers/headers', + 'pkg/zlib/headers', +} + +-- src/lib/Makefile.inc:/^CSOURCES +lib('libcurl.a', [[ + lib/( + altsvc.c amigaos.c asyn-ares.c asyn-thread.c base64.c bufq.c + bufref.c c-hyper.c cf-h1-proxy.c cf-h2-proxy.c cf-haproxy.c + cf-https-connect.c cf-socket.c cfilters.c conncache.c connect.c + content_encoding.c cookie.c curl_addrinfo.c curl_des.c + curl_endian.c curl_fnmatch.c curl_get_line.c curl_gethostname.c + curl_gssapi.c curl_memrchr.c curl_multibyte.c curl_ntlm_core.c + curl_ntlm_wb.c curl_path.c curl_range.c curl_rtmp.c curl_sasl.c + curl_sspi.c curl_threads.c curl_trc.c dict.c doh.c dynbuf.c + dynhds.c easy.c easygetopt.c easyoptions.c escape.c file.c + fileinfo.c fopen.c formdata.c ftp.c ftplistparser.c getenv.c + getinfo.c gopher.c hash.c headers.c hmac.c hostasyn.c hostip.c + hostip4.c hostip6.c hostsyn.c hsts.c http.c http1.c http2.c + http_aws_sigv4.c http_chunks.c http_digest.c http_negotiate.c + http_ntlm.c http_proxy.c idn.c if2ip.c imap.c inet_ntop.c + inet_pton.c krb5.c ldap.c llist.c macos.c md4.c md5.c memdebug.c + mime.c mprintf.c mqtt.c multi.c netrc.c nonblock.c noproxy.c + openldap.c parsedate.c pingpong.c pop3.c progress.c psl.c rand.c + rename.c rtsp.c select.c sendf.c setopt.c sha256.c share.c + slist.c smb.c smtp.c socketpair.c socks.c socks_gssapi.c + socks_sspi.c speedcheck.c splay.c strcase.c strdup.c strerror.c + strtok.c strtoofft.c system_win32.c telnet.c tftp.c timediff.c + timeval.c transfer.c url.c urlapi.c version.c version_win32.c + warnless.c ws.c + vauth/( + cleartext.c cram.c digest.c digest_sspi.c + gsasl.c krb5_gssapi.c krb5_sspi.c ntlm.c + ntlm_sspi.c oauth2.c spnego_gssapi.c + spnego_sspi.c vauth.c + ) + vtls/( + bearssl.c gtls.c hostcheck.c keylog.c mbedtls.c + mbedtls_threadlock.c openssl.c rustls.c schannel.c + schannel_verify.c sectransp.c vtls.c wolfssl.c + x509asn1.c + ) + vquic/(curl_msh3.c curl_ngtcp2.c curl_quiche.c vquic.c) + vssh/(libssh.c libssh2.c wolfssh.c) + ) + $builddir/pkg/bearssl/libbearssl.a + $builddir/pkg/zlib/libz.a +]]) + +-- src/src/Makefile.inc:/^CURL_CFILES +exe('curl', [[ + src/( + slist_wc.c + tool_binmode.c + tool_bname.c + tool_cb_dbg.c + tool_cb_hdr.c + tool_cb_prg.c + tool_cb_rea.c + tool_cb_see.c + tool_cb_wrt.c + tool_cfgable.c + tool_dirhie.c + tool_doswin.c + tool_easysrc.c + tool_filetime.c + tool_findfile.c + tool_formparse.c + tool_getparam.c + tool_getpass.c + tool_help.c + tool_helpers.c + tool_ipfs.c + tool_libinfo.c + tool_listhelp.c + tool_main.c + tool_msgs.c + tool_operate.c + tool_operhlp.c + tool_paramhlp.c + tool_parsecfg.c + tool_progress.c + tool_setopt.c + tool_sleep.c + tool_stderr.c + tool_strdup.c + tool_urlglob.c + tool_util.c + tool_vms.c + tool_writeout.c + tool_writeout_json.c + tool_xattr.c + var.c + ) + libcurl.a.d +]]) + +file('bin/curl', '755', '$outdir/curl') +man({'docs/curl.1'}) + +fetch('curl') diff --git a/pkg/net/curl/patch/0001-Reuse-dynbuf-symbols-for-curl-tool.patch b/pkg/curl/patch/0001-Reuse-dynbuf-symbols-for-curl-tool.patch diff --git a/pkg/net/curl/patch/0002-bearssl-Remove-unnecessary-CA-blob-length-check.patch b/pkg/curl/patch/0002-bearssl-Remove-unnecessary-CA-blob-length-check.patch diff --git a/pkg/net/curl/patch/0003-Reuse-base64-for-curl-tool.patch b/pkg/curl/patch/0003-Reuse-base64-for-curl-tool.patch diff --git a/pkg/net/curl/sha256 b/pkg/curl/sha256 diff --git a/pkg/net/curl/url b/pkg/curl/url diff --git a/pkg/net/curl/ver b/pkg/curl/ver diff --git a/pkg/devel/cproc/src b/pkg/devel/cproc/src @@ -1 +0,0 @@ -Subproject commit d1d23429f5dc3d78b03b318a7d349ad71a6c97fa diff --git a/pkg/devel/fspec-sync/gen.lua b/pkg/devel/fspec-sync/gen.lua @@ -1,28 +0,0 @@ -cflags({ - '-std=c99', '-Wall', '-Wpedantic', '-Wno-maybe-uninitialized', - '-isystem $builddir/pkg/crypt/b3sum/include', -}) - -sub('host.ninja', function() - set('outdir', '$outdir/host') - toolchain(config.host) - cflags({'-isystem $builddir/pkg/crypt/b3sum/include'}) - - lib('libcommon.a', {'fatal.c', 'parse.c', 'reallocarray.c'}) - exe('fspec-hash', {'fspec-hash.c', 'libcommon.a', '$builddir/pkg/crypt/b3sum/host/libblake3.a'}, {'pkg/crypt/b3sum/headers'}) - exe('fspec-sort', {'fspec-sort.c', 'libcommon.a'}) - exe('fspec-tar', {'fspec-tar.c', 'libcommon.a'}) -end) - -lib('libcommon.a', {'fatal.c', 'parse.c', 'reallocarray.c'}) - -exe('fspec-hash', {'fspec-hash.c', 'libcommon.a', '$builddir/pkg/crypt/b3sum/libblake3.a'}, {'pkg/crypt/b3sum/headers'}) -file('bin/fspec-hash', '755', '$outdir/fspec-hash') - -exe('fspec-sort', {'fspec-sort.c', 'libcommon.a'}) -file('bin/fspec-sort', '755', '$outdir/fspec-sort') - -exe('fspec-tar', {'fspec-tar.c', 'libcommon.a'}) -file('bin/fspec-tar', '755', '$outdir/fspec-tar') - -fetch('git') diff --git a/pkg/devel/fspec-sync/src b/pkg/devel/fspec-sync/src @@ -1 +0,0 @@ -Subproject commit a79592936c865e001ac3003dddc5f60f0bada97e diff --git a/pkg/devel/gen.lua b/pkg/devel/gen.lua @@ -1,10 +0,0 @@ -subgen('cproc') -subgen('fspec-sync') -subgen('git') -subgen('linux-headers') -subgen('man-pages-posix') -subgen('qbe') -subgen('samurai') -subgen('strace') -subgen('the_silver_searcher') -subgen('u-config') diff --git a/pkg/devel/git/gen.lua b/pkg/devel/git/gen.lua @@ -1,543 +0,0 @@ -cflags({ - '-include $dir/config.h', - '-I $srcdir', - '-I $srcdir/compat/regex', - '-I $outdir', - '-isystem $builddir/pkg/net/curl/include', - '-isystem $builddir/pkg/libs/zlib/include', -}) - -pkg.deps = { - '$outdir/version-def.h', - '$outdir/command-list.h', - '$outdir/config-list.h', - '$outdir/hook-list.h', - 'pkg/net/curl/headers', - 'pkg/libs/zlib/headers', -} - -rule('cmdlist', '$srcdir/generate-cmdlist.sh $srcdir $out') -build('cmdlist', '$outdir/command-list.h', { - '|', '$srcdir/generate-cmdlist.sh', '$srcdir/command-list.txt', - expand({'$srcdir/Documentation/', lines('commands.txt')}), -}) - -rule('configlist', '$srcdir/generate-configlist.sh $srcdir $out') -build('configlist', '$outdir/config-list.h', { - '|', '$srcdir/generate-configlist.sh', - expand({'$srcdir/Documentation/', lines('configs.txt')}), -}) - -rule('hooklist', '$srcdir/generate-hooklist.sh $srcdir $out') -build('hooklist', '$outdir/hook-list.h', { - '|', '$srcdir/generate-hooklist.sh', '$srcdir/Documentation/githooks.adoc' -}) - -build('sed', '$outdir/version-def.h', '$srcdir/version-def.h.in', { - expr={ - [[-e 's,@GIT_VERSION@,2.49.0,']], - [[-e 's,@GIT_BUILT_FROM_COMMIT@,,']], - [[-e 's,@GIT_USER_AGENT@,git/2.49.0,']], - }, -}) - -cc('exec-cmd.c', nil, {cflags=string.format([[$cflags '-DFALLBACK_RUNTIME_PREFIX="%s"']], config.prefix)}) -cc('common-main.c') -cc('http.c') -cc('compat/regex/regex.c', nil, {cflags='$cflags -DGAWK -DNO_MBSUPPORT'}) - --- src/Makefile:/^REFTABLE_OBJS.\+= -lib('libreftable.a', [[ - reftable/( - basics.c - error.c - block.c - blocksource.c - iter.c - merged.c - pq.c - reader.c - record.c - stack.c - system.c - tree.c - writer.c - ) -]]) - --- src/Makefile:/^LIB_OBJS.\+= -lib('libgit.a', [[ - abspath.c - add-interactive.c - add-patch.c - advice.c - alias.c - alloc.c - apply.c - archive-tar.c - archive-zip.c - archive.c - attr.c - base85.c - bisect.c - blame.c - blob.c - bloom.c - branch.c - bulk-checkin.c - bundle-uri.c - bundle.c - cache-tree.c - cbtree.c - chdir-notify.c - checkout.c - chunk-format.c - color.c - column.c - combine-diff.c - commit-graph.c - commit-reach.c - commit.c - common-exit.c - common-init.c - compat/nonblock.c - compat/obstack.c - compat/qsort_s.c - compat/regex/regex.c.o - compat/terminal.c - config.c - connect.c - connected.c - convert.c - copy.c - credential.c - csum-file.c - ctype.c - date.c - decorate.c - delta-islands.c - diagnose.c - diff-delta.c - diff-merges.c - diff-lib.c - diff-no-index.c - diff.c - diffcore-break.c - diffcore-delta.c - diffcore-order.c - diffcore-pickaxe.c - diffcore-rename.c - diffcore-rotate.c - dir-iterator.c - dir.c - editor.c - entry.c - environment.c - ewah/bitmap.c - ewah/ewah_bitmap.c - ewah/ewah_io.c - ewah/ewah_rlw.c - exec-cmd.c.o - fetch-negotiator.c - fetch-pack.c - fmt-merge-msg.c - fsck.c - fsmonitor.c - fsmonitor-ipc.c - fsmonitor-settings.c - gettext.c - git-zlib.c - gpg-interface.c - graph.c - grep.c - hash-lookup.c - hashmap.c - help.c - hex-ll.c - hex.c - hook.c - ident.c - json-writer.c - kwset.c - levenshtein.c - line-log.c - line-range.c - linear-assignment.c - list-objects-filter-options.c - list-objects-filter.c - list-objects.c - lockfile.c - log-tree.c - loose.c - ls-refs.c - mailinfo.c - mailmap.c - match-trees.c - mem-pool.c - merge-blobs.c - merge-ll.c - merge-ort.c - merge-ort-wrappers.c - merge-recursive.c - merge.c - midx.c - midx-write.c - name-hash.c - negotiator/default.c - negotiator/noop.c - negotiator/skipping.c - notes-cache.c - notes-merge.c - notes-utils.c - notes.c - object-file-convert.c - object-file.c - object-name.c - object.c - oid-array.c - oidmap.c - oidset.c - oidtree.c - pack-bitmap-write.c - pack-bitmap.c - pack-check.c - pack-mtimes.c - pack-objects.c - pack-revindex.c - pack-write.c - packfile.c - pager.c - parallel-checkout.c - parse-options-cb.c - parse-options.c - parse.c - patch-delta.c - patch-ids.c - path.c - path-walk.c - pathspec.c - pkt-line.c - preload-index.c - pretty.c - prio-queue.c - progress.c - promisor-remote.c - prompt.c - protocol.c - protocol-caps.c - prune-packed.c - pseudo-merge.c - quote.c - range-diff.c - reachable.c - read-cache.c - rebase-interactive.c - rebase.c - ref-filter.c - reflog-walk.c - reflog.c - refs.c - refs/debug.c - refs/files-backend.c - refs/reftable-backend.c - refs/iterator.c - refs/packed-backend.c - refs/ref-cache.c - refspec.c - remote.c - replace-object.c - repo-settings.c - repository.c - rerere.c - reset.c - resolve-undo.c - revision.c - run-command.c - send-pack.c - sequencer.c - serve.c - server-info.c - setup.c - shallow.c - sideband.c - sigchain.c - sparse-index.c - split-index.c - stable-qsort.c - statinfo.c - strbuf.c - streaming.c - string-list.c - strmap.c - strvec.c - sub-process.c - submodule-config.c - submodule.c - symlinks.c - tag.c - tempfile.c - thread-utils.c - tmp-objdir.c - trace.c - trace2.c - trace2/( - tr2_cfg.c - tr2_cmd_name.c - tr2_ctr.c - tr2_dst.c - tr2_sid.c - tr2_sysenv.c - tr2_tbuf.c - tr2_tgt_event.c - tr2_tgt_normal.c - tr2_tgt_perf.c - tr2_tls.c - tr2_tmr.c - ) - trailer.c - transport-helper.c - transport.c - tree-diff.c - tree-walk.c - tree.c - unpack-trees.c - upload-pack.c - url.c - urlmatch.c - usage.c - userdiff.c - utf8.c - varint.c - version.c - versioncmp.c - walker.c - wildmatch.c - worktree.c - wrapper.c - write-or-die.c - ws.c - wt-status.c - xdiff-interface.c - - unix-socket.c - unix-stream-server.c - - compat/simple-ipc/(ipc-shared.c ipc-unix-socket.c) - - sha1dc_git.c - sha1dc/sha1.c - sha1dc/ubc_check.c - - sha256/block/sha256.c - - compat/linux/procinfo.c - - libxdiff.a - libreftable.a - $builddir/pkg/libs/zlib/libz.a -]]) - --- src/Makefile:/^XDIFF_OBJS.\+= -lib('libxdiff.a', [[xdiff/( - xdiffi.c - xemit.c - xhistogram.c - xmerge.c - xpatience.c - xprepare.c - xutils.c -)]]) - --- src/Makefile:/^BUILTIN_OBJS.\+= -local builtins = { - 'add', - 'am', - 'annotate', - 'apply', - 'archive', - 'backfill', - 'bisect', - 'blame', - 'branch', - 'bugreport', - 'bundle', - 'cat-file', - 'check-attr', - 'check-ignore', - 'check-mailmap', - 'check-ref-format', - 'checkout--worker', - 'checkout-index', - 'checkout', - 'clean', - 'clone', - 'column', - 'commit-graph', - 'commit-tree', - 'commit', - 'config', - 'count-objects', - 'credential-cache--daemon', - 'credential-cache', - 'credential-store', - 'credential', - 'describe', - 'diagnose', - 'diff-files', - 'diff-index', - 'diff-tree', - 'diff', - 'difftool', - 'fast-export', - 'fast-import', - 'fetch-pack', - 'fetch', - 'fmt-merge-msg', - 'for-each-ref', - 'for-each-repo', - 'fsck', - 'fsmonitor--daemon', - 'gc', - 'get-tar-commit-id', - 'grep', - 'hash-object', - 'help', - 'hook', - 'index-pack', - 'init-db', - 'interpret-trailers', - 'log', - 'ls-files', - 'ls-remote', - 'ls-tree', - 'mailinfo', - 'mailsplit', - 'merge-base', - 'merge-file', - 'merge-index', - 'merge-ours', - 'merge-recursive', - 'merge-tree', - 'merge', - 'mktag', - 'mktree', - 'multi-pack-index', - 'mv', - 'name-rev', - 'notes', - 'pack-objects', - 'pack-redundant', - 'pack-refs', - 'patch-id', - 'prune-packed', - 'prune', - 'pull', - 'push', - 'range-diff', - 'read-tree', - 'rebase', - 'receive-pack', - 'reflog', - 'refs', - 'remote-ext', - 'remote-fd', - 'remote', - 'repack', - 'replace', - 'replay', - 'rerere', - 'reset', - 'rev-list', - 'rev-parse', - 'revert', - 'rm', - 'send-pack', - 'shortlog', - 'show-branch', - 'show-index', - 'show-ref', - 'sparse-checkout', - 'stash', - 'stripspace', - 'submodule--helper', - 'symbolic-ref', - 'tag', - 'unpack-file', - 'unpack-objects', - 'update-index', - 'update-ref', - 'update-server-info', - 'upload-archive', - 'upload-pack', - 'var', - 'verify-commit', - 'verify-pack', - 'verify-tag', - 'worktree', - 'write-tree', -} - -exe('git', {'git.c', 'common-main.c.o', expand({'builtin/', builtins, '.c'}), 'libgit.a.d'}) -file('bin/git', '755', '$outdir/git') - -local programs = { - -- src/Makefile:/^PROGRAM_OBJS./+= - {'daemon'}, - {'http-backend'}, - {'imap-send', {'imap-send.c', 'http.c.o', '$builddir/pkg/net/curl/libcurl.a.d'}}, - {'sh-i18n--envsubst'}, - {'shell'}, - - {'remote-http', {'remote-curl.c', 'http.c.o', 'http-walker.c', '$builddir/pkg/net/curl/libcurl.a.d'}}, -} - -for _, prog in ipairs(programs) do - local name, srcs = prog[1], prog[2] - exe('git-'..name, {srcs or name..'.c', 'common-main.c.o', 'libgit.a.d'}) - file('libexec/git-core/git-'..name, '755', '$outdir/git-'..name) -end - -for _, remote in ipairs({'https', 'ftp', 'ftps'}) do - sym('libexec/git-core/git-remote-'..remote, 'git-remote-http') -end - -local scripts = { - -- src/Makefile:/^SCRIPT_SH.\+= - {'difftool--helper', '755'}, - {'filter-branch', '755'}, - {'merge-octopus', '755'}, - {'merge-one-file', '755'}, - {'merge-resolve', '755'}, - {'mergetool', '755'}, - {'quiltimport', '755'}, - {'request-pull', '755'}, - {'submodule', '755'}, - {'web--browse', '755'}, - - -- src/Makefile:/^SCRIPT_LIB.\+= - {'mergetool--lib', '644'}, - {'sh-i18n', '644'}, - {'sh-setup', '644'}, -} - -rule('sh_gen', 'sed -f $dir/sh_gen.sed $in >$out') -for _, script in ipairs(scripts) do - local name, mode = script[1], script[2] - build('sh_gen', '$outdir/git-'..name, {'$srcdir/git-'..name..'.sh', '|', '$dir/sh_gen.sed'}) - file('libexec/git-core/git-'..name, mode, '$outdir/git-'..name) -end - -sym('bin/git-shell', '../libexec/git-core/git-shell') -for _, name in ipairs({'git-receive-pack', 'git-upload-archive', 'git-upload-pack'}) do - sym('bin/'..name, 'git') -end - --- templates -file('share/git-core/templates/description', '644', '$srcdir/templates/description') -file('share/git-core/templates/info/exclude', '644', '$srcdir/templates/info/exclude') --- Skip the sample hooks and install an empty directory instead. -dir('share/git-core/templates/hooks', '755') - -man(expand({'man/', lines('man.txt')})) - -fetch('local') diff --git a/pkg/devel/git/src b/pkg/devel/git/src @@ -1 +0,0 @@ -Subproject commit 683c54c999c301c2cd6f715c411407c413b1d84e diff --git a/pkg/devel/qbe/src b/pkg/devel/qbe/src @@ -1 +0,0 @@ -Subproject commit 8ff06515526c97628b47d8223b73d5376287a9b4 diff --git a/pkg/devel/samurai/src b/pkg/devel/samurai/src @@ -1 +0,0 @@ -Subproject commit 4288e71812493cb21b54ef23642a13214f44885f diff --git a/pkg/devel/strace/gen.lua b/pkg/devel/strace/gen.lua @@ -1,410 +0,0 @@ -cflags({ - '-D HAVE_CONFIG_H', - '-D IN_STRACE', - -- it is important that the arch-specific directory is searched first - '-I $srcdir/src/linux/x86_64', - '-I $srcdir/src/linux/generic', - '-I $srcdir/src', - '-I $outdir', - '-isystem $builddir/pkg/devel/linux-headers/include', -}) - -build('cat', '$outdir/config.h', { - '$builddir/probe/HAVE___BUILTIN_POPCOUNT', - '$dir/config.h', -}) - -build('cpp', '$outdir/ioctl_iocdef.i', '$srcdir/src/ioctl_iocdef.c') -build('sed', '$outdir/ioctl_iocdef.h', '$outdir/ioctl_iocdef.i', { - expr=[[-n 's/^DEFINE HOST/#define /p']], -}) - -sub('tools.ninja', function() - toolchain(config.host) - cflags({ - '-D X86_64=1', - '-I $srcdir/src/linux/x86_64', - '-I $srcdir/src/linux', - '-I $outdir', - }) - - for i = 0, 2 do - build('cat', '$outdir/ioctls_all'..i..'.h', { - '$srcdir/src/linux/x86_64/ioctls_inc'..i..'.h', - '$srcdir/src/linux/x86_64/ioctls_arch'..i..'.h', - }) - build('cc', '$outdir/ioctlsort'..i..'.c.o', { - '$srcdir/src/ioctlsort.c', - '|', '$outdir/ioctl_iocdef.h', '$srcdir/ioctls_zfs.h', '$outdir/ioctls_all'..i..'.h', - }, {cflags=string.format([[$cflags -D 'IOCTLSORT_INC="ioctls_all%d.h"']], i)}) - exe('ioctlsort'..i, {'ioctlsort'..i..'.c.o'}) - rule('ioctlsort'..i, '$outdir/ioctlsort'..i..' >$out') - build('ioctlsort'..i, '$outdir/ioctlent'..i..'.h', {'|', '$outdir/ioctlsort'..i}) - end -end) - -local mpers = lines('mpers.txt') -for _, f in ipairs(mpers) do - build('cpp', '$outdir/'..f..'.mpers.i', {'$srcdir/src/'..f, '|', '$outdir/config.h'}, { - cflags='$cflags -DIN_MPERS_BOOTSTRAP', - }) -end - -local function makempers(name, script) - build('awk', '$outdir/'..name, {expand{'$outdir/', mpers, '.mpers.i'}, '|', '$dir/'..script}, { - expr='-f $dir/'..script, - }) -end - -makempers('printers.h', 'printers.awk') -makempers('native_printer_decls.h', 'printerdecls.awk') -makempers('native_printer_defs.h', 'printerdefs.awk') - -build('cpp', '$outdir/syscallent.i', '$srcdir/src/linux/x86_64/syscallent.h') -build('awk', '$outdir/scno-syscallent.h', {'$outdir/syscallent.i', '|', '$dir/scno.awk'}, { - expr='-f $dir/scno.awk', -}) -build('cat', '$outdir/scno.h', {'$srcdir/src/scno.head', '$outdir/scno-syscallent.h'}) - --- this seems to be enough syscall headers to build -local syscalls = expand{'$srcdir/src/linux/', { - '32/syscallent.h', - '64/syscallent.h', - 'arm/syscallent.h', - 'i386/syscallent.h', - 'sparc/syscallent.h', - 'sparc64/syscallent.h', - 'generic/subcallent.h', - 'generic/syscallent-common.h', - 'x86_64/syscallent.h', -}} -build('awk', '$outdir/sen.h', {syscalls, '|', '$dir/sen.awk'}, { - expr='-f $dir/sen.awk', -}) - -local srcs = paths[[src/( - access.c - affinity.c - aio.c - alarm.c - alpha.c - basic_filters.c - bind.c - bjm.c - block.c - bpf.c - bpf_filter.c - bpf_seccomp_filter.c - bpf_sock_filter.c - btrfs.c - cacheflush.c - cachestat.c - capability.c - chdir.c - chmod.c - clone.c - close_range.c - copy_file_range.c - count.c - counter_ioctl.c - delay.c - desc.c - dirent.c - dirent64.c - dirent_types.c - dm.c - dup.c - dyxlat.c - epoll.c - epoll_ioctl.c - error_prints.c - evdev.c - evdev_mpers.c - eventfd.c - execve.c - exit.c - exitkill.c - fadvise.c - fallocate.c - fanotify.c - fchownat.c - fcntl.c - fetch_bpf_fprog.c - fetch_indirect_syscall_args.c - fetch_struct_flock.c - fetch_struct_iovec.c - fetch_struct_keyctl_kdf_params.c - fetch_struct_mmsghdr.c - fetch_struct_msghdr.c - fetch_struct_stat.c - fetch_struct_stat64.c - fetch_struct_statfs.c - fetch_struct_xfs_quotastat.c - file_attr.c - file_handle.c - filter_qualify.c - filter_seccomp.c - flock.c - fs_0x15_ioctl.c - fs_0x94_ioctl.c - fs_f_ioctl.c - fs_x_ioctl.c - fsconfig.c - fsmount.c - fsopen.c - fspick.c - fstatfs.c - fstatfs64.c - futex.c - futex2.c - gen/gen_hdio.c - get_personality.c - get_robust_list.c - getcpu.c - getcwd.c - getpagesize.c - getpid.c - getrandom.c - gpio_ioctl.c - hdio.c - hostname.c - inotify.c - inotify_ioctl.c - io.c - io_uring.c - ioctl.c - ioperm.c - iopl.c - ioprio.c - ipc.c - ipc_msg.c - ipc_msgctl.c - ipc_sem.c - ipc_semctl.c - ipc_shm.c - ipc_shmctl.c - kcmp.c - kd_ioctl.c - kd_mpers_ioctl.c - kexec.c - keyctl.c - kvm.c - landlock.c - ldt.c - link.c - lirc_ioctl.c - listen.c - listmount.c - listns.c - lookup_dcookie.c - loop.c - lseek.c - lsm.c - map_shadow_stack.c - mem.c - membarrier.c - memfd_create.c - memfd_secret.c - mknod.c - mmap_cache.c - mmap_notify.c - mmsghdr.c - mount.c - mount_setattr.c - move_mount.c - mq.c - msghdr.c - mtd.c - nbd_ioctl.c - net.c - netlink.c - netlink_crypto.c - netlink_generic.c - netlink_inet_diag.c - netlink_kobject_uevent.c - netlink_netfilter.c - netlink_netlink_diag.c - netlink_nlctrl.c - netlink_packet_diag.c - netlink_route.c - netlink_selinux.c - netlink_smc_diag.c - netlink_sock_diag.c - netlink_unix_diag.c - nice.c - nlattr.c - nsfs.c - numa.c - number_set.c - oldstat.c - open.c - or1k_atomic.c - pathtrace.c - perf.c - perf_ioctl.c - personality.c - pidfd_getfd.c - pidfd_open.c - pidns.c - pkeys.c - poke.c - poll.c - prctl.c - print_dev_t.c - print_group_req.c - print_ifindex.c - print_instruction_pointer.c - print_kernel_sigset.c - print_kernel_version.c - print_mac.c - print_mq_attr.c - print_msgbuf.c - print_sg_req_info.c - print_sigevent.c - print_statfs.c - print_struct_stat.c - print_syscall_number.c - print_time.c - print_timespec32.c - print_timespec64.c - print_timeval.c - print_timeval64.c - print_timex.c - printmode.c - printrusage.c - printsiginfo.c - process_vm.c - ptp.c - ptrace.c - ptrace_syscall_info.c - quota.c - random_ioctl.c - readahead.c - readlink.c - reboot.c - regset.c - renameat.c - resource.c - retval.c - riscv.c - rt_sigframe.c - rt_sigreturn.c - rtc.c - rtnl_addr.c - rtnl_addrlabel.c - rtnl_cachereport.c - rtnl_dcb.c - rtnl_link.c - rtnl_mdb.c - rtnl_neigh.c - rtnl_neightbl.c - rtnl_netconf.c - rtnl_nh.c - rtnl_nsid.c - rtnl_route.c - rtnl_rule.c - rtnl_stats.c - rtnl_tc.c - rtnl_tc_action.c - s390.c - sched.c - scsi.c - seccomp.c - seccomp_ioctl.c - sendfile.c - set_tid_address.c - sg_io_v3.c - sg_io_v4.c - shutdown.c - sigaltstack.c - signal.c - signalfd.c - sigreturn.c - sock.c - sockaddr.c - socketcall.c - socketutils.c - sparc.c - sram_alloc.c - stage_output.c - stat.c - stat64.c - statfs.c - statfs64.c - statmount.c - statx.c - strauss.c - string_to_uint.c - swapon.c - sync_file_range.c - sync_file_range2.c - syscall.c - syscall_name.c - sysctl.c - sysinfo.c - syslog.c - sysmips.c - tee.c - term.c - time.c - times.c - trie.c - truncate.c - ubi.c - ucopy.c - uid.c - uid16.c - umask.c - umount.c - uname.c - upeek.c - upoke.c - userfaultfd.c - ustat.c - util.c - utime.c - utimes.c - v4l2.c - wait.c - watchdog_ioctl.c - xattr.c - xgetdents.c - xlat.c - xmalloc.c -)]] - -build('sed', '$outdir/sys_func.h', expand{'$srcdir/', srcs}, { - expr=[[-n 's/^SYS_FUNC(.*/extern &;/p']], -}) - -pkg.deps = { - '$outdir/config.h', - '$outdir/ioctlent0.h', - '$outdir/ioctlent1.h', - '$outdir/ioctlent2.h', - '$outdir/native_printer_decls.h', - '$outdir/native_printer_defs.h', - '$outdir/printers.h', - '$outdir/scno.h', - '$outdir/sen.h', - '$outdir/sys_func.h', - 'pkg/devel/linux-headers/headers', -} - -lib('libstrace.a', srcs) -exe('strace', {'src/strace.c', 'libstrace.a'}) -file('bin/strace', '755', '$outdir/strace') - -build('sed', '$outdir/strace.1', '$srcdir/doc/strace.1.in', { - expr={ - [[-e 's,@STRACE_MANPAGE_DATE@,2025-11-13,']], - [[-e 's,@VERSION@,6.19,']], - [[-e 's,@ENABLE_STACKTRACE_TRUE@,#,']], - [[-e 's,@ENABLE_STACKTRACE_FALSE@,,']], - [[-e 's,@ENABLE_SECONTEXT_TRUE@,#,']], - [[-e 's,@ENABLE_SECONTEXT_FALSE@,,']], - }, -}) -man({'$outdir/strace.1'}) - -fetch('curl') diff --git a/pkg/devel/the_silver_searcher/gen.lua b/pkg/devel/the_silver_searcher/gen.lua @@ -1,24 +0,0 @@ -cflags{ - '-D _GNU_SOURCE', - '-I $dir', - '-isystem $builddir/pkg/libs/pcre/include', - '-isystem $builddir/pkg/libs/zlib/include', -} - -pkg.deps = { - 'pkg/libs/pcre/headers', - 'pkg/libs/zlib/headers', -} - -exe('ag', [[ - src/( - ignore.c log.c options.c print.c print_w32.c scandir.c search.c lang.c - util.c decompress.c main.c - ) - $builddir/pkg/libs/pcre/libpcre.a - $builddir/pkg/libs/zlib/libz.a -]]) -file('bin/ag', '755', '$outdir/ag') -man({'doc/ag.1'}) - -fetch('git') diff --git a/pkg/devel/the_silver_searcher/src b/pkg/devel/the_silver_searcher/src @@ -1 +0,0 @@ -Subproject commit 520ff29c528503668020c8cbedb5b03bccf4c7e0 diff --git a/pkg/devel/u-config/src b/pkg/devel/u-config/src @@ -1 +0,0 @@ -Subproject commit e57b719b709f9112b2570a914e5efef7faf0ff03 diff --git a/pkg/editors/gen.lua b/pkg/editors/gen.lua @@ -1,2 +0,0 @@ -subgen('hyx') -subgen('vis') diff --git a/pkg/editors/vis/gen.lua b/pkg/editors/vis/gen.lua @@ -1,82 +0,0 @@ -set('version', 'v0.9') -cflags({ - '-std=c99', - '-D CONFIG_HELP=1', - '-D CONFIG_CURSES=0', - '-D CONFIG_LUA=1', - '-D CONFIG_LPEG=1', - '-D CONFIG_TRE=0', - '-D CONFIG_SELINUX=0', - '-D CONFIG_ACL=0', - '-D HAVE_MEMRCHR=1', - '-D _XOPEN_SOURCE=700', - [[-D 'VERSION="$version"']], - string.format([[-D 'VIS_PATH="%s/share/vis"']], config.prefix), - '-D NDEBUG', - '-I $outdir', - '-isystem $builddir/pkg/lang/lua/include', - '-isystem $builddir/pkg/libs/libtermkey/include', -}) - -build('copy', '$outdir/config.h', '$srcdir/config.def.h') - -pkg.deps = { - '$outdir/config.h', - 'pkg/lang/lua/headers', - 'pkg/libs/libtermkey/headers', -} - -exe('vis', [[ - array.c - buffer.c - libutf.c - main.c - map.c - sam.c - text.c - text-common.c - text-io.c - text-iterator.c - text-motions.c - text-objects.c - text-util.c - ui-terminal.c - view.c - vis.c - vis-lua.c - vis-marks.c - vis-modes.c - vis-motions.c - vis-operators.c - vis-prompt.c - vis-registers.c - vis-subprocess.c - vis-text-objects.c - text-regex.c - $builddir/pkg/lang/lua/liblua.a - $builddir/pkg/libs/libtermkey/libtermkey.a.d - $builddir/pkg/libs/lpeg/liblpeg.a -]]) - -exe('vis-digraph', {'vis-digraph.c'}) -exe('vis-menu', {'vis-menu.c'}) - -for _, b in ipairs({'vis', 'vis-digraph', 'vis-menu'}) do - file('bin/'..b, '755', '$outdir/'..b) - build('sed', '$outdir/'..b..'.1', '$srcdir/man/'..b..'.1', {expr='s,VERSION,$version,'}) - man({'$outdir/'..b.. '.1'}) -end - -for _, s in ipairs({'vis-complete', 'vis-clipboard', 'vis-open'}) do - file('bin/'..s, '755', '$srcdir/'..s) - build('sed', '$outdir/'..s..'.1', '$srcdir/man/'..s..'.1', {expr='s,VERSION,$version,'}) - man({'$outdir/'..s.. '.1'}) -end - -for f in iterlines('lua.txt') do - file('share/vis/'..f, '644', '$srcdir/lua/'..f) -end -sym('share/vis/lexer.lua', 'lexers/lexer.lua') -sym('share/vis/themes/default.lua', 'base-16.lua') - -fetch('git') diff --git a/pkg/editors/vis/src b/pkg/editors/vis/src @@ -1 +0,0 @@ -Subproject commit 438ee1a66ba71274b86acaa107958db28e20eed4 diff --git a/pkg/crypt/b3sum/.gitignore b/pkg/fspec-sync/.gitignore diff --git a/pkg/fspec-sync/gen.lua b/pkg/fspec-sync/gen.lua @@ -0,0 +1,28 @@ +cflags({ + '-std=c99', '-Wall', '-Wpedantic', '-Wno-maybe-uninitialized', + '-isystem $builddir/pkg/b3sum/include', +}) + +sub('host.ninja', function() + set('outdir', '$outdir/host') + toolchain(config.host) + cflags({'-isystem $builddir/pkg/b3sum/include'}) + + lib('libcommon.a', {'fatal.c', 'parse.c', 'reallocarray.c'}) + exe('fspec-hash', {'fspec-hash.c', 'libcommon.a', '$builddir/pkg/b3sum/host/libblake3.a'}, {'pkg/b3sum/headers'}) + exe('fspec-sort', {'fspec-sort.c', 'libcommon.a'}) + exe('fspec-tar', {'fspec-tar.c', 'libcommon.a'}) +end) + +lib('libcommon.a', {'fatal.c', 'parse.c', 'reallocarray.c'}) + +exe('fspec-hash', {'fspec-hash.c', 'libcommon.a', '$builddir/pkg/b3sum/libblake3.a'}, {'pkg/b3sum/headers'}) +file('bin/fspec-hash', '755', '$outdir/fspec-hash') + +exe('fspec-sort', {'fspec-sort.c', 'libcommon.a'}) +file('bin/fspec-sort', '755', '$outdir/fspec-sort') + +exe('fspec-tar', {'fspec-tar.c', 'libcommon.a'}) +file('bin/fspec-tar', '755', '$outdir/fspec-tar') + +fetch('git') diff --git a/pkg/fspec-sync/src b/pkg/fspec-sync/src @@ -0,0 +1 @@ +Subproject commit a79592936c865e001ac3003dddc5f60f0bada97e diff --git a/pkg/devel/fspec-sync/ver b/pkg/fspec-sync/ver diff --git a/pkg/gen.lua b/pkg/gen.lua @@ -1,12 +1,45 @@ -subgen('admin') -subgen('arch') -subgen('crypt') -subgen('devel') -subgen('editors') -subgen('lang') -subgen('libs') -subgen('media') -subgen('net') -subgen('sys') -subgen('textproc') -subgen('www') +subgen('awk') +subgen('b3sum') +subgen('bearssl') +subgen('cproc') +subgen('curl') +subgen('fspec-sync') +subgen('git') +subgen('hyx') +subgen('less') +subgen('libevent') +subgen('libgit2') +subgen('libpng') +subgen('libtermkey') +subgen('libtls-bearssl') +subgen('libutp') +subgen('linux-headers') +subgen('lpeg') +subgen('lua') +subgen('man-pages-posix') +subgen('mandoc') +subgen('mblaze') +subgen('md4c') +subgen('msmtp') +subgen('netbsd-curses') +subgen('openbsd') +subgen('optipng') +subgen('pax') +subgen('pcre') +subgen('pigz') +subgen('pwgen') +subgen('qbe') +subgen('rc') +subgen('samurai') +subgen('sbase') +subgen('sfeed') +subgen('skeleton') +subgen('spm') +subgen('stagit') +subgen('strace') +subgen('the_silver_searcher') +subgen('transmission') +subgen('u-config') +subgen('vis') +subgen('zlib') +subgen('zstd') diff --git a/pkg/devel/git/.gitignore b/pkg/git/.gitignore diff --git a/pkg/devel/git/commands.txt b/pkg/git/commands.txt diff --git a/pkg/devel/git/config.h b/pkg/git/config.h diff --git a/pkg/devel/git/configs.txt b/pkg/git/configs.txt diff --git a/pkg/devel/git/fetch.sh b/pkg/git/fetch.sh diff --git a/pkg/git/gen.lua b/pkg/git/gen.lua @@ -0,0 +1,543 @@ +cflags({ + '-include $dir/config.h', + '-I $srcdir', + '-I $srcdir/compat/regex', + '-I $outdir', + '-isystem $builddir/pkg/curl/include', + '-isystem $builddir/pkg/zlib/include', +}) + +pkg.deps = { + '$outdir/version-def.h', + '$outdir/command-list.h', + '$outdir/config-list.h', + '$outdir/hook-list.h', + 'pkg/curl/headers', + 'pkg/zlib/headers', +} + +rule('cmdlist', '$srcdir/generate-cmdlist.sh $srcdir $out') +build('cmdlist', '$outdir/command-list.h', { + '|', '$srcdir/generate-cmdlist.sh', '$srcdir/command-list.txt', + expand({'$srcdir/Documentation/', lines('commands.txt')}), +}) + +rule('configlist', '$srcdir/generate-configlist.sh $srcdir $out') +build('configlist', '$outdir/config-list.h', { + '|', '$srcdir/generate-configlist.sh', + expand({'$srcdir/Documentation/', lines('configs.txt')}), +}) + +rule('hooklist', '$srcdir/generate-hooklist.sh $srcdir $out') +build('hooklist', '$outdir/hook-list.h', { + '|', '$srcdir/generate-hooklist.sh', '$srcdir/Documentation/githooks.adoc' +}) + +build('sed', '$outdir/version-def.h', '$srcdir/version-def.h.in', { + expr={ + [[-e 's,@GIT_VERSION@,2.49.0,']], + [[-e 's,@GIT_BUILT_FROM_COMMIT@,,']], + [[-e 's,@GIT_USER_AGENT@,git/2.49.0,']], + }, +}) + +cc('exec-cmd.c', nil, {cflags=string.format([[$cflags '-DFALLBACK_RUNTIME_PREFIX="%s"']], config.prefix)}) +cc('common-main.c') +cc('http.c') +cc('compat/regex/regex.c', nil, {cflags='$cflags -DGAWK -DNO_MBSUPPORT'}) + +-- src/Makefile:/^REFTABLE_OBJS.\+= +lib('libreftable.a', [[ + reftable/( + basics.c + error.c + block.c + blocksource.c + iter.c + merged.c + pq.c + reader.c + record.c + stack.c + system.c + tree.c + writer.c + ) +]]) + +-- src/Makefile:/^LIB_OBJS.\+= +lib('libgit.a', [[ + abspath.c + add-interactive.c + add-patch.c + advice.c + alias.c + alloc.c + apply.c + archive-tar.c + archive-zip.c + archive.c + attr.c + base85.c + bisect.c + blame.c + blob.c + bloom.c + branch.c + bulk-checkin.c + bundle-uri.c + bundle.c + cache-tree.c + cbtree.c + chdir-notify.c + checkout.c + chunk-format.c + color.c + column.c + combine-diff.c + commit-graph.c + commit-reach.c + commit.c + common-exit.c + common-init.c + compat/nonblock.c + compat/obstack.c + compat/qsort_s.c + compat/regex/regex.c.o + compat/terminal.c + config.c + connect.c + connected.c + convert.c + copy.c + credential.c + csum-file.c + ctype.c + date.c + decorate.c + delta-islands.c + diagnose.c + diff-delta.c + diff-merges.c + diff-lib.c + diff-no-index.c + diff.c + diffcore-break.c + diffcore-delta.c + diffcore-order.c + diffcore-pickaxe.c + diffcore-rename.c + diffcore-rotate.c + dir-iterator.c + dir.c + editor.c + entry.c + environment.c + ewah/bitmap.c + ewah/ewah_bitmap.c + ewah/ewah_io.c + ewah/ewah_rlw.c + exec-cmd.c.o + fetch-negotiator.c + fetch-pack.c + fmt-merge-msg.c + fsck.c + fsmonitor.c + fsmonitor-ipc.c + fsmonitor-settings.c + gettext.c + git-zlib.c + gpg-interface.c + graph.c + grep.c + hash-lookup.c + hashmap.c + help.c + hex-ll.c + hex.c + hook.c + ident.c + json-writer.c + kwset.c + levenshtein.c + line-log.c + line-range.c + linear-assignment.c + list-objects-filter-options.c + list-objects-filter.c + list-objects.c + lockfile.c + log-tree.c + loose.c + ls-refs.c + mailinfo.c + mailmap.c + match-trees.c + mem-pool.c + merge-blobs.c + merge-ll.c + merge-ort.c + merge-ort-wrappers.c + merge-recursive.c + merge.c + midx.c + midx-write.c + name-hash.c + negotiator/default.c + negotiator/noop.c + negotiator/skipping.c + notes-cache.c + notes-merge.c + notes-utils.c + notes.c + object-file-convert.c + object-file.c + object-name.c + object.c + oid-array.c + oidmap.c + oidset.c + oidtree.c + pack-bitmap-write.c + pack-bitmap.c + pack-check.c + pack-mtimes.c + pack-objects.c + pack-revindex.c + pack-write.c + packfile.c + pager.c + parallel-checkout.c + parse-options-cb.c + parse-options.c + parse.c + patch-delta.c + patch-ids.c + path.c + path-walk.c + pathspec.c + pkt-line.c + preload-index.c + pretty.c + prio-queue.c + progress.c + promisor-remote.c + prompt.c + protocol.c + protocol-caps.c + prune-packed.c + pseudo-merge.c + quote.c + range-diff.c + reachable.c + read-cache.c + rebase-interactive.c + rebase.c + ref-filter.c + reflog-walk.c + reflog.c + refs.c + refs/debug.c + refs/files-backend.c + refs/reftable-backend.c + refs/iterator.c + refs/packed-backend.c + refs/ref-cache.c + refspec.c + remote.c + replace-object.c + repo-settings.c + repository.c + rerere.c + reset.c + resolve-undo.c + revision.c + run-command.c + send-pack.c + sequencer.c + serve.c + server-info.c + setup.c + shallow.c + sideband.c + sigchain.c + sparse-index.c + split-index.c + stable-qsort.c + statinfo.c + strbuf.c + streaming.c + string-list.c + strmap.c + strvec.c + sub-process.c + submodule-config.c + submodule.c + symlinks.c + tag.c + tempfile.c + thread-utils.c + tmp-objdir.c + trace.c + trace2.c + trace2/( + tr2_cfg.c + tr2_cmd_name.c + tr2_ctr.c + tr2_dst.c + tr2_sid.c + tr2_sysenv.c + tr2_tbuf.c + tr2_tgt_event.c + tr2_tgt_normal.c + tr2_tgt_perf.c + tr2_tls.c + tr2_tmr.c + ) + trailer.c + transport-helper.c + transport.c + tree-diff.c + tree-walk.c + tree.c + unpack-trees.c + upload-pack.c + url.c + urlmatch.c + usage.c + userdiff.c + utf8.c + varint.c + version.c + versioncmp.c + walker.c + wildmatch.c + worktree.c + wrapper.c + write-or-die.c + ws.c + wt-status.c + xdiff-interface.c + + unix-socket.c + unix-stream-server.c + + compat/simple-ipc/(ipc-shared.c ipc-unix-socket.c) + + sha1dc_git.c + sha1dc/sha1.c + sha1dc/ubc_check.c + + sha256/block/sha256.c + + compat/linux/procinfo.c + + libxdiff.a + libreftable.a + $builddir/pkg/zlib/libz.a +]]) + +-- src/Makefile:/^XDIFF_OBJS.\+= +lib('libxdiff.a', [[xdiff/( + xdiffi.c + xemit.c + xhistogram.c + xmerge.c + xpatience.c + xprepare.c + xutils.c +)]]) + +-- src/Makefile:/^BUILTIN_OBJS.\+= +local builtins = { + 'add', + 'am', + 'annotate', + 'apply', + 'archive', + 'backfill', + 'bisect', + 'blame', + 'branch', + 'bugreport', + 'bundle', + 'cat-file', + 'check-attr', + 'check-ignore', + 'check-mailmap', + 'check-ref-format', + 'checkout--worker', + 'checkout-index', + 'checkout', + 'clean', + 'clone', + 'column', + 'commit-graph', + 'commit-tree', + 'commit', + 'config', + 'count-objects', + 'credential-cache--daemon', + 'credential-cache', + 'credential-store', + 'credential', + 'describe', + 'diagnose', + 'diff-files', + 'diff-index', + 'diff-tree', + 'diff', + 'difftool', + 'fast-export', + 'fast-import', + 'fetch-pack', + 'fetch', + 'fmt-merge-msg', + 'for-each-ref', + 'for-each-repo', + 'fsck', + 'fsmonitor--daemon', + 'gc', + 'get-tar-commit-id', + 'grep', + 'hash-object', + 'help', + 'hook', + 'index-pack', + 'init-db', + 'interpret-trailers', + 'log', + 'ls-files', + 'ls-remote', + 'ls-tree', + 'mailinfo', + 'mailsplit', + 'merge-base', + 'merge-file', + 'merge-index', + 'merge-ours', + 'merge-recursive', + 'merge-tree', + 'merge', + 'mktag', + 'mktree', + 'multi-pack-index', + 'mv', + 'name-rev', + 'notes', + 'pack-objects', + 'pack-redundant', + 'pack-refs', + 'patch-id', + 'prune-packed', + 'prune', + 'pull', + 'push', + 'range-diff', + 'read-tree', + 'rebase', + 'receive-pack', + 'reflog', + 'refs', + 'remote-ext', + 'remote-fd', + 'remote', + 'repack', + 'replace', + 'replay', + 'rerere', + 'reset', + 'rev-list', + 'rev-parse', + 'revert', + 'rm', + 'send-pack', + 'shortlog', + 'show-branch', + 'show-index', + 'show-ref', + 'sparse-checkout', + 'stash', + 'stripspace', + 'submodule--helper', + 'symbolic-ref', + 'tag', + 'unpack-file', + 'unpack-objects', + 'update-index', + 'update-ref', + 'update-server-info', + 'upload-archive', + 'upload-pack', + 'var', + 'verify-commit', + 'verify-pack', + 'verify-tag', + 'worktree', + 'write-tree', +} + +exe('git', {'git.c', 'common-main.c.o', expand({'builtin/', builtins, '.c'}), 'libgit.a.d'}) +file('bin/git', '755', '$outdir/git') + +local programs = { + -- src/Makefile:/^PROGRAM_OBJS./+= + {'daemon'}, + {'http-backend'}, + {'imap-send', {'imap-send.c', 'http.c.o', '$builddir/pkg/curl/libcurl.a.d'}}, + {'sh-i18n--envsubst'}, + {'shell'}, + + {'remote-http', {'remote-curl.c', 'http.c.o', 'http-walker.c', '$builddir/pkg/curl/libcurl.a.d'}}, +} + +for _, prog in ipairs(programs) do + local name, srcs = prog[1], prog[2] + exe('git-'..name, {srcs or name..'.c', 'common-main.c.o', 'libgit.a.d'}) + file('libexec/git-core/git-'..name, '755', '$outdir/git-'..name) +end + +for _, remote in ipairs({'https', 'ftp', 'ftps'}) do + sym('libexec/git-core/git-remote-'..remote, 'git-remote-http') +end + +local scripts = { + -- src/Makefile:/^SCRIPT_SH.\+= + {'difftool--helper', '755'}, + {'filter-branch', '755'}, + {'merge-octopus', '755'}, + {'merge-one-file', '755'}, + {'merge-resolve', '755'}, + {'mergetool', '755'}, + {'quiltimport', '755'}, + {'request-pull', '755'}, + {'submodule', '755'}, + {'web--browse', '755'}, + + -- src/Makefile:/^SCRIPT_LIB.\+= + {'mergetool--lib', '644'}, + {'sh-i18n', '644'}, + {'sh-setup', '644'}, +} + +rule('sh_gen', 'sed -f $dir/sh_gen.sed $in >$out') +for _, script in ipairs(scripts) do + local name, mode = script[1], script[2] + build('sh_gen', '$outdir/git-'..name, {'$srcdir/git-'..name..'.sh', '|', '$dir/sh_gen.sed'}) + file('libexec/git-core/git-'..name, mode, '$outdir/git-'..name) +end + +sym('bin/git-shell', '../libexec/git-core/git-shell') +for _, name in ipairs({'git-receive-pack', 'git-upload-archive', 'git-upload-pack'}) do + sym('bin/'..name, 'git') +end + +-- templates +file('share/git-core/templates/description', '644', '$srcdir/templates/description') +file('share/git-core/templates/info/exclude', '644', '$srcdir/templates/info/exclude') +-- Skip the sample hooks and install an empty directory instead. +dir('share/git-core/templates/hooks', '755') + +man(expand({'man/', lines('man.txt')})) + +fetch('local') diff --git a/pkg/devel/git/man.txt b/pkg/git/man.txt diff --git a/pkg/devel/git/patch/0001-request-pull-use-awk-instead-of-perl-to-parse-ls-rem.patch b/pkg/git/patch/0001-request-pull-use-awk-instead-of-perl-to-parse-ls-rem.patch diff --git a/pkg/devel/git/sh_gen.sed b/pkg/git/sh_gen.sed diff --git a/pkg/devel/git/sha256 b/pkg/git/sha256 diff --git a/pkg/git/src b/pkg/git/src @@ -0,0 +1 @@ +Subproject commit 683c54c999c301c2cd6f715c411407c413b1d84e diff --git a/pkg/devel/git/url b/pkg/git/url diff --git a/pkg/devel/git/ver b/pkg/git/ver diff --git a/pkg/editors/hyx/.gitignore b/pkg/hyx/.gitignore diff --git a/pkg/editors/hyx/gen.lua b/pkg/hyx/gen.lua diff --git a/pkg/editors/hyx/sha256 b/pkg/hyx/sha256 diff --git a/pkg/editors/hyx/url b/pkg/hyx/url diff --git a/pkg/editors/hyx/ver b/pkg/hyx/ver diff --git a/pkg/lang/awk/src b/pkg/lang/awk/src @@ -1 +0,0 @@ -Subproject commit 61a7c75e225e3035390be32d635545e40d8c5faf diff --git a/pkg/lang/gen.lua b/pkg/lang/gen.lua @@ -1,3 +0,0 @@ -subgen('awk') -subgen('lua') -subgen('rc') diff --git a/pkg/lang/rc/src b/pkg/lang/rc/src @@ -1 +0,0 @@ -Subproject commit 50b729e65d6f250ab9ab72487bd3c3d7c674e1fc diff --git a/pkg/sys/less/.gitignore b/pkg/less/.gitignore diff --git a/pkg/sys/less/defines.h b/pkg/less/defines.h diff --git a/pkg/less/gen.lua b/pkg/less/gen.lua @@ -0,0 +1,37 @@ +cflags({ + '-std=c99', '-Wall', '-Wpedantic', '-Wno-maybe-uninitialized', + '-D _XOPEN_SOURCE=700', + '-I $dir', + '-isystem $builddir/pkg/netbsd-curses/include', +}) + +objects([[ + lesskey_parse.c + version.c + xbuf.c +]]) + +exe('less', [[ + main.c screen.c brac.c ch.c charset.c cmdbuf.c + command.c cvt.c decode.c edit.c filename.c forwback.c + help.c ifile.c input.c jump.c + line.c linenum.c + lsystem.c mark.c optfunc.c option.c opttbl.c os.c + output.c pattern.c position.c prompt.c search.c signal.c + tags.c ttyin.c version.c.o xbuf.c.o + lesskey_parse.c.o + $builddir/pkg/netbsd-curses/libcurses.a.d +]], {'pkg/netbsd-curses/headers'}) +file('bin/less', '755', '$outdir/less') + +exe('lessecho', {'lessecho.c', 'version.c.o'}) +file('bin/lessecho', '755', '$outdir/lessecho') + +exe('lesskey', {'lesskey.c', 'lesskey_parse.c.o', 'xbuf.c.o', 'version.c.o'}) +file('bin/lesskey', '755', '$outdir/lesskey') + +man({'less.nro', 'lessecho.nro', 'lesskey.nro'}, '1') + +sym('bin/more', 'less') + +fetch('curl') diff --git a/pkg/sys/less/sha256 b/pkg/less/sha256 diff --git a/pkg/sys/less/url b/pkg/less/url diff --git a/pkg/sys/less/ver b/pkg/less/ver diff --git a/pkg/libs/libevent/config.h b/pkg/libevent/config.h diff --git a/pkg/libs/libevent/evconfig-private.h b/pkg/libevent/evconfig-private.h diff --git a/pkg/libevent/gen.lua b/pkg/libevent/gen.lua @@ -0,0 +1,55 @@ +cflags({ + '-I $dir', + '-I $outdir/include', + '-I $srcdir/include', + '-isystem $builddir/pkg/openbsd/include', +}) + +build('sed', '$outdir/include/event2/event-config.h', {'$dir/config.h', '|', '$srcdir/make-event-config.sed'}, { + expr='-f $srcdir/make-event-config.sed', +}) + +pkg.hdrs = { + copy('$outdir/include/event2', '$srcdir/include/event2', { + 'buffer.h', + 'bufferevent.h', + 'dns.h', + 'event.h', + 'http.h', + 'http_struct.h', + 'util.h', + 'visibility.h', + }), + '$outdir/include/event2/event-config.h', +} +pkg.deps = { + '$gendir/headers', + 'pkg/openbsd/headers', +} + +lib('libevent.a', { + 'buffer.c', + 'bufferevent.c', + 'bufferevent_filter.c', + 'bufferevent_pair.c', + 'bufferevent_ratelim.c', + 'bufferevent_sock.c', + 'event.c', + 'evmap.c', + 'evthread.c', + 'evutil.c', + 'evutil_rand.c', + 'evutil_time.c', + 'listener.c', + 'log.c', + + 'evdns.c', + 'event_tagging.c', + 'evrpc.c', + 'http.c', + + 'epoll.c', + 'signal.c', +}) + +fetch('git') diff --git a/pkg/libevent/src b/pkg/libevent/src @@ -0,0 +1 @@ +Subproject commit 5df3037d10556bfcb675bc73e516978b75fc7bc7 diff --git a/pkg/libs/libevent/ver b/pkg/libevent/ver diff --git a/pkg/libs/libgit2/README.md b/pkg/libgit2/README.md diff --git a/pkg/libgit2/gen.lua b/pkg/libgit2/gen.lua @@ -0,0 +1,322 @@ +cflags({ + '-I $dir', + '-I $srcdir/include', + '-I $srcdir/deps/http-parser', + '-I $srcdir/deps/xdiff', + '-I $srcdir/src/libgit2', + '-I $srcdir/src/util', + '-isystem $builddir/pkg/pcre/include', + '-isystem $builddir/pkg/zlib/include', +}) + +pkg.deps = { + 'pkg/pcre/headers', + 'pkg/zlib/headers', +} + +lib('libdeps.a', [[deps/( + http-parser/http_parser.c + xdiff/( + xdiffi.c + xemit.c + xhistogram.c + xmerge.c + xpatience.c + xprepare.c + xutils.c + ) +)]]) + +lib('libutil.a', [[ + src/util/( + allocators/( + failalloc.c + stdalloc.c + ) + alloc.c + date.c + errors.c + filebuf.c + fs_path.c + futils.c + hash.c + hash/( + builtin.c + collisiondetect.c + rfc6234/sha224-256.c + sha1dc/( + sha1.c + ubc_check.c + ) + ) + net.c + pool.c + posix.c + pqueue.c + rand.c + regexp.c + runtime.c + sortedcache.c + str.c + strlist.c + strmap.c + thread.c + tsort.c + unix/( + map.c + process.c + realpath.c + ) + utf8.c + util.c + varint.c + vector.c + wildmatch.c + zstream.c + ) +]]) + +lib('libgit2.a', [[ + src/libgit2/( + annotated_commit.c + apply.c + attr.c + attr_file.c + attrcache.c + blame.c + blame_git.c + blob.c + branch.c + buf.c + cache.c + checkout.c + cherrypick.c + clone.c + commit.c + commit_graph.c + commit_list.c + config.c + config_cache.c + config_file.c + config_list.c + config_mem.c + config_parse.c + config_snapshot.c + crlf.c + delta.c + describe.c + diff.c + diff_driver.c + diff_file.c + diff_generate.c + diff_parse.c + diff_print.c + diff_stats.c + diff_tform.c + diff_xdiff.c + email.c + fetch.c + fetchhead.c + filter.c + grafts.c + graph.c + hashsig.c + ident.c + idxmap.c + ignore.c + index.c + indexer.c + iterator.c + libgit2.c + mailmap.c + merge.c + merge_driver.c + merge_file.c + message.c + midx.c + mwindow.c + notes.c + object.c + object_api.c + odb.c + odb_loose.c + odb_mempack.c + odb_pack.c + offmap.c + oid.c + oidarray.c + oidmap.c + pack-objects.c + pack.c + parse.c + patch.c + patch_generate.c + patch_parse.c + path.c + pathspec.c + proxy.c + push.c + reader.c + rebase.c + refdb.c + refdb_fs.c + reflog.c + refs.c + refspec.c + remote.c + repository.c + reset.c + revert.c + revparse.c + revwalk.c + signature.c + stash.c + status.c + strarray.c + streams/( + mbedtls.c + openssl.c + registry.c + schannel.c + socket.c + stransport.c + tls.c + ) + submodule.c + sysdir.c + tag.c + trace.c + trailer.c + transaction.c + transport.c + transports/( + auth.c + auth_ntlmclient.c + auth_sspi.c + credential.c + credential_helpers.c + git.c + http.c + httpclient.c + local.c + smart.c + smart_pkt.c + smart_protocol.c + ssh.c + ssh_exec.c + ssh_libssh2.c + ) + tree-cache.c + tree.c + worktree.c + ) + libdeps.a + libutil.a + $builddir/pkg/pcre/libpcre.a + $builddir/pkg/zlib/libz.a +]]) + +-- <cd src/include; find . -type f +pkg.hdrs = { + copy('$outdir/include', '$srcdir/include', { 'git2.h' }), + copy('$outdir/include/git2', '$srcdir/include/git2', { + 'annotated_commit.h', + 'apply.h', + 'attr.h', + 'blame.h', + 'blob.h', + 'branch.h', + 'buffer.h', + 'cert.h', + 'checkout.h', + 'cherrypick.h', + 'clone.h', + 'commit.h', + 'common.h', + 'config.h', + 'cred_helpers.h', + 'credential.h', + 'credential_helpers.h', + 'deprecated.h', + 'describe.h', + 'diff.h', + 'email.h', + 'errors.h', + 'experimental.h', + 'filter.h', + 'global.h', + 'graph.h', + 'ignore.h', + 'index.h', + 'indexer.h', + 'mailmap.h', + 'merge.h', + 'message.h', + 'net.h', + 'notes.h', + 'object.h', + 'odb.h', + 'odb_backend.h', + 'oid.h', + 'oidarray.h', + 'pack.h', + 'patch.h', + 'pathspec.h', + 'proxy.h', + 'rebase.h', + 'refdb.h', + 'reflog.h', + 'refs.h', + 'refspec.h', + 'remote.h', + 'repository.h', + 'reset.h', + 'revert.h', + 'revparse.h', + 'revwalk.h', + 'signature.h', + 'stash.h', + 'status.h', + 'stdint.h', + 'strarray.h', + 'submodule.h', + 'tag.h', + 'trace.h', + 'transaction.h', + 'transport.h', + 'tree.h', + 'types.h', + 'version.h', + 'worktree.h', + }), + copy('$outdir/include/git2/sys', '$srcdir/include/git2/sys', { + 'alloc.h', + 'commit.h', + 'commit_graph.h', + 'config.h', + 'cred.h', + 'credential.h', + 'diff.h', + 'email.h', + 'errors.h', + 'filter.h', + 'hashsig.h', + 'index.h', + 'mempack.h', + 'merge.h', + 'midx.h', + 'odb_backend.h', + 'openssl.h', + 'path.h', + 'refdb_backend.h', + 'reflog.h', + 'refs.h', + 'remote.h', + 'repository.h', + 'stream.h', + 'transport.h', + }) +} +pkg.hdrs.install = true + +fetch('git') diff --git a/pkg/libs/libgit2/git2_features.h b/pkg/libgit2/git2_features.h diff --git a/pkg/libgit2/src b/pkg/libgit2/src @@ -0,0 +1 @@ +Subproject commit d74d491481831ddcd23575d376e56d2197e95910 diff --git a/pkg/libs/libgit2/ver b/pkg/libgit2/ver diff --git a/pkg/libs/libpng/config.h b/pkg/libpng/config.h diff --git a/pkg/libpng/gen.lua b/pkg/libpng/gen.lua @@ -0,0 +1,39 @@ +cflags({ + '-D HAVE_CONFIG_H', + '-I $dir', + '-I $outdir/include', + '-isystem $builddir/pkg/zlib/include', +}) + +build('awk', '$outdir/pnglibconf.tf4', { + '$srcdir/pngconf.h', + '$srcdir/scripts/pnglibconf.dfa', + '$srcdir/pngusr.dfa', + '|', '$srcdir/scripts/options.awk', +}, {expr='-f $srcdir/scripts/options.awk out=/dev/stdout version=search'}) +build('awk', '$outdir/pnglibconf.c', '$outdir/pnglibconf.tf4', { + expr='-f $srcdir/scripts/options.awk out=/dev/stdout', +}) +build('cpp', '$outdir/pnglibconf.tf1', {'$outdir/pnglibconf.c', '||', 'pkg/zlib/headers'}) +build('awk', '$outdir/include/pnglibconf.h', '$outdir/pnglibconf.tf1', { + expr='-f $srcdir/scripts/dfn.awk out=/dev/stdout', +}) + +pkg.hdrs = { + copy('$outdir/include', '$srcdir', {'png.h', 'pngconf.h'}), + '$outdir/include/pnglibconf.h', + install=true, +} +pkg.deps = {'$outdir/include/pnglibconf.h', 'pkg/zlib/headers'} + +lib('libpng.a', [[ + png.c pngerror.c + pngget.c pngmem.c pngpread.c pngread.c pngrio.c pngrtran.c pngrutil.c + pngset.c pngtrans.c pngwio.c pngwrite.c pngwtran.c pngwutil.c + @aarch64 arm/(arm_init.c filter_neon.S filter_neon_intrinsics.c palette_neon_intrinsics.c) + @x86_64 intel/(intel_init.c filter_sse2_intrinsics.c) + $builddir/pkg/zlib/libz.a +]]) +file('lib/libpng.a', '644', '$outdir/libpng.a') + +fetch('git') diff --git a/pkg/libpng/src b/pkg/libpng/src @@ -0,0 +1 @@ +Subproject commit ed217e3e601d8e462f7fd1e04bed43ac42212429 diff --git a/pkg/libs/libpng/ver b/pkg/libpng/ver diff --git a/pkg/libs/bearssl/src b/pkg/libs/bearssl/src @@ -1 +0,0 @@ -Subproject commit 79c060eea3eea1257797f15ea1608a9a9923aa6f diff --git a/pkg/libs/gen.lua b/pkg/libs/gen.lua @@ -1,11 +0,0 @@ -subgen('bearssl') -subgen('libevent') -subgen('libgit2') -subgen('libpng') -subgen('libtermkey') -subgen('libtls-bearssl') -subgen('libutp') -subgen('lpeg') -subgen('netbsd-curses') -subgen('pcre') -subgen('zlib') diff --git a/pkg/libs/libevent/gen.lua b/pkg/libs/libevent/gen.lua @@ -1,55 +0,0 @@ -cflags({ - '-I $dir', - '-I $outdir/include', - '-I $srcdir/include', - '-isystem $builddir/pkg/sys/openbsd/include', -}) - -build('sed', '$outdir/include/event2/event-config.h', {'$dir/config.h', '|', '$srcdir/make-event-config.sed'}, { - expr='-f $srcdir/make-event-config.sed', -}) - -pkg.hdrs = { - copy('$outdir/include/event2', '$srcdir/include/event2', { - 'buffer.h', - 'bufferevent.h', - 'dns.h', - 'event.h', - 'http.h', - 'http_struct.h', - 'util.h', - 'visibility.h', - }), - '$outdir/include/event2/event-config.h', -} -pkg.deps = { - '$gendir/headers', - 'pkg/sys/openbsd/headers', -} - -lib('libevent.a', { - 'buffer.c', - 'bufferevent.c', - 'bufferevent_filter.c', - 'bufferevent_pair.c', - 'bufferevent_ratelim.c', - 'bufferevent_sock.c', - 'event.c', - 'evmap.c', - 'evthread.c', - 'evutil.c', - 'evutil_rand.c', - 'evutil_time.c', - 'listener.c', - 'log.c', - - 'evdns.c', - 'event_tagging.c', - 'evrpc.c', - 'http.c', - - 'epoll.c', - 'signal.c', -}) - -fetch('git') diff --git a/pkg/libs/libevent/src b/pkg/libs/libevent/src @@ -1 +0,0 @@ -Subproject commit 5df3037d10556bfcb675bc73e516978b75fc7bc7 diff --git a/pkg/libs/libgit2/gen.lua b/pkg/libs/libgit2/gen.lua @@ -1,322 +0,0 @@ -cflags({ - '-I $dir', - '-I $srcdir/include', - '-I $srcdir/deps/http-parser', - '-I $srcdir/deps/xdiff', - '-I $srcdir/src/libgit2', - '-I $srcdir/src/util', - '-isystem $builddir/pkg/libs/pcre/include', - '-isystem $builddir/pkg/libs/zlib/include', -}) - -pkg.deps = { - 'pkg/libs/pcre/headers', - 'pkg/libs/zlib/headers', -} - -lib('libdeps.a', [[deps/( - http-parser/http_parser.c - xdiff/( - xdiffi.c - xemit.c - xhistogram.c - xmerge.c - xpatience.c - xprepare.c - xutils.c - ) -)]]) - -lib('libutil.a', [[ - src/util/( - allocators/( - failalloc.c - stdalloc.c - ) - alloc.c - date.c - errors.c - filebuf.c - fs_path.c - futils.c - hash.c - hash/( - builtin.c - collisiondetect.c - rfc6234/sha224-256.c - sha1dc/( - sha1.c - ubc_check.c - ) - ) - net.c - pool.c - posix.c - pqueue.c - rand.c - regexp.c - runtime.c - sortedcache.c - str.c - strlist.c - strmap.c - thread.c - tsort.c - unix/( - map.c - process.c - realpath.c - ) - utf8.c - util.c - varint.c - vector.c - wildmatch.c - zstream.c - ) -]]) - -lib('libgit2.a', [[ - src/libgit2/( - annotated_commit.c - apply.c - attr.c - attr_file.c - attrcache.c - blame.c - blame_git.c - blob.c - branch.c - buf.c - cache.c - checkout.c - cherrypick.c - clone.c - commit.c - commit_graph.c - commit_list.c - config.c - config_cache.c - config_file.c - config_list.c - config_mem.c - config_parse.c - config_snapshot.c - crlf.c - delta.c - describe.c - diff.c - diff_driver.c - diff_file.c - diff_generate.c - diff_parse.c - diff_print.c - diff_stats.c - diff_tform.c - diff_xdiff.c - email.c - fetch.c - fetchhead.c - filter.c - grafts.c - graph.c - hashsig.c - ident.c - idxmap.c - ignore.c - index.c - indexer.c - iterator.c - libgit2.c - mailmap.c - merge.c - merge_driver.c - merge_file.c - message.c - midx.c - mwindow.c - notes.c - object.c - object_api.c - odb.c - odb_loose.c - odb_mempack.c - odb_pack.c - offmap.c - oid.c - oidarray.c - oidmap.c - pack-objects.c - pack.c - parse.c - patch.c - patch_generate.c - patch_parse.c - path.c - pathspec.c - proxy.c - push.c - reader.c - rebase.c - refdb.c - refdb_fs.c - reflog.c - refs.c - refspec.c - remote.c - repository.c - reset.c - revert.c - revparse.c - revwalk.c - signature.c - stash.c - status.c - strarray.c - streams/( - mbedtls.c - openssl.c - registry.c - schannel.c - socket.c - stransport.c - tls.c - ) - submodule.c - sysdir.c - tag.c - trace.c - trailer.c - transaction.c - transport.c - transports/( - auth.c - auth_ntlmclient.c - auth_sspi.c - credential.c - credential_helpers.c - git.c - http.c - httpclient.c - local.c - smart.c - smart_pkt.c - smart_protocol.c - ssh.c - ssh_exec.c - ssh_libssh2.c - ) - tree-cache.c - tree.c - worktree.c - ) - libdeps.a - libutil.a - $builddir/pkg/libs/pcre/libpcre.a - $builddir/pkg/libs/zlib/libz.a -]]) - --- <cd src/include; find . -type f -pkg.hdrs = { - copy('$outdir/include', '$srcdir/include', { 'git2.h' }), - copy('$outdir/include/git2', '$srcdir/include/git2', { - 'annotated_commit.h', - 'apply.h', - 'attr.h', - 'blame.h', - 'blob.h', - 'branch.h', - 'buffer.h', - 'cert.h', - 'checkout.h', - 'cherrypick.h', - 'clone.h', - 'commit.h', - 'common.h', - 'config.h', - 'cred_helpers.h', - 'credential.h', - 'credential_helpers.h', - 'deprecated.h', - 'describe.h', - 'diff.h', - 'email.h', - 'errors.h', - 'experimental.h', - 'filter.h', - 'global.h', - 'graph.h', - 'ignore.h', - 'index.h', - 'indexer.h', - 'mailmap.h', - 'merge.h', - 'message.h', - 'net.h', - 'notes.h', - 'object.h', - 'odb.h', - 'odb_backend.h', - 'oid.h', - 'oidarray.h', - 'pack.h', - 'patch.h', - 'pathspec.h', - 'proxy.h', - 'rebase.h', - 'refdb.h', - 'reflog.h', - 'refs.h', - 'refspec.h', - 'remote.h', - 'repository.h', - 'reset.h', - 'revert.h', - 'revparse.h', - 'revwalk.h', - 'signature.h', - 'stash.h', - 'status.h', - 'stdint.h', - 'strarray.h', - 'submodule.h', - 'tag.h', - 'trace.h', - 'transaction.h', - 'transport.h', - 'tree.h', - 'types.h', - 'version.h', - 'worktree.h', - }), - copy('$outdir/include/git2/sys', '$srcdir/include/git2/sys', { - 'alloc.h', - 'commit.h', - 'commit_graph.h', - 'config.h', - 'cred.h', - 'credential.h', - 'diff.h', - 'email.h', - 'errors.h', - 'filter.h', - 'hashsig.h', - 'index.h', - 'mempack.h', - 'merge.h', - 'midx.h', - 'odb_backend.h', - 'openssl.h', - 'path.h', - 'refdb_backend.h', - 'reflog.h', - 'refs.h', - 'remote.h', - 'repository.h', - 'stream.h', - 'transport.h', - }) -} -pkg.hdrs.install = true - -fetch('git') diff --git a/pkg/libs/libgit2/src b/pkg/libs/libgit2/src @@ -1 +0,0 @@ -Subproject commit d74d491481831ddcd23575d376e56d2197e95910 diff --git a/pkg/libs/libpng/gen.lua b/pkg/libs/libpng/gen.lua @@ -1,39 +0,0 @@ -cflags({ - '-D HAVE_CONFIG_H', - '-I $dir', - '-I $outdir/include', - '-isystem $builddir/pkg/libs/zlib/include', -}) - -build('awk', '$outdir/pnglibconf.tf4', { - '$srcdir/pngconf.h', - '$srcdir/scripts/pnglibconf.dfa', - '$srcdir/pngusr.dfa', - '|', '$srcdir/scripts/options.awk', -}, {expr='-f $srcdir/scripts/options.awk out=/dev/stdout version=search'}) -build('awk', '$outdir/pnglibconf.c', '$outdir/pnglibconf.tf4', { - expr='-f $srcdir/scripts/options.awk out=/dev/stdout', -}) -build('cpp', '$outdir/pnglibconf.tf1', {'$outdir/pnglibconf.c', '||', 'pkg/libs/zlib/headers'}) -build('awk', '$outdir/include/pnglibconf.h', '$outdir/pnglibconf.tf1', { - expr='-f $srcdir/scripts/dfn.awk out=/dev/stdout', -}) - -pkg.hdrs = { - copy('$outdir/include', '$srcdir', {'png.h', 'pngconf.h'}), - '$outdir/include/pnglibconf.h', - install=true, -} -pkg.deps = {'$outdir/include/pnglibconf.h', 'pkg/libs/zlib/headers'} - -lib('libpng.a', [[ - png.c pngerror.c - pngget.c pngmem.c pngpread.c pngread.c pngrio.c pngrtran.c pngrutil.c - pngset.c pngtrans.c pngwio.c pngwrite.c pngwtran.c pngwutil.c - @aarch64 arm/(arm_init.c filter_neon.S filter_neon_intrinsics.c palette_neon_intrinsics.c) - @x86_64 intel/(intel_init.c filter_sse2_intrinsics.c) - $builddir/pkg/libs/zlib/libz.a -]]) -file('lib/libpng.a', '644', '$outdir/libpng.a') - -fetch('git') diff --git a/pkg/libs/libpng/src b/pkg/libs/libpng/src @@ -1 +0,0 @@ -Subproject commit ed217e3e601d8e462f7fd1e04bed43ac42212429 diff --git a/pkg/libs/libtermkey/gen.lua b/pkg/libs/libtermkey/gen.lua @@ -1,16 +0,0 @@ -cflags({ - '-std=c99', '-Wall', - '-isystem $builddir/pkg/libs/netbsd-curses/include', -}) - -pkg.hdrs = copy('$outdir/include', '$srcdir', {'termkey.h'}) -pkg.deps = {'pkg/libs/netbsd-curses/headers'} - -lib('libtermkey.a', { - 'termkey.c', - 'driver-csi.c', - 'driver-ti.c', - '$builddir/pkg/libs/netbsd-curses/libcurses.a.d', -}) - -fetch('curl') diff --git a/pkg/libs/libtls-bearssl/gen.lua b/pkg/libs/libtls-bearssl/gen.lua @@ -1,30 +0,0 @@ -cflags({ - '-std=c11', '-Wall', '-Wpedantic', - '-D _DEFAULT_SOURCE', - '-I $srcdir', - '-isystem $builddir/pkg/libs/bearssl/include', -}) - -pkg.hdrs = copy('$outdir/include', '$srcdir', {'tls.h'}) -pkg.deps = { - 'pkg/libs/bearssl/headers', -} - -lib('libtls.a', { - 'tls.c', - 'tls_bio_cb.c', - 'tls_client.c', - 'tls_config.c', - 'tls_conninfo.c', - 'tls_keypair.c', - 'tls_ocsp.c', - 'tls_peer.c', - 'tls_server.c', - 'tls_util.c', - 'tls_verify.c', - 'bearssl.c', - '$builddir/pkg/libs/bearssl/libbearssl.a', - '$builddir/pkg/sys/openbsd/libbsd.a', -}) - -fetch('git') diff --git a/pkg/libs/libtls-bearssl/src b/pkg/libs/libtls-bearssl/src @@ -1 +0,0 @@ -Subproject commit 28db202f76a6fc1bec6e0d58412e348b1a14fb37 diff --git a/pkg/libs/libutp/src b/pkg/libs/libutp/src @@ -1 +0,0 @@ -Subproject commit 996ad97f18a09a2f3d38cb210a44014eaf089df5 diff --git a/pkg/libs/lpeg/gen.lua b/pkg/libs/lpeg/gen.lua @@ -1,18 +0,0 @@ -cflags({ - '-std=c99', '-Wall', '-Wpedantic', - '-D NDEBUG', - '-isystem $builddir/pkg/lang/lua/include', -}) - -pkg.deps = {'pkg/lang/lua/headers'} - -lib('liblpeg.a', { - 'lpvm.c', - 'lpcap.c', - 'lptree.c', - 'lpcode.c', - 'lpprint.c', - 'lpcset.c', -}) - -fetch('curl') diff --git a/pkg/libs/netbsd-curses/src b/pkg/libs/netbsd-curses/src @@ -1 +0,0 @@ -Subproject commit 5b78297a1276a7d64c3be78d1e54251a1203a44a diff --git a/pkg/libs/zlib/src b/pkg/libs/zlib/src @@ -1 +0,0 @@ -Subproject commit 51b7f2abdade71cd9bb0e7a373ef2610ec6f9daf diff --git a/pkg/libs/libtermkey/.gitignore b/pkg/libtermkey/.gitignore diff --git a/pkg/libtermkey/gen.lua b/pkg/libtermkey/gen.lua @@ -0,0 +1,16 @@ +cflags({ + '-std=c99', '-Wall', + '-isystem $builddir/pkg/netbsd-curses/include', +}) + +pkg.hdrs = copy('$outdir/include', '$srcdir', {'termkey.h'}) +pkg.deps = {'pkg/netbsd-curses/headers'} + +lib('libtermkey.a', { + 'termkey.c', + 'driver-csi.c', + 'driver-ti.c', + '$builddir/pkg/netbsd-curses/libcurses.a.d', +}) + +fetch('curl') diff --git a/pkg/libs/libtermkey/sha256 b/pkg/libtermkey/sha256 diff --git a/pkg/libs/libtermkey/url b/pkg/libtermkey/url diff --git a/pkg/libs/libtermkey/ver b/pkg/libtermkey/ver diff --git a/pkg/libtls-bearssl/gen.lua b/pkg/libtls-bearssl/gen.lua @@ -0,0 +1,30 @@ +cflags({ + '-std=c11', '-Wall', '-Wpedantic', + '-D _DEFAULT_SOURCE', + '-I $srcdir', + '-isystem $builddir/pkg/bearssl/include', +}) + +pkg.hdrs = copy('$outdir/include', '$srcdir', {'tls.h'}) +pkg.deps = { + 'pkg/bearssl/headers', +} + +lib('libtls.a', { + 'tls.c', + 'tls_bio_cb.c', + 'tls_client.c', + 'tls_config.c', + 'tls_conninfo.c', + 'tls_keypair.c', + 'tls_ocsp.c', + 'tls_peer.c', + 'tls_server.c', + 'tls_util.c', + 'tls_verify.c', + 'bearssl.c', + '$builddir/pkg/bearssl/libbearssl.a', + '$builddir/pkg/openbsd/libbsd.a', +}) + +fetch('git') diff --git a/pkg/libs/libtls-bearssl/patch/0001-Use-patched-bearssl-method-to-retrieve-validity-peri.patch b/pkg/libtls-bearssl/patch/0001-Use-patched-bearssl-method-to-retrieve-validity-peri.patch diff --git a/pkg/libs/libtls-bearssl/patch/0002-Use-patched-bearssl-flag-to-force-CertificateRequest.patch b/pkg/libtls-bearssl/patch/0002-Use-patched-bearssl-flag-to-force-CertificateRequest.patch diff --git a/pkg/libtls-bearssl/src b/pkg/libtls-bearssl/src @@ -0,0 +1 @@ +Subproject commit 28db202f76a6fc1bec6e0d58412e348b1a14fb37 diff --git a/pkg/libs/libtls-bearssl/ver b/pkg/libtls-bearssl/ver diff --git a/pkg/libs/libutp/gen.lua b/pkg/libutp/gen.lua diff --git a/pkg/libutp/src b/pkg/libutp/src @@ -0,0 +1 @@ +Subproject commit 996ad97f18a09a2f3d38cb210a44014eaf089df5 diff --git a/pkg/libs/libutp/ver b/pkg/libutp/ver diff --git a/pkg/devel/linux-headers/.gitignore b/pkg/linux-headers/.gitignore diff --git a/pkg/devel/linux-headers/arm64.lua b/pkg/linux-headers/arm64.lua diff --git a/pkg/devel/linux-headers/base.lua b/pkg/linux-headers/base.lua diff --git a/pkg/devel/linux-headers/fetch.sh b/pkg/linux-headers/fetch.sh diff --git a/pkg/devel/linux-headers/gen.lua b/pkg/linux-headers/gen.lua diff --git a/pkg/devel/linux-headers/header.sed b/pkg/linux-headers/header.sed diff --git a/pkg/devel/linux-headers/patch/0001-Only-use-inline-asm-in-headers-on-GNU-compatible-com.patch b/pkg/linux-headers/patch/0001-Only-use-inline-asm-in-headers-on-GNU-compatible-com.patch diff --git a/pkg/devel/linux-headers/patch/0002-Prevent-zero-length-array-members-in-asound.h.patch b/pkg/linux-headers/patch/0002-Prevent-zero-length-array-members-in-asound.h.patch diff --git a/pkg/devel/linux-headers/patch/0003-nfc-uapi-remove-stray-semicolon-in-struct-declaratio.patch b/pkg/linux-headers/patch/0003-nfc-uapi-remove-stray-semicolon-in-struct-declaratio.patch diff --git a/pkg/devel/linux-headers/sha256 b/pkg/linux-headers/sha256 diff --git a/pkg/devel/linux-headers/unistd.awk b/pkg/linux-headers/unistd.awk diff --git a/pkg/devel/linux-headers/url b/pkg/linux-headers/url diff --git a/pkg/devel/linux-headers/ver b/pkg/linux-headers/ver diff --git a/pkg/devel/linux-headers/version.awk b/pkg/linux-headers/version.awk diff --git a/pkg/devel/linux-headers/x86.lua b/pkg/linux-headers/x86.lua diff --git a/pkg/libs/lpeg/.gitignore b/pkg/lpeg/.gitignore diff --git a/pkg/lpeg/gen.lua b/pkg/lpeg/gen.lua @@ -0,0 +1,18 @@ +cflags({ + '-std=c99', '-Wall', '-Wpedantic', + '-D NDEBUG', + '-isystem $builddir/pkg/lua/include', +}) + +pkg.deps = {'pkg/lua/headers'} + +lib('liblpeg.a', { + 'lpvm.c', + 'lpcap.c', + 'lptree.c', + 'lpcode.c', + 'lpprint.c', + 'lpcset.c', +}) + +fetch('curl') diff --git a/pkg/libs/lpeg/sha256 b/pkg/lpeg/sha256 diff --git a/pkg/libs/lpeg/url b/pkg/lpeg/url diff --git a/pkg/libs/lpeg/ver b/pkg/lpeg/ver diff --git a/pkg/lang/lua/.gitignore b/pkg/lua/.gitignore diff --git a/pkg/lang/lua/gen.lua b/pkg/lua/gen.lua diff --git a/pkg/lang/lua/sha256 b/pkg/lua/sha256 diff --git a/pkg/lang/lua/url b/pkg/lua/url diff --git a/pkg/lang/lua/ver b/pkg/lua/ver diff --git a/pkg/devel/man-pages-posix/.gitignore b/pkg/man-pages-posix/.gitignore diff --git a/pkg/devel/man-pages-posix/gen.lua b/pkg/man-pages-posix/gen.lua diff --git a/pkg/devel/man-pages-posix/manpages.txt b/pkg/man-pages-posix/manpages.txt diff --git a/pkg/devel/man-pages-posix/sha256 b/pkg/man-pages-posix/sha256 diff --git a/pkg/devel/man-pages-posix/url b/pkg/man-pages-posix/url diff --git a/pkg/devel/man-pages-posix/ver b/pkg/man-pages-posix/ver diff --git a/pkg/sys/mandoc/.gitignore b/pkg/mandoc/.gitignore diff --git a/pkg/sys/mandoc/config.h b/pkg/mandoc/config.h diff --git a/pkg/mandoc/gen.lua b/pkg/mandoc/gen.lua @@ -0,0 +1,118 @@ +cflags({ + '-I $dir', + '-isystem $basedir/pkg/openbsd/include', + '-isystem $builddir/pkg/zlib/include', +}) + +lib('libmandoc.a', { + 'man.c', + 'man_macro.c', + 'man_validate.c', + + 'arch.c', + 'att.c', + 'lib.c', + 'mdoc.c', + 'mdoc_argv.c', + 'mdoc_macro.c', + 'mdoc_state.c', + 'mdoc_validate.c', + 'st.c', + + 'eqn.c', + 'roff.c', + 'roff_validate.c', + 'tbl.c', + 'tbl_data.c', + 'tbl_layout.c', + 'tbl_opts.c', + + 'chars.c', + 'mandoc.c', + 'mandoc_aux.c', + 'mandoc_msg.c', + 'mandoc_ohash.c', + 'mandoc_xr.c', + 'msec.c', + 'preconv.c', + 'read.c', + 'tag.c', + + 'compat_fts.c', + 'compat_ohash.c', +}, {'pkg/zlib/headers'}) + +exe('mandoc', { + 'main.c', + 'manpath.c', + 'mdoc_man.c', + 'mdoc_markdown.c', + 'out.c', + 'tree.c', + + 'eqn_html.c', + 'html.c', + 'man_html.c', + 'mdoc_html.c', + 'roff_html.c', + 'tbl_html.c', + + 'eqn_term.c', + 'man_term.c', + 'mdoc_term.c', + 'roff_term.c', + 'term.c', + 'term_ascii.c', + 'term_ps.c', + 'term_tab.c', + 'term_tag.c', + 'tbl_term.c', + + 'dbm.c', + 'dbm_map.c', + 'mansearch.c', + + 'dba.c', + 'dba_array.c', + 'dba_read.c', + 'dba_write.c', + 'mandocdb.c', + + 'libmandoc.a', + '$builddir/pkg/openbsd/libbsd.a', + '$builddir/pkg/zlib/libz.a', +}) +file('bin/mandoc', '755', '$outdir/mandoc') +for _, cmd in ipairs{'apropos', 'man', 'whatis', 'makewhatis'} do + sym('bin/'..cmd, 'mandoc') +end + +exe('demandoc', { + 'demandoc.c', + 'libmandoc.a', + '$builddir/pkg/openbsd/libbsd.a', + '$builddir/pkg/zlib/libz.a', +}) +file('bin/demandoc', '755', '$outdir/demandoc') + +man({ + 'mandoc.1', + 'demandoc.1', + 'man.1', + 'apropos.1', + + 'man.conf.5', + 'mandoc.db.5', + + 'man.7', + 'mdoc.7', + 'roff.7', + 'eqn.7', + 'tbl.7', + 'mandoc_char.7', + + 'makewhatis.8', +}) +sym('share/man/man1/whatis.1', 'apropos.1') + +fetch('curl') diff --git a/pkg/sys/mandoc/sha256 b/pkg/mandoc/sha256 diff --git a/pkg/sys/mandoc/url b/pkg/mandoc/url diff --git a/pkg/sys/mandoc/ver b/pkg/mandoc/ver diff --git a/pkg/net/mblaze/gen.lua b/pkg/mblaze/gen.lua diff --git a/pkg/mblaze/src b/pkg/mblaze/src @@ -0,0 +1 @@ +Subproject commit 7b039011ef688e030ffe9eebe831d1ac8619072b diff --git a/pkg/net/mblaze/ver b/pkg/mblaze/ver diff --git a/pkg/textproc/md4c/gen.lua b/pkg/md4c/gen.lua diff --git a/pkg/md4c/src b/pkg/md4c/src @@ -0,0 +1 @@ +Subproject commit 729e6b8b320caa96328968ab27d7db2235e4fb47 diff --git a/pkg/textproc/md4c/ver b/pkg/md4c/ver diff --git a/pkg/media/gen.lua b/pkg/media/gen.lua @@ -1 +0,0 @@ -subgen('optipng') diff --git a/pkg/media/optipng/gen.lua b/pkg/media/optipng/gen.lua @@ -1,47 +0,0 @@ -cflags({ - '-std=c99', '-Wall', '-Wextra', - '-D _POSIX_C_SOURCE', - '-isystem $builddir/pkg/libs/libpng/include', - '-isystem $builddir/pkg/libs/zlib/include', - '-I $srcdir/src/opngreduc', - '-I $srcdir/src/pngxtern', - '-I $srcdir/third_party/cexcept', - '-I $srcdir/third_party/gifread', - '-I $srcdir/third_party/minitiff', - '-I $srcdir/third_party/pnmio', -}) - -pkg.deps = {'pkg/libs/libpng/headers', 'pkg/libs/zlib/headers'} - -lib('libdeps.a', [[ - src/( - opngreduc/opngreduc.c - pngxtern/( - pngxread.c pngxrbmp.c pngxrgif.c pngxrjpg.c pngxrpnm.c - pngxrtif.c - pngxio.c pngxmem.c pngxset.c - ) - ) - third_party/( - gifread/gifread.c - pnmio/(pnmin.c pnmout.c pnmutil.c) - minitiff/(tiffread.c tiffutil.c) - wildargs/wildargs.c - ) -]]) - -exe('optipng', [[ - src/optipng/( - optipng.c - optim.c - bitset.c - ioutil.c - ratio.c - ) - libdeps.a - $builddir/pkg/libs/libpng/libpng.a.d -]]) -file('bin/optipng', '755', '$outdir/optipng') -man({'$srcdir/src/optipng/man/optipng.1'}) - -fetch('curl') diff --git a/pkg/net/msmtp/README.md b/pkg/msmtp/README.md diff --git a/pkg/net/msmtp/config.h b/pkg/msmtp/config.h diff --git a/pkg/msmtp/gen.lua b/pkg/msmtp/gen.lua @@ -0,0 +1,41 @@ +cflags({ + '-D HAVE_CONFIG_H', + ([[-D 'SYSCONFDIR="%s/etc"']]):format(config.prefix), + '-I $dir', + '-isystem $builddir/pkg/libtls-bearssl/include', +}) + +pkg.deps = { + 'pkg/libtls-bearssl/headers', +} + +exe('msmtp', [[ + src/( + conf.c + eval.c + list.c + md5.c + md5-apps.c + msgid.c + msmtp.c + net.c + netrc.c + readbuf.c + smtp.c + stream.c + tools.c + xalloc.c + aliases.c + password.c + base64.c + + mtls.c + mtls-libtls.c + ) + $builddir/pkg/libtls-bearssl/libtls.a.d +]]) + +file('bin/msmtp', '755', '$outdir/msmtp') +man({'doc/msmtp.1'}) + +fetch('git') diff --git a/pkg/msmtp/src b/pkg/msmtp/src @@ -0,0 +1 @@ +Subproject commit 8b2f0e4cdbea887840e486e7758cc46d577285f1 diff --git a/pkg/net/msmtp/ver b/pkg/msmtp/ver diff --git a/pkg/net/curl/gen.lua b/pkg/net/curl/gen.lua @@ -1,133 +0,0 @@ -cflags({ - '-std=c99', '-Wall', '-Wpedantic', '-Wno-maybe-uninitialized', - '-D _DEFAULT_SOURCE', - '-D HAVE_CONFIG_H', - '-D BUILDING_LIBCURL', - '-D CURL_STATICLIB', - '-I $outdir', - '-I $outdir/include/curl', - '-I $outdir/include', - '-I $srcdir/lib', - '-I $srcdir/src', - '-isystem $builddir/pkg/libs/bearssl/include', - '-isystem $builddir/pkg/devel/linux-headers/include', - '-isystem $builddir/pkg/libs/zlib/include', -}) - -build('cat', '$outdir/curl_config.h', { - '$dir/curl_config.h', - '$builddir/probe/SIZEOF_LONG', - '$builddir/probe/SIZEOF_SIZE_T', - '$builddir/probe/SIZEOF_TIME_T', -}) - --- src/include/curl/Makefile.am:/^pkginclude_HEADERS -pkg.hdrs = copy('$outdir/include/curl', '$srcdir/include/curl', { - 'curl.h', 'curlver.h', 'easy.h', 'mprintf.h', 'stdcheaders.h', 'multi.h', - 'typecheck-gcc.h', 'system.h', 'urlapi.h', 'options.h', 'header.h', 'websockets.h', -}) -pkg.deps = { - '$outdir/curl_config.h', - '$gendir/headers', - 'pkg/libs/bearssl/headers', - 'pkg/devel/linux-headers/headers', - 'pkg/libs/zlib/headers', -} - --- src/lib/Makefile.inc:/^CSOURCES -lib('libcurl.a', [[ - lib/( - altsvc.c amigaos.c asyn-ares.c asyn-thread.c base64.c bufq.c - bufref.c c-hyper.c cf-h1-proxy.c cf-h2-proxy.c cf-haproxy.c - cf-https-connect.c cf-socket.c cfilters.c conncache.c connect.c - content_encoding.c cookie.c curl_addrinfo.c curl_des.c - curl_endian.c curl_fnmatch.c curl_get_line.c curl_gethostname.c - curl_gssapi.c curl_memrchr.c curl_multibyte.c curl_ntlm_core.c - curl_ntlm_wb.c curl_path.c curl_range.c curl_rtmp.c curl_sasl.c - curl_sspi.c curl_threads.c curl_trc.c dict.c doh.c dynbuf.c - dynhds.c easy.c easygetopt.c easyoptions.c escape.c file.c - fileinfo.c fopen.c formdata.c ftp.c ftplistparser.c getenv.c - getinfo.c gopher.c hash.c headers.c hmac.c hostasyn.c hostip.c - hostip4.c hostip6.c hostsyn.c hsts.c http.c http1.c http2.c - http_aws_sigv4.c http_chunks.c http_digest.c http_negotiate.c - http_ntlm.c http_proxy.c idn.c if2ip.c imap.c inet_ntop.c - inet_pton.c krb5.c ldap.c llist.c macos.c md4.c md5.c memdebug.c - mime.c mprintf.c mqtt.c multi.c netrc.c nonblock.c noproxy.c - openldap.c parsedate.c pingpong.c pop3.c progress.c psl.c rand.c - rename.c rtsp.c select.c sendf.c setopt.c sha256.c share.c - slist.c smb.c smtp.c socketpair.c socks.c socks_gssapi.c - socks_sspi.c speedcheck.c splay.c strcase.c strdup.c strerror.c - strtok.c strtoofft.c system_win32.c telnet.c tftp.c timediff.c - timeval.c transfer.c url.c urlapi.c version.c version_win32.c - warnless.c ws.c - vauth/( - cleartext.c cram.c digest.c digest_sspi.c - gsasl.c krb5_gssapi.c krb5_sspi.c ntlm.c - ntlm_sspi.c oauth2.c spnego_gssapi.c - spnego_sspi.c vauth.c - ) - vtls/( - bearssl.c gtls.c hostcheck.c keylog.c mbedtls.c - mbedtls_threadlock.c openssl.c rustls.c schannel.c - schannel_verify.c sectransp.c vtls.c wolfssl.c - x509asn1.c - ) - vquic/(curl_msh3.c curl_ngtcp2.c curl_quiche.c vquic.c) - vssh/(libssh.c libssh2.c wolfssh.c) - ) - $builddir/pkg/libs/bearssl/libbearssl.a - $builddir/pkg/libs/zlib/libz.a -]]) - --- src/src/Makefile.inc:/^CURL_CFILES -exe('curl', [[ - src/( - slist_wc.c - tool_binmode.c - tool_bname.c - tool_cb_dbg.c - tool_cb_hdr.c - tool_cb_prg.c - tool_cb_rea.c - tool_cb_see.c - tool_cb_wrt.c - tool_cfgable.c - tool_dirhie.c - tool_doswin.c - tool_easysrc.c - tool_filetime.c - tool_findfile.c - tool_formparse.c - tool_getparam.c - tool_getpass.c - tool_help.c - tool_helpers.c - tool_ipfs.c - tool_libinfo.c - tool_listhelp.c - tool_main.c - tool_msgs.c - tool_operate.c - tool_operhlp.c - tool_paramhlp.c - tool_parsecfg.c - tool_progress.c - tool_setopt.c - tool_sleep.c - tool_stderr.c - tool_strdup.c - tool_urlglob.c - tool_util.c - tool_vms.c - tool_writeout.c - tool_writeout_json.c - tool_xattr.c - var.c - ) - libcurl.a.d -]]) - -file('bin/curl', '755', '$outdir/curl') -man({'docs/curl.1'}) - -fetch('curl') diff --git a/pkg/net/gen.lua b/pkg/net/gen.lua @@ -1,5 +0,0 @@ -subgen('curl') -subgen('mblaze') -subgen('msmtp') -subgen('sfeed') -subgen('transmission') diff --git a/pkg/net/mblaze/src b/pkg/net/mblaze/src @@ -1 +0,0 @@ -Subproject commit 7b039011ef688e030ffe9eebe831d1ac8619072b diff --git a/pkg/net/msmtp/gen.lua b/pkg/net/msmtp/gen.lua @@ -1,41 +0,0 @@ -cflags({ - '-D HAVE_CONFIG_H', - ([[-D 'SYSCONFDIR="%s/etc"']]):format(config.prefix), - '-I $dir', - '-isystem $builddir/pkg/libs/libtls-bearssl/include', -}) - -pkg.deps = { - 'pkg/libs/libtls-bearssl/headers', -} - -exe('msmtp', [[ - src/( - conf.c - eval.c - list.c - md5.c - md5-apps.c - msgid.c - msmtp.c - net.c - netrc.c - readbuf.c - smtp.c - stream.c - tools.c - xalloc.c - aliases.c - password.c - base64.c - - mtls.c - mtls-libtls.c - ) - $builddir/pkg/libs/libtls-bearssl/libtls.a.d -]]) - -file('bin/msmtp', '755', '$outdir/msmtp') -man({'doc/msmtp.1'}) - -fetch('git') diff --git a/pkg/net/msmtp/src b/pkg/net/msmtp/src @@ -1 +0,0 @@ -Subproject commit 8b2f0e4cdbea887840e486e7758cc46d577285f1 diff --git a/pkg/net/sfeed/gen.lua b/pkg/net/sfeed/gen.lua @@ -1,44 +0,0 @@ -cflags{ - '-std=c99', '-Wall', '-Wpedantic', - '-D _XOPEN_SOURCE=700', - [[-D 'SFEED_THEME="themes/mono.h"']], - '-isystem $builddir/pkg/libs/netbsd-curses/include', -} - -lib('libutil.a', {'util.c', 'xml.c'}) - -local tools = { - 'sfeed', - 'sfeed_opml_import', - 'sfeed_plain', - 'sfeed_web', - 'sfeed_xmlenc', -} -for _, tool in ipairs(tools) do - exe(tool, {tool..'.c', 'libutil.a'}) - file('bin/'..tool, '755', '$outdir/'..tool) - man({tool..'.1'}) -end - -exe('sfeed_curses', { - 'sfeed_curses.c', - 'libutil.a', - '$builddir/pkg/libs/netbsd-curses/libcurses.a.d', -}, 'pkg/libs/netbsd-curses/headers') -file('bin/sfeed_curses', '755', '$outdir/sfeed_curses') -man({'sfeed_curses.1'}) - -local scripts = { - 'sfeed_content', - 'sfeed_markread', - 'sfeed_opml_export', - 'sfeed_update', -} -for _, script in ipairs(scripts) do - file('bin/'..script, '755', '$srcdir/'..script) - man({script..'.1'}) -end - -man({'sfeedrc.5'}) - -fetch('git') diff --git a/pkg/net/sfeed/src b/pkg/net/sfeed/src @@ -1 +0,0 @@ -Subproject commit 66c4192ad01bc01c65491f30f746cce00a5dab8d diff --git a/pkg/net/transmission/gen.lua b/pkg/net/transmission/gen.lua @@ -1,156 +0,0 @@ -sub('libnatpmp.ninja', function() - cflags{'-D ENABLE_STRNATPMPERR'} - lib('libnatpmp.a', 'third-party/libnatpmp/(getgateway.c natpmp.c wingettimeofday.c)') -end) -sub('libminiupnp.ninja', function() - cflags{ - '-D _GNU_SOURCE', - '-I $outdir/miniupnpc', - '-isystem $outdir/pkg/sys/openbsd/include', - } - - build('sed', '$outdir/miniupnpc/miniupnpcstrings.h', '$srcdir/third-party/miniupnpc/miniupnpcstrings.h.in', { - expr='-e s,OS/version,Linux, -e s,version,,', - }) - - lib('libminiupnp.a', [[ - third-party/miniupnpc/( - connecthostport.c - igd_desc_parse.c - minisoap.c - minissdpc.c - miniupnpc.c - miniwget.c - minixml.c - portlistingparse.c - receivedata.c - upnpcommands.c - upnpdev.c - upnperrors.c - upnpreplyparse.c - ) - ]], {'$outdir/miniupnpc/miniupnpcstrings.h', 'pkg/sys/openbsd/headers'}) -end) - -cflags({ - '-D __TRANSMISSION__', - '-I $dir', - '-I $srcdir', - '-isystem $builddir/pkg/libs/bearssl/include', - '-isystem $builddir/pkg/libs/libevent/include', - '-isystem $builddir/pkg/libs/libutp/include', - '-isystem $builddir/pkg/libs/zlib/include', - '-isystem $builddir/pkg/net/curl/include', - '-isystem $builddir/pkg/sys/openbsd/include', - '-isystem $srcdir/third-party', - '-isystem $srcdir/third-party/libb64/include', - '-isystem $srcdir/third-party/libnatpmp', - '-include config.h', -}) - -pkg.deps = { - 'pkg/libs/bearssl/headers', - 'pkg/libs/libevent/headers', - 'pkg/libs/libutp/headers', - 'pkg/libs/zlib/headers', - 'pkg/net/curl/headers', - 'pkg/sys/openbsd/headers', -} - -lib('libtransmission.a', [[ - libtransmission/( - announcer.c - announcer-http.c - announcer-udp.c - bandwidth.c - bitfield.c - blocklist.c - cache.c - clients.c - completion.c - ConvertUTF.c - crypto.c - crypto-utils.c - crypto-utils-fallback.c - error.c - fdlimit.c - file.c - handshake.c - history.c - inout.c - list.c - log.c - magnet.c - makemeta.c - metainfo.c - natpmp.c - net.c - peer-io.c - peer-mgr.c - peer-msgs.c - platform.c - platform-quota.c - port-forwarding.c - ptrarray.c - quark.c - resume.c - rpcimpl.c - rpc-server.c - session.c - session-id.c - stats.c - torrent.c - torrent-ctor.c - torrent-magnet.c - tr-assert.c - tr-dht.c - tr-lpd.c - tr-udp.c - tr-utp.c - tr-getopt.c - trevent.c - upnp.c - utils.c - variant.c - variant-benc.c - variant-json.c - verify.c - watchdir.c - watchdir-generic.c - web.c - webseed.c - wildmat.c - - watchdir-inotify.c - file-posix.c - subprocess-posix.c - crypto-utils-bearssl.c - ) - libb64.a libdht.a libminiupnp.a libnatpmp.a - $builddir/pkg/( - libs/bearssl/libbearssl.a - libs/libevent/libevent.a - libs/libutp/libutp.a - libs/zlib/libz.a - net/curl/libcurl.a.d - ) -]]) - -lib('libb64.a', {'third-party/libb64/src/cdecode.c', 'third-party/libb64/src/cencode.c'}) -lib('libdht.a', {'third-party/dht/dht.c'}) - -exe('transmission-daemon', { - 'daemon/daemon.c', - 'daemon/daemon-posix.c', - 'libtransmission.a.d', -}) -file('bin/transmission-daemon', '755', '$outdir/transmission-daemon') -man({'daemon/transmission-daemon.1'}) - -for _, tool in ipairs({'create', 'edit', 'remote', 'show'}) do - exe('transmission-'..tool, {'utils/'..tool..'.c', 'libtransmission.a.d'}) - file('bin/transmission-'..tool, '755', '$outdir/transmission-'..tool) - man({'utils/transmission-'..tool..'.1'}) -end - -fetch('curl') diff --git a/pkg/libs/netbsd-curses/.gitignore b/pkg/netbsd-curses/.gitignore diff --git a/pkg/libs/netbsd-curses/gen.lua b/pkg/netbsd-curses/gen.lua diff --git a/pkg/libs/netbsd-curses/patch/0001-Use-__fpurge-from-stdio_ext.h.patch b/pkg/netbsd-curses/patch/0001-Use-__fpurge-from-stdio_ext.h.patch diff --git a/pkg/libs/netbsd-curses/patch/0002-Remove-duplicate-keymap-sequences-from-st-terminfo.patch b/pkg/netbsd-curses/patch/0002-Remove-duplicate-keymap-sequences-from-st-terminfo.patch diff --git a/pkg/libs/netbsd-curses/patch/0003-Revert-Fix-for-PR-lib-56224.patch b/pkg/netbsd-curses/patch/0003-Revert-Fix-for-PR-lib-56224.patch diff --git a/pkg/libs/netbsd-curses/patch/0004-Don-t-wrap-when-adding-past-last-line-in-non-scrolli.patch b/pkg/netbsd-curses/patch/0004-Don-t-wrap-when-adding-past-last-line-in-non-scrolli.patch diff --git a/pkg/libs/netbsd-curses/patch/0005-Return-early-from-_cursesi_waddbytes-if-_cursesi_add.patch b/pkg/netbsd-curses/patch/0005-Return-early-from-_cursesi_waddbytes-if-_cursesi_add.patch diff --git a/pkg/netbsd-curses/src b/pkg/netbsd-curses/src @@ -0,0 +1 @@ +Subproject commit 5b78297a1276a7d64c3be78d1e54251a1203a44a diff --git a/pkg/libs/netbsd-curses/ver b/pkg/netbsd-curses/ver diff --git a/pkg/sys/openbsd/.gitignore b/pkg/openbsd/.gitignore diff --git a/pkg/sys/openbsd/fetch.sh b/pkg/openbsd/fetch.sh diff --git a/pkg/openbsd/gen.lua b/pkg/openbsd/gen.lua @@ -0,0 +1,110 @@ +cflags({ + '-std=gnu17', + '-Wall', '-Wno-pointer-sign', '-Wno-maybe-uninitialized', '-Wno-attributes', + [[-D 'DEF_WEAK(n)=_Static_assert(1, "")']], + '-I $dir/include', + '-I $outdir/include', +}) + +pkg.hdrs = { + copy('$outdir/include', '$srcdir/sys', {'sys/queue.h', 'sys/tree.h', 'sys/_null.h'}), + copy('$outdir/include', '$srcdir/include', {'fts.h', 'vis.h'}), + copy('$outdir/include', '$srcdir/lib/libutil', {'ohash.h'}), +} +pkg.deps = {'$gendir/headers'} + +-- Link arc4random.c to '$outdir' so that it doesn't include the local +-- arc4random.h +build('copy', '$outdir/lib/libc/crypt/arc4random.c', '$srcdir/lib/libc/crypt/arc4random.c') +build('copy', '$outdir/lib/libc/crypt/arc4random.h', '$srcdir/lib/libcrypto/arc4random/arc4random_linux.h') +build('copy', '$outdir/lib/libc/crypt/chacha_private.h', '$srcdir/lib/libc/crypt/chacha_private.h') +cc('$outdir/lib/libc/crypt/arc4random.c', { + '$outdir/lib/libc/crypt/arc4random.h', + '$outdir/lib/libc/crypt/chacha_private.h', +}) + +lib('libbsd.a', [[ + lib/libc/( + crypt/(arc4random.c.o arc4random_uniform.c) + gen/(fts.c getprogname.c pwcache.c readpassphrase.c setprogname.c unvis.c vis.c warnc.c vwarnc.c) + net/base64.c + stdlib/(freezero.c recallocarray.c strtonum.c) + string/(strmode.c timingsafe_bcmp.c timingsafe_memcmp.c) + ) + lib/libutil/(fmt_scaled.c ohash.c) +]]) +file('lib/libbsd.a', '644', '$outdir/libbsd.a') + +-- diff +exe('diff', 'usr.bin/diff/(diff.c diffdir.c diffreg.c xmalloc.c) libbsd.a') +file('bin/diff', '755', '$outdir/diff') +man({'usr.bin/diff/diff.1'}) + +-- doas +yacc('usr.bin/doas/parse', 'usr.bin/doas/parse.y') +cc('$outdir/usr.bin/doas/parse.tab.c', nil, {cflags='$cflags -I $srcdir/usr.bin/doas'}) +cc('usr.bin/doas/doas.c', nil, {cflags='$cflags -D _GNU_SOURCE'}) +exe('doas', 'usr.bin/doas/(doas.c.o env.c parse.tab.c.o persist.c) libbsd.a') +file('bin/doas', '6755', '$outdir/doas') +man({'usr.bin/doas/doas.1', 'usr.bin/doas/doas.conf.5'}) + +-- fmt +file('bin/fmt', '755', exe('fmt', {'usr.bin/fmt/fmt.c', 'libbsd.a'})) +man({'usr.bin/fmt/fmt.1'}) + +-- nc +sub('nc.ninja', function() + cflags({'-isystem $builddir/pkg/libtls-bearssl/include'}) + exe('nc', [[ + usr.bin/nc/(netcat.c atomicio.c socks.c) + $builddir/pkg/libtls-bearssl/libtls.a.d + libbsd.a + ]], {'pkg/libtls-bearssl/headers'}) + file('bin/nc', '755', '$outdir/nc') + man({'usr.bin/nc/nc.1'}) +end) + +-- m4 +yacc('usr.bin/m4/parser', 'usr.bin/m4/parser.y') +cc('usr.bin/m4/tokenizer.c', {'$outdir/usr.bin/m4/parser.tab.h'}, {cflags='$cflags -I $outdir/usr.bin/m4'}) +exe('m4', [[ + usr.bin/m4/(eval.c expr.c look.c main.c misc.c gnum4.c trace.c tokenizer.c.o) + $outdir/usr.bin/m4/parser.tab.c + libbsd.a +]]) +file('bin/m4', '755', '$outdir/m4') +man({'usr.bin/m4/m4.1'}) + +-- patch +exe('patch', 'usr.bin/patch/(patch.c pch.c inp.c util.c backupfile.c mkpath.c ed.c) libbsd.a') +file('bin/patch', '755', '$outdir/patch') +man({'usr.bin/patch/patch.1'}) + +-- pax +exe('pax', [[bin/pax/( + ar_io.c ar_subs.c buf_subs.c cpio.c file_subs.c ftree.c + gen_subs.c getoldopt.c options.c pat_rep.c pax.c sel_subs.c tables.c + tar.c tty_subs.c +) libbsd.a]]) +file('bin/tar', '755', '$outdir/pax') +sym('bin/cpio', 'tar') +man({'bin/pax/tar.1', 'bin/pax/cpio.1'}) + +-- rsync +exe('rsync', [[ + usr.bin/rsync/( + blocks.c client.c copy.c downloader.c fargs.c flist.c hash.c ids.c + io.c log.c main.c md4.c misc.c mkpath.c mktemp.c receiver.c rmatch.c + rules.c sender.c server.c session.c socket.c symlinks.c uploader.c + ) + libbsd.a +]]) +file('bin/rsync', '755', '$outdir/rsync') +man({'usr.bin/rsync/rsync.1', 'usr.bin/rsync/rsync.5', 'usr.bin/rsync/rsyncd.5'}) + +-- xargs +exe('xargs', [[usr.bin/xargs/(xargs.c strnsubst.c) libbsd.a]]) +file('bin/xargs', '755', '$outdir/xargs') +man({'usr.bin/xargs/xargs.1'}) + +fetch('local') diff --git a/pkg/sys/openbsd/include/err.h b/pkg/openbsd/include/err.h diff --git a/pkg/sys/openbsd/include/grp.h b/pkg/openbsd/include/grp.h diff --git a/pkg/sys/openbsd/include/machine/endian.h b/pkg/openbsd/include/machine/endian.h diff --git a/pkg/sys/openbsd/include/netinet/ip.h b/pkg/openbsd/include/netinet/ip.h diff --git a/pkg/sys/openbsd/include/pwd.h b/pkg/openbsd/include/pwd.h diff --git a/pkg/sys/openbsd/include/readpassphrase.h b/pkg/openbsd/include/readpassphrase.h diff --git a/pkg/sys/openbsd/include/resolv.h b/pkg/openbsd/include/resolv.h diff --git a/pkg/sys/openbsd/include/stdlib.h b/pkg/openbsd/include/stdlib.h diff --git a/pkg/sys/openbsd/include/string.h b/pkg/openbsd/include/string.h diff --git a/pkg/sys/openbsd/include/sys/cdefs.h b/pkg/openbsd/include/sys/cdefs.h diff --git a/pkg/sys/openbsd/include/sys/param.h b/pkg/openbsd/include/sys/param.h diff --git a/pkg/sys/openbsd/include/sys/time.h b/pkg/openbsd/include/sys/time.h diff --git a/pkg/sys/openbsd/include/unistd.h b/pkg/openbsd/include/unistd.h diff --git a/pkg/sys/openbsd/include/util.h b/pkg/openbsd/include/util.h diff --git a/pkg/sys/openbsd/patch/0001-fts-Avoid-d_namlen.patch b/pkg/openbsd/patch/0001-fts-Avoid-d_namlen.patch diff --git a/pkg/sys/openbsd/patch/0002-fts-Add-some-includes.patch b/pkg/openbsd/patch/0002-fts-Add-some-includes.patch diff --git a/pkg/sys/openbsd/patch/0003-pax-Add-some-includes.patch b/pkg/openbsd/patch/0003-pax-Add-some-includes.patch diff --git a/pkg/sys/openbsd/patch/0004-tar-Default-to-stdin.patch b/pkg/openbsd/patch/0004-tar-Default-to-stdin.patch diff --git a/pkg/sys/openbsd/patch/0005-yacc-Add-some-includes.patch b/pkg/openbsd/patch/0005-yacc-Add-some-includes.patch diff --git a/pkg/sys/openbsd/patch/0006-diff-Add-missing-includes.patch b/pkg/openbsd/patch/0006-diff-Add-missing-includes.patch diff --git a/pkg/sys/openbsd/patch/0007-patch-Add-missing-includes.patch b/pkg/openbsd/patch/0007-patch-Add-missing-includes.patch diff --git a/pkg/sys/openbsd/patch/0008-patch-Avoid-d_namlen.patch b/pkg/openbsd/patch/0008-patch-Avoid-d_namlen.patch diff --git a/pkg/sys/openbsd/patch/0009-pax-Fix-GNU-long-name-handling-with-short-read.patch b/pkg/openbsd/patch/0009-pax-Fix-GNU-long-name-handling-with-short-read.patch diff --git a/pkg/sys/openbsd/patch/0010-pax-Support-xz-compression-with-J-flag.patch b/pkg/openbsd/patch/0010-pax-Support-xz-compression-with-J-flag.patch diff --git a/pkg/sys/openbsd/patch/0011-setprogname-Explicitly-discard-const-qualifier.patch b/pkg/openbsd/patch/0011-setprogname-Explicitly-discard-const-qualifier.patch diff --git a/pkg/sys/openbsd/patch/0012-readpassphrase-Support-systems-without-VSTATUS-and-T.patch b/pkg/openbsd/patch/0012-readpassphrase-Support-systems-without-VSTATUS-and-T.patch diff --git a/pkg/sys/openbsd/patch/0013-Remove-getpass-definition.patch b/pkg/openbsd/patch/0013-Remove-getpass-definition.patch diff --git a/pkg/sys/openbsd/patch/0014-doas-Port-to-linux-musl.patch b/pkg/openbsd/patch/0014-doas-Port-to-linux-musl.patch diff --git a/pkg/sys/openbsd/patch/0015-pwcache-Don-t-use-fixed-buffer-sizes.patch b/pkg/openbsd/patch/0015-pwcache-Don-t-use-fixed-buffer-sizes.patch diff --git a/pkg/sys/openbsd/patch/0016-Add-standalone-freezero.patch b/pkg/openbsd/patch/0016-Add-standalone-freezero.patch diff --git a/pkg/sys/openbsd/patch/0017-m4-Use-hand-written-lexer-to-avoid-cycle-in-bootstra.patch b/pkg/openbsd/patch/0017-m4-Use-hand-written-lexer-to-avoid-cycle-in-bootstra.patch diff --git a/pkg/sys/openbsd/patch/0018-m4-Use-_Noreturn-instead-of-__dead.patch b/pkg/openbsd/patch/0018-m4-Use-_Noreturn-instead-of-__dead.patch diff --git a/pkg/sys/openbsd/patch/0019-m4-Add-missing-includes.patch b/pkg/openbsd/patch/0019-m4-Add-missing-includes.patch diff --git a/pkg/sys/openbsd/patch/0020-libutil-Add-missing-includes.patch b/pkg/openbsd/patch/0020-libutil-Add-missing-includes.patch diff --git a/pkg/sys/openbsd/patch/0021-acme-client-Add-missing-includes.patch b/pkg/openbsd/patch/0021-acme-client-Add-missing-includes.patch diff --git a/pkg/sys/openbsd/patch/0022-rsync-Add-missing-includes.patch b/pkg/openbsd/patch/0022-rsync-Add-missing-includes.patch diff --git a/pkg/sys/openbsd/patch/0023-rsync-Use-standard-S_ISVTX-instead-of-S_ISTXT.patch b/pkg/openbsd/patch/0023-rsync-Use-standard-S_ISVTX-instead-of-S_ISTXT.patch diff --git a/pkg/sys/openbsd/patch/0024-rsync-Avoid-pointer-arithmetic-on-void.patch b/pkg/openbsd/patch/0024-rsync-Avoid-pointer-arithmetic-on-void.patch diff --git a/pkg/sys/openbsd/patch/0025-Include-sys-sysmacros.h-if-necessary.patch b/pkg/openbsd/patch/0025-Include-sys-sysmacros.h-if-necessary.patch diff --git a/pkg/sys/openbsd/patch/0026-nc-Portability-fixes-from-libressl-portable.patch b/pkg/openbsd/patch/0026-nc-Portability-fixes-from-libressl-portable.patch diff --git a/pkg/sys/openbsd/patch/0027-pax-Ignore-EOPNOTSUPP-from-fchmodat.patch b/pkg/openbsd/patch/0027-pax-Ignore-EOPNOTSUPP-from-fchmodat.patch diff --git a/pkg/sys/openbsd/patch/0028-acme-client-Fix-build-with-old-bison-versions.patch b/pkg/openbsd/patch/0028-acme-client-Fix-build-with-old-bison-versions.patch diff --git a/pkg/sys/openbsd/patch/0029-rsync-Add-implementation-of-MD4.patch b/pkg/openbsd/patch/0029-rsync-Add-implementation-of-MD4.patch diff --git a/pkg/sys/openbsd/patch/0030-pax-Fix-some-incorrect-format-specifiers.patch b/pkg/openbsd/patch/0030-pax-Fix-some-incorrect-format-specifiers.patch diff --git a/pkg/sys/openbsd/patch/0031-pax-Use-memcpy-to-set-TMAGIC-and-TVERSION-to-avoid-w.patch b/pkg/openbsd/patch/0031-pax-Use-memcpy-to-set-TMAGIC-and-TVERSION-to-avoid-w.patch diff --git a/pkg/sys/openbsd/patch/0032-rsync-Fix-some-incorrect-format-specifiers.patch b/pkg/openbsd/patch/0032-rsync-Fix-some-incorrect-format-specifiers.patch diff --git a/pkg/sys/openbsd/patch/0033-m4-Declare-dopaste-only-when-it-s-used.patch b/pkg/openbsd/patch/0033-m4-Declare-dopaste-only-when-it-s-used.patch diff --git a/pkg/sys/openbsd/patch/0034-acme-client-Fix-signed-ness-of-base64buf_url-input.patch b/pkg/openbsd/patch/0034-acme-client-Fix-signed-ness-of-base64buf_url-input.patch diff --git a/pkg/sys/openbsd/patch/0035-acme-client-Port-to-BearSSL.patch b/pkg/openbsd/patch/0035-acme-client-Port-to-BearSSL.patch diff --git a/pkg/sys/openbsd/patch/0036-rsync-Pass-long-long-to-scan_scaled.patch b/pkg/openbsd/patch/0036-rsync-Pass-long-long-to-scan_scaled.patch diff --git a/pkg/sys/openbsd/patch/0037-libutil-Include-util.h-instead-of-util.h.patch b/pkg/openbsd/patch/0037-libutil-Include-util.h-instead-of-util.h.patch diff --git a/pkg/sys/openbsd/patch/0038-nc-Add-option-to-disable-certificate-time-checking.patch b/pkg/openbsd/patch/0038-nc-Add-option-to-disable-certificate-time-checking.patch diff --git a/pkg/sys/openbsd/patch/0039-pax-Only-use-_PC_TIMESTAMP_RESOLUTION-if-it-is-defin.patch b/pkg/openbsd/patch/0039-pax-Only-use-_PC_TIMESTAMP_RESOLUTION-if-it-is-defin.patch diff --git a/pkg/sys/openbsd/patch/0040-acme-client-Fix-enum-int-mismatch-in-declaration-of-.patch b/pkg/openbsd/patch/0040-acme-client-Fix-enum-int-mismatch-in-declaration-of-.patch diff --git a/pkg/sys/openbsd/patch/0041-Explicitly-cast-arguments-to-functions-expecting-cha.patch b/pkg/openbsd/patch/0041-Explicitly-cast-arguments-to-functions-expecting-cha.patch diff --git a/pkg/sys/openbsd/patch/0041-xargs-avoid-using-sys_signames-table.patch b/pkg/openbsd/patch/0041-xargs-avoid-using-sys_signames-table.patch diff --git a/pkg/sys/openbsd/patch/0042-fts-Use-prototype-in-declaration-of-fts_compar.patch b/pkg/openbsd/patch/0042-fts-Use-prototype-in-declaration-of-fts_compar.patch diff --git a/pkg/sys/openbsd/sha256 b/pkg/openbsd/sha256 diff --git a/pkg/sys/openbsd/url b/pkg/openbsd/url diff --git a/pkg/sys/openbsd/ver b/pkg/openbsd/ver diff --git a/pkg/media/optipng/.gitignore b/pkg/optipng/.gitignore diff --git a/pkg/optipng/gen.lua b/pkg/optipng/gen.lua @@ -0,0 +1,47 @@ +cflags({ + '-std=c99', '-Wall', '-Wextra', + '-D _POSIX_C_SOURCE', + '-isystem $builddir/pkg/libpng/include', + '-isystem $builddir/pkg/zlib/include', + '-I $srcdir/src/opngreduc', + '-I $srcdir/src/pngxtern', + '-I $srcdir/third_party/cexcept', + '-I $srcdir/third_party/gifread', + '-I $srcdir/third_party/minitiff', + '-I $srcdir/third_party/pnmio', +}) + +pkg.deps = {'pkg/libpng/headers', 'pkg/zlib/headers'} + +lib('libdeps.a', [[ + src/( + opngreduc/opngreduc.c + pngxtern/( + pngxread.c pngxrbmp.c pngxrgif.c pngxrjpg.c pngxrpnm.c + pngxrtif.c + pngxio.c pngxmem.c pngxset.c + ) + ) + third_party/( + gifread/gifread.c + pnmio/(pnmin.c pnmout.c pnmutil.c) + minitiff/(tiffread.c tiffutil.c) + wildargs/wildargs.c + ) +]]) + +exe('optipng', [[ + src/optipng/( + optipng.c + optim.c + bitset.c + ioutil.c + ratio.c + ) + libdeps.a + $builddir/pkg/libpng/libpng.a.d +]]) +file('bin/optipng', '755', '$outdir/optipng') +man({'$srcdir/src/optipng/man/optipng.1'}) + +fetch('curl') diff --git a/pkg/media/optipng/sha256 b/pkg/optipng/sha256 diff --git a/pkg/media/optipng/url b/pkg/optipng/url diff --git a/pkg/media/optipng/ver b/pkg/optipng/ver diff --git a/pkg/devel/fspec-sync/.gitignore b/pkg/pax/.gitignore diff --git a/pkg/arch/pax/gen.lua b/pkg/pax/gen.lua diff --git a/pkg/pax/src b/pkg/pax/src @@ -0,0 +1 @@ +Subproject commit e5f599fd61cdf650bd3f4726b28200f5fcaefd9c diff --git a/pkg/arch/pax/ver b/pkg/pax/ver diff --git a/pkg/libs/pcre/.gitignore b/pkg/pcre/.gitignore diff --git a/pkg/libs/pcre/README.md b/pkg/pcre/README.md diff --git a/pkg/libs/pcre/config.h b/pkg/pcre/config.h diff --git a/pkg/libs/pcre/gen.lua b/pkg/pcre/gen.lua diff --git a/pkg/libs/pcre/sha256 b/pkg/pcre/sha256 diff --git a/pkg/libs/pcre/url b/pkg/pcre/url diff --git a/pkg/libs/pcre/ver b/pkg/pcre/ver diff --git a/pkg/pigz/gen.lua b/pkg/pigz/gen.lua @@ -0,0 +1,18 @@ +cflags({ + '-Wall', '-Wextra', '-Wno-clobbered', '-Wno-stringop-overflow', + '-D NOZOPFLI', + '-isystem $builddir/pkg/zlib/include', +}) + +exe('pigz', [[ + pigz.c yarn.c try.c + $builddir/pkg/zlib/libz.a +]], {'pkg/zlib/headers'}) +file('bin/pigz', '755', '$outdir/pigz') +man({'pigz.1'}) +for _, alias in ipairs({'gzip', 'gunzip', 'zcat'}) do + sym('bin/'..alias, 'pigz') + sym('share/man/man1/'..alias..'.1', 'pigz.1') +end + +fetch('git') diff --git a/pkg/pigz/src b/pkg/pigz/src @@ -0,0 +1 @@ +Subproject commit fe4894f57739e3039a2ffc2a2a360d35e19bacbe diff --git a/pkg/arch/pigz/ver b/pkg/pigz/ver diff --git a/pkg/admin/pwgen/gen.lua b/pkg/pwgen/gen.lua diff --git a/pkg/pwgen/src b/pkg/pwgen/src @@ -0,0 +1 @@ +Subproject commit c25787fce93b2c99efd87219585c0531e80b6d1c diff --git a/pkg/admin/pwgen/ver b/pkg/pwgen/ver diff --git a/pkg/devel/qbe/config.h b/pkg/qbe/config.h diff --git a/pkg/devel/qbe/gen.lua b/pkg/qbe/gen.lua diff --git a/pkg/devel/qbe/patch/0001-Fix-aliasing-violation.patch b/pkg/qbe/patch/0001-Fix-aliasing-violation.patch diff --git a/pkg/qbe/src b/pkg/qbe/src @@ -0,0 +1 @@ +Subproject commit 8ff06515526c97628b47d8223b73d5376287a9b4 diff --git a/pkg/devel/qbe/ver b/pkg/qbe/ver diff --git a/pkg/lang/rc/gen.lua b/pkg/rc/gen.lua diff --git a/pkg/lang/rc/patch/0001-Avoid-multiple-definitions-of-global-variables.patch b/pkg/rc/patch/0001-Avoid-multiple-definitions-of-global-variables.patch diff --git a/pkg/lang/rc/patch/0002-Use-proc-self-fd-0-instead-of-dev-fd-0.patch b/pkg/rc/patch/0002-Use-proc-self-fd-0-instead-of-dev-fd-0.patch diff --git a/pkg/lang/rc/patch/0003-Use-complete-function-prototype-to-fix-build-with-C2.patch b/pkg/rc/patch/0003-Use-complete-function-prototype-to-fix-build-with-C2.patch diff --git a/pkg/rc/src b/pkg/rc/src @@ -0,0 +1 @@ +Subproject commit 50b729e65d6f250ab9ab72487bd3c3d7c674e1fc diff --git a/pkg/lang/rc/ver b/pkg/rc/ver diff --git a/pkg/devel/samurai/gen.lua b/pkg/samurai/gen.lua diff --git a/pkg/samurai/src b/pkg/samurai/src @@ -0,0 +1 @@ +Subproject commit 4288e71812493cb21b54ef23642a13214f44885f diff --git a/pkg/devel/samurai/ver b/pkg/samurai/ver diff --git a/pkg/sys/sbase/egrep b/pkg/sbase/egrep diff --git a/pkg/sys/sbase/gen.lua b/pkg/sbase/gen.lua diff --git a/pkg/sbase/src b/pkg/sbase/src @@ -0,0 +1 @@ +Subproject commit c1341583c96307cb0e6152c963ed23c4d56a4278 diff --git a/pkg/sys/sbase/ver b/pkg/sbase/ver diff --git a/pkg/sfeed/gen.lua b/pkg/sfeed/gen.lua @@ -0,0 +1,44 @@ +cflags{ + '-std=c99', '-Wall', '-Wpedantic', + '-D _XOPEN_SOURCE=700', + [[-D 'SFEED_THEME="themes/mono.h"']], + '-isystem $builddir/pkg/netbsd-curses/include', +} + +lib('libutil.a', {'util.c', 'xml.c'}) + +local tools = { + 'sfeed', + 'sfeed_opml_import', + 'sfeed_plain', + 'sfeed_web', + 'sfeed_xmlenc', +} +for _, tool in ipairs(tools) do + exe(tool, {tool..'.c', 'libutil.a'}) + file('bin/'..tool, '755', '$outdir/'..tool) + man({tool..'.1'}) +end + +exe('sfeed_curses', { + 'sfeed_curses.c', + 'libutil.a', + '$builddir/pkg/netbsd-curses/libcurses.a.d', +}, 'pkg/netbsd-curses/headers') +file('bin/sfeed_curses', '755', '$outdir/sfeed_curses') +man({'sfeed_curses.1'}) + +local scripts = { + 'sfeed_content', + 'sfeed_markread', + 'sfeed_opml_export', + 'sfeed_update', +} +for _, script in ipairs(scripts) do + file('bin/'..script, '755', '$srcdir/'..script) + man({script..'.1'}) +end + +man({'sfeedrc.5'}) + +fetch('git') diff --git a/pkg/sfeed/src b/pkg/sfeed/src @@ -0,0 +1 @@ +Subproject commit 66c4192ad01bc01c65491f30f746cce00a5dab8d diff --git a/pkg/net/sfeed/ver b/pkg/sfeed/ver diff --git a/pkg/admin/skeleton/applyperms.c b/pkg/skeleton/applyperms.c diff --git a/pkg/admin/skeleton/gen.lua b/pkg/skeleton/gen.lua diff --git a/pkg/admin/skeleton/mergeperms.c b/pkg/skeleton/mergeperms.c diff --git a/pkg/admin/spm/gen.lua b/pkg/spm/gen.lua diff --git a/pkg/spm/src b/pkg/spm/src @@ -0,0 +1 @@ +Subproject commit 9fb6b1172b51490570ffa6a010c59253cffe556e diff --git a/pkg/admin/spm/ver b/pkg/spm/ver diff --git a/pkg/stagit/gen.lua b/pkg/stagit/gen.lua @@ -0,0 +1,29 @@ +cflags({ + '-std=c99', '-Wall', '-Wpedantic', + '-D _XOPEN_SOURCE=700', + '-isystem $builddir/pkg/libgit2/include', +}) + +pkg.deps = {'pkg/libgit2/headers'} + +lib('libcompat.a', {'strlcat.c', 'strlcpy.c', 'reallocarray.c'}) + +for _, tool in ipairs({'stagit', 'stagit-index'}) do + exe(tool, {tool..'.c', 'libcompat.a', '$builddir/pkg/libgit2/libgit2.a.d'}) + file('bin/'..tool, '755', '$outdir/'..tool) + man({tool..'.1'}) +end + +local examples = { + 'example_create.sh', + 'example_post-receive.sh', + 'favicon.png', + 'logo.png', + 'style.css' +} + +for _, ex in ipairs(examples) do + file('share/stagit/'..ex, '644', '$srcdir/'..ex) +end + +fetch('git') diff --git a/pkg/stagit/src b/pkg/stagit/src @@ -0,0 +1 @@ +Subproject commit 02c00248d8134c69758557a78e3c632ac77ae687 diff --git a/pkg/www/stagit/ver b/pkg/stagit/ver diff --git a/pkg/devel/strace/.gitignore b/pkg/strace/.gitignore diff --git a/pkg/devel/strace/README.md b/pkg/strace/README.md diff --git a/pkg/devel/strace/config.h b/pkg/strace/config.h diff --git a/pkg/strace/gen.lua b/pkg/strace/gen.lua @@ -0,0 +1,410 @@ +cflags({ + '-D HAVE_CONFIG_H', + '-D IN_STRACE', + -- it is important that the arch-specific directory is searched first + '-I $srcdir/src/linux/x86_64', + '-I $srcdir/src/linux/generic', + '-I $srcdir/src', + '-I $outdir', + '-isystem $builddir/pkg/linux-headers/include', +}) + +build('cat', '$outdir/config.h', { + '$builddir/probe/HAVE___BUILTIN_POPCOUNT', + '$dir/config.h', +}) + +build('cpp', '$outdir/ioctl_iocdef.i', '$srcdir/src/ioctl_iocdef.c') +build('sed', '$outdir/ioctl_iocdef.h', '$outdir/ioctl_iocdef.i', { + expr=[[-n 's/^DEFINE HOST/#define /p']], +}) + +sub('tools.ninja', function() + toolchain(config.host) + cflags({ + '-D X86_64=1', + '-I $srcdir/src/linux/x86_64', + '-I $srcdir/src/linux', + '-I $outdir', + }) + + for i = 0, 2 do + build('cat', '$outdir/ioctls_all'..i..'.h', { + '$srcdir/src/linux/x86_64/ioctls_inc'..i..'.h', + '$srcdir/src/linux/x86_64/ioctls_arch'..i..'.h', + }) + build('cc', '$outdir/ioctlsort'..i..'.c.o', { + '$srcdir/src/ioctlsort.c', + '|', '$outdir/ioctl_iocdef.h', '$srcdir/ioctls_zfs.h', '$outdir/ioctls_all'..i..'.h', + }, {cflags=string.format([[$cflags -D 'IOCTLSORT_INC="ioctls_all%d.h"']], i)}) + exe('ioctlsort'..i, {'ioctlsort'..i..'.c.o'}) + rule('ioctlsort'..i, '$outdir/ioctlsort'..i..' >$out') + build('ioctlsort'..i, '$outdir/ioctlent'..i..'.h', {'|', '$outdir/ioctlsort'..i}) + end +end) + +local mpers = lines('mpers.txt') +for _, f in ipairs(mpers) do + build('cpp', '$outdir/'..f..'.mpers.i', {'$srcdir/src/'..f, '|', '$outdir/config.h'}, { + cflags='$cflags -DIN_MPERS_BOOTSTRAP', + }) +end + +local function makempers(name, script) + build('awk', '$outdir/'..name, {expand{'$outdir/', mpers, '.mpers.i'}, '|', '$dir/'..script}, { + expr='-f $dir/'..script, + }) +end + +makempers('printers.h', 'printers.awk') +makempers('native_printer_decls.h', 'printerdecls.awk') +makempers('native_printer_defs.h', 'printerdefs.awk') + +build('cpp', '$outdir/syscallent.i', '$srcdir/src/linux/x86_64/syscallent.h') +build('awk', '$outdir/scno-syscallent.h', {'$outdir/syscallent.i', '|', '$dir/scno.awk'}, { + expr='-f $dir/scno.awk', +}) +build('cat', '$outdir/scno.h', {'$srcdir/src/scno.head', '$outdir/scno-syscallent.h'}) + +-- this seems to be enough syscall headers to build +local syscalls = expand{'$srcdir/src/linux/', { + '32/syscallent.h', + '64/syscallent.h', + 'arm/syscallent.h', + 'i386/syscallent.h', + 'sparc/syscallent.h', + 'sparc64/syscallent.h', + 'generic/subcallent.h', + 'generic/syscallent-common.h', + 'x86_64/syscallent.h', +}} +build('awk', '$outdir/sen.h', {syscalls, '|', '$dir/sen.awk'}, { + expr='-f $dir/sen.awk', +}) + +local srcs = paths[[src/( + access.c + affinity.c + aio.c + alarm.c + alpha.c + basic_filters.c + bind.c + bjm.c + block.c + bpf.c + bpf_filter.c + bpf_seccomp_filter.c + bpf_sock_filter.c + btrfs.c + cacheflush.c + cachestat.c + capability.c + chdir.c + chmod.c + clone.c + close_range.c + copy_file_range.c + count.c + counter_ioctl.c + delay.c + desc.c + dirent.c + dirent64.c + dirent_types.c + dm.c + dup.c + dyxlat.c + epoll.c + epoll_ioctl.c + error_prints.c + evdev.c + evdev_mpers.c + eventfd.c + execve.c + exit.c + exitkill.c + fadvise.c + fallocate.c + fanotify.c + fchownat.c + fcntl.c + fetch_bpf_fprog.c + fetch_indirect_syscall_args.c + fetch_struct_flock.c + fetch_struct_iovec.c + fetch_struct_keyctl_kdf_params.c + fetch_struct_mmsghdr.c + fetch_struct_msghdr.c + fetch_struct_stat.c + fetch_struct_stat64.c + fetch_struct_statfs.c + fetch_struct_xfs_quotastat.c + file_attr.c + file_handle.c + filter_qualify.c + filter_seccomp.c + flock.c + fs_0x15_ioctl.c + fs_0x94_ioctl.c + fs_f_ioctl.c + fs_x_ioctl.c + fsconfig.c + fsmount.c + fsopen.c + fspick.c + fstatfs.c + fstatfs64.c + futex.c + futex2.c + gen/gen_hdio.c + get_personality.c + get_robust_list.c + getcpu.c + getcwd.c + getpagesize.c + getpid.c + getrandom.c + gpio_ioctl.c + hdio.c + hostname.c + inotify.c + inotify_ioctl.c + io.c + io_uring.c + ioctl.c + ioperm.c + iopl.c + ioprio.c + ipc.c + ipc_msg.c + ipc_msgctl.c + ipc_sem.c + ipc_semctl.c + ipc_shm.c + ipc_shmctl.c + kcmp.c + kd_ioctl.c + kd_mpers_ioctl.c + kexec.c + keyctl.c + kvm.c + landlock.c + ldt.c + link.c + lirc_ioctl.c + listen.c + listmount.c + listns.c + lookup_dcookie.c + loop.c + lseek.c + lsm.c + map_shadow_stack.c + mem.c + membarrier.c + memfd_create.c + memfd_secret.c + mknod.c + mmap_cache.c + mmap_notify.c + mmsghdr.c + mount.c + mount_setattr.c + move_mount.c + mq.c + msghdr.c + mtd.c + nbd_ioctl.c + net.c + netlink.c + netlink_crypto.c + netlink_generic.c + netlink_inet_diag.c + netlink_kobject_uevent.c + netlink_netfilter.c + netlink_netlink_diag.c + netlink_nlctrl.c + netlink_packet_diag.c + netlink_route.c + netlink_selinux.c + netlink_smc_diag.c + netlink_sock_diag.c + netlink_unix_diag.c + nice.c + nlattr.c + nsfs.c + numa.c + number_set.c + oldstat.c + open.c + or1k_atomic.c + pathtrace.c + perf.c + perf_ioctl.c + personality.c + pidfd_getfd.c + pidfd_open.c + pidns.c + pkeys.c + poke.c + poll.c + prctl.c + print_dev_t.c + print_group_req.c + print_ifindex.c + print_instruction_pointer.c + print_kernel_sigset.c + print_kernel_version.c + print_mac.c + print_mq_attr.c + print_msgbuf.c + print_sg_req_info.c + print_sigevent.c + print_statfs.c + print_struct_stat.c + print_syscall_number.c + print_time.c + print_timespec32.c + print_timespec64.c + print_timeval.c + print_timeval64.c + print_timex.c + printmode.c + printrusage.c + printsiginfo.c + process_vm.c + ptp.c + ptrace.c + ptrace_syscall_info.c + quota.c + random_ioctl.c + readahead.c + readlink.c + reboot.c + regset.c + renameat.c + resource.c + retval.c + riscv.c + rt_sigframe.c + rt_sigreturn.c + rtc.c + rtnl_addr.c + rtnl_addrlabel.c + rtnl_cachereport.c + rtnl_dcb.c + rtnl_link.c + rtnl_mdb.c + rtnl_neigh.c + rtnl_neightbl.c + rtnl_netconf.c + rtnl_nh.c + rtnl_nsid.c + rtnl_route.c + rtnl_rule.c + rtnl_stats.c + rtnl_tc.c + rtnl_tc_action.c + s390.c + sched.c + scsi.c + seccomp.c + seccomp_ioctl.c + sendfile.c + set_tid_address.c + sg_io_v3.c + sg_io_v4.c + shutdown.c + sigaltstack.c + signal.c + signalfd.c + sigreturn.c + sock.c + sockaddr.c + socketcall.c + socketutils.c + sparc.c + sram_alloc.c + stage_output.c + stat.c + stat64.c + statfs.c + statfs64.c + statmount.c + statx.c + strauss.c + string_to_uint.c + swapon.c + sync_file_range.c + sync_file_range2.c + syscall.c + syscall_name.c + sysctl.c + sysinfo.c + syslog.c + sysmips.c + tee.c + term.c + time.c + times.c + trie.c + truncate.c + ubi.c + ucopy.c + uid.c + uid16.c + umask.c + umount.c + uname.c + upeek.c + upoke.c + userfaultfd.c + ustat.c + util.c + utime.c + utimes.c + v4l2.c + wait.c + watchdog_ioctl.c + xattr.c + xgetdents.c + xlat.c + xmalloc.c +)]] + +build('sed', '$outdir/sys_func.h', expand{'$srcdir/', srcs}, { + expr=[[-n 's/^SYS_FUNC(.*/extern &;/p']], +}) + +pkg.deps = { + '$outdir/config.h', + '$outdir/ioctlent0.h', + '$outdir/ioctlent1.h', + '$outdir/ioctlent2.h', + '$outdir/native_printer_decls.h', + '$outdir/native_printer_defs.h', + '$outdir/printers.h', + '$outdir/scno.h', + '$outdir/sen.h', + '$outdir/sys_func.h', + 'pkg/linux-headers/headers', +} + +lib('libstrace.a', srcs) +exe('strace', {'src/strace.c', 'libstrace.a'}) +file('bin/strace', '755', '$outdir/strace') + +build('sed', '$outdir/strace.1', '$srcdir/doc/strace.1.in', { + expr={ + [[-e 's,@STRACE_MANPAGE_DATE@,2025-11-13,']], + [[-e 's,@VERSION@,6.19,']], + [[-e 's,@ENABLE_STACKTRACE_TRUE@,#,']], + [[-e 's,@ENABLE_STACKTRACE_FALSE@,,']], + [[-e 's,@ENABLE_SECONTEXT_TRUE@,#,']], + [[-e 's,@ENABLE_SECONTEXT_FALSE@,,']], + }, +}) +man({'$outdir/strace.1'}) + +fetch('curl') diff --git a/pkg/devel/strace/mpers.txt b/pkg/strace/mpers.txt diff --git a/pkg/devel/strace/patch/0001-Don-t-return-expression-in-void-function.patch b/pkg/strace/patch/0001-Don-t-return-expression-in-void-function.patch diff --git a/pkg/devel/strace/patch/0002-Avoid-pointer-arithmetic-on-void.patch b/pkg/strace/patch/0002-Avoid-pointer-arithmetic-on-void.patch diff --git a/pkg/devel/strace/patch/0003-Avoid-empty-struct-definition.patch b/pkg/strace/patch/0003-Avoid-empty-struct-definition.patch diff --git a/pkg/devel/strace/patch/0004-Don-t-omit-second-operand-to-operator.patch b/pkg/strace/patch/0004-Don-t-omit-second-operand-to-operator.patch diff --git a/pkg/devel/strace/patch/0005-Avoid-unnecessary-VLAs.patch b/pkg/strace/patch/0005-Avoid-unnecessary-VLAs.patch diff --git a/pkg/devel/strace/patch/0006-Avoid-index-ranges-and-empty-initializer-lists-in-sy.patch b/pkg/strace/patch/0006-Avoid-index-ranges-and-empty-initializer-lists-in-sy.patch diff --git a/pkg/devel/strace/patch/0007-Use-alloca-when-VLAs-aren-t-available.patch b/pkg/strace/patch/0007-Use-alloca-when-VLAs-aren-t-available.patch diff --git a/pkg/devel/strace/patch/0008-Avoid-index-ranges.patch b/pkg/strace/patch/0008-Avoid-index-ranges.patch diff --git a/pkg/devel/strace/patch/0009-Use-ISO-C-alignment-and-attribute-syntax.patch b/pkg/strace/patch/0009-Use-ISO-C-alignment-and-attribute-syntax.patch diff --git a/pkg/devel/strace/patch/1001-Prevent-zero-sized-arrays.patch b/pkg/strace/patch/1001-Prevent-zero-sized-arrays.patch diff --git a/pkg/devel/strace/printerdecls.awk b/pkg/strace/printerdecls.awk diff --git a/pkg/devel/strace/printerdefs.awk b/pkg/strace/printerdefs.awk diff --git a/pkg/devel/strace/printers.awk b/pkg/strace/printers.awk diff --git a/pkg/devel/strace/scno.awk b/pkg/strace/scno.awk diff --git a/pkg/devel/strace/sen.awk b/pkg/strace/sen.awk diff --git a/pkg/devel/strace/sha256 b/pkg/strace/sha256 diff --git a/pkg/devel/strace/url b/pkg/strace/url diff --git a/pkg/devel/strace/ver b/pkg/strace/ver diff --git a/pkg/sys/gen.lua b/pkg/sys/gen.lua @@ -1,4 +0,0 @@ -subgen('less') -subgen('mandoc') -subgen('openbsd') -subgen('sbase') diff --git a/pkg/sys/less/gen.lua b/pkg/sys/less/gen.lua @@ -1,37 +0,0 @@ -cflags({ - '-std=c99', '-Wall', '-Wpedantic', '-Wno-maybe-uninitialized', - '-D _XOPEN_SOURCE=700', - '-I $dir', - '-isystem $builddir/pkg/libs/netbsd-curses/include', -}) - -objects([[ - lesskey_parse.c - version.c - xbuf.c -]]) - -exe('less', [[ - main.c screen.c brac.c ch.c charset.c cmdbuf.c - command.c cvt.c decode.c edit.c filename.c forwback.c - help.c ifile.c input.c jump.c - line.c linenum.c - lsystem.c mark.c optfunc.c option.c opttbl.c os.c - output.c pattern.c position.c prompt.c search.c signal.c - tags.c ttyin.c version.c.o xbuf.c.o - lesskey_parse.c.o - $builddir/pkg/libs/netbsd-curses/libcurses.a.d -]], {'pkg/libs/netbsd-curses/headers'}) -file('bin/less', '755', '$outdir/less') - -exe('lessecho', {'lessecho.c', 'version.c.o'}) -file('bin/lessecho', '755', '$outdir/lessecho') - -exe('lesskey', {'lesskey.c', 'lesskey_parse.c.o', 'xbuf.c.o', 'version.c.o'}) -file('bin/lesskey', '755', '$outdir/lesskey') - -man({'less.nro', 'lessecho.nro', 'lesskey.nro'}, '1') - -sym('bin/more', 'less') - -fetch('curl') diff --git a/pkg/sys/mandoc/gen.lua b/pkg/sys/mandoc/gen.lua @@ -1,118 +0,0 @@ -cflags({ - '-I $dir', - '-isystem $basedir/pkg/sys/openbsd/include', - '-isystem $builddir/pkg/libs/zlib/include', -}) - -lib('libmandoc.a', { - 'man.c', - 'man_macro.c', - 'man_validate.c', - - 'arch.c', - 'att.c', - 'lib.c', - 'mdoc.c', - 'mdoc_argv.c', - 'mdoc_macro.c', - 'mdoc_state.c', - 'mdoc_validate.c', - 'st.c', - - 'eqn.c', - 'roff.c', - 'roff_validate.c', - 'tbl.c', - 'tbl_data.c', - 'tbl_layout.c', - 'tbl_opts.c', - - 'chars.c', - 'mandoc.c', - 'mandoc_aux.c', - 'mandoc_msg.c', - 'mandoc_ohash.c', - 'mandoc_xr.c', - 'msec.c', - 'preconv.c', - 'read.c', - 'tag.c', - - 'compat_fts.c', - 'compat_ohash.c', -}, {'pkg/libs/zlib/headers'}) - -exe('mandoc', { - 'main.c', - 'manpath.c', - 'mdoc_man.c', - 'mdoc_markdown.c', - 'out.c', - 'tree.c', - - 'eqn_html.c', - 'html.c', - 'man_html.c', - 'mdoc_html.c', - 'roff_html.c', - 'tbl_html.c', - - 'eqn_term.c', - 'man_term.c', - 'mdoc_term.c', - 'roff_term.c', - 'term.c', - 'term_ascii.c', - 'term_ps.c', - 'term_tab.c', - 'term_tag.c', - 'tbl_term.c', - - 'dbm.c', - 'dbm_map.c', - 'mansearch.c', - - 'dba.c', - 'dba_array.c', - 'dba_read.c', - 'dba_write.c', - 'mandocdb.c', - - 'libmandoc.a', - '$builddir/pkg/sys/openbsd/libbsd.a', - '$builddir/pkg/libs/zlib/libz.a', -}) -file('bin/mandoc', '755', '$outdir/mandoc') -for _, cmd in ipairs{'apropos', 'man', 'whatis', 'makewhatis'} do - sym('bin/'..cmd, 'mandoc') -end - -exe('demandoc', { - 'demandoc.c', - 'libmandoc.a', - '$builddir/pkg/sys/openbsd/libbsd.a', - '$builddir/pkg/libs/zlib/libz.a', -}) -file('bin/demandoc', '755', '$outdir/demandoc') - -man({ - 'mandoc.1', - 'demandoc.1', - 'man.1', - 'apropos.1', - - 'man.conf.5', - 'mandoc.db.5', - - 'man.7', - 'mdoc.7', - 'roff.7', - 'eqn.7', - 'tbl.7', - 'mandoc_char.7', - - 'makewhatis.8', -}) -sym('share/man/man1/whatis.1', 'apropos.1') - -fetch('curl') diff --git a/pkg/sys/openbsd/gen.lua b/pkg/sys/openbsd/gen.lua @@ -1,110 +0,0 @@ -cflags({ - '-std=gnu17', - '-Wall', '-Wno-pointer-sign', '-Wno-maybe-uninitialized', '-Wno-attributes', - [[-D 'DEF_WEAK(n)=_Static_assert(1, "")']], - '-I $dir/include', - '-I $outdir/include', -}) - -pkg.hdrs = { - copy('$outdir/include', '$srcdir/sys', {'sys/queue.h', 'sys/tree.h', 'sys/_null.h'}), - copy('$outdir/include', '$srcdir/include', {'fts.h', 'vis.h'}), - copy('$outdir/include', '$srcdir/lib/libutil', {'ohash.h'}), -} -pkg.deps = {'$gendir/headers'} - --- Link arc4random.c to '$outdir' so that it doesn't include the local --- arc4random.h -build('copy', '$outdir/lib/libc/crypt/arc4random.c', '$srcdir/lib/libc/crypt/arc4random.c') -build('copy', '$outdir/lib/libc/crypt/arc4random.h', '$srcdir/lib/libcrypto/arc4random/arc4random_linux.h') -build('copy', '$outdir/lib/libc/crypt/chacha_private.h', '$srcdir/lib/libc/crypt/chacha_private.h') -cc('$outdir/lib/libc/crypt/arc4random.c', { - '$outdir/lib/libc/crypt/arc4random.h', - '$outdir/lib/libc/crypt/chacha_private.h', -}) - -lib('libbsd.a', [[ - lib/libc/( - crypt/(arc4random.c.o arc4random_uniform.c) - gen/(fts.c getprogname.c pwcache.c readpassphrase.c setprogname.c unvis.c vis.c warnc.c vwarnc.c) - net/base64.c - stdlib/(freezero.c recallocarray.c strtonum.c) - string/(strmode.c timingsafe_bcmp.c timingsafe_memcmp.c) - ) - lib/libutil/(fmt_scaled.c ohash.c) -]]) -file('lib/libbsd.a', '644', '$outdir/libbsd.a') - --- diff -exe('diff', 'usr.bin/diff/(diff.c diffdir.c diffreg.c xmalloc.c) libbsd.a') -file('bin/diff', '755', '$outdir/diff') -man({'usr.bin/diff/diff.1'}) - --- doas -yacc('usr.bin/doas/parse', 'usr.bin/doas/parse.y') -cc('$outdir/usr.bin/doas/parse.tab.c', nil, {cflags='$cflags -I $srcdir/usr.bin/doas'}) -cc('usr.bin/doas/doas.c', nil, {cflags='$cflags -D _GNU_SOURCE'}) -exe('doas', 'usr.bin/doas/(doas.c.o env.c parse.tab.c.o persist.c) libbsd.a') -file('bin/doas', '6755', '$outdir/doas') -man({'usr.bin/doas/doas.1', 'usr.bin/doas/doas.conf.5'}) - --- fmt -file('bin/fmt', '755', exe('fmt', {'usr.bin/fmt/fmt.c', 'libbsd.a'})) -man({'usr.bin/fmt/fmt.1'}) - --- nc -sub('nc.ninja', function() - cflags({'-isystem $builddir/pkg/libs/libtls-bearssl/include'}) - exe('nc', [[ - usr.bin/nc/(netcat.c atomicio.c socks.c) - $builddir/pkg/libs/libtls-bearssl/libtls.a.d - libbsd.a - ]], {'pkg/libs/libtls-bearssl/headers'}) - file('bin/nc', '755', '$outdir/nc') - man({'usr.bin/nc/nc.1'}) -end) - --- m4 -yacc('usr.bin/m4/parser', 'usr.bin/m4/parser.y') -cc('usr.bin/m4/tokenizer.c', {'$outdir/usr.bin/m4/parser.tab.h'}, {cflags='$cflags -I $outdir/usr.bin/m4'}) -exe('m4', [[ - usr.bin/m4/(eval.c expr.c look.c main.c misc.c gnum4.c trace.c tokenizer.c.o) - $outdir/usr.bin/m4/parser.tab.c - libbsd.a -]]) -file('bin/m4', '755', '$outdir/m4') -man({'usr.bin/m4/m4.1'}) - --- patch -exe('patch', 'usr.bin/patch/(patch.c pch.c inp.c util.c backupfile.c mkpath.c ed.c) libbsd.a') -file('bin/patch', '755', '$outdir/patch') -man({'usr.bin/patch/patch.1'}) - --- pax -exe('pax', [[bin/pax/( - ar_io.c ar_subs.c buf_subs.c cpio.c file_subs.c ftree.c - gen_subs.c getoldopt.c options.c pat_rep.c pax.c sel_subs.c tables.c - tar.c tty_subs.c -) libbsd.a]]) -file('bin/tar', '755', '$outdir/pax') -sym('bin/cpio', 'tar') -man({'bin/pax/tar.1', 'bin/pax/cpio.1'}) - --- rsync -exe('rsync', [[ - usr.bin/rsync/( - blocks.c client.c copy.c downloader.c fargs.c flist.c hash.c ids.c - io.c log.c main.c md4.c misc.c mkpath.c mktemp.c receiver.c rmatch.c - rules.c sender.c server.c session.c socket.c symlinks.c uploader.c - ) - libbsd.a -]]) -file('bin/rsync', '755', '$outdir/rsync') -man({'usr.bin/rsync/rsync.1', 'usr.bin/rsync/rsync.5', 'usr.bin/rsync/rsyncd.5'}) - --- xargs -exe('xargs', [[usr.bin/xargs/(xargs.c strnsubst.c) libbsd.a]]) -file('bin/xargs', '755', '$outdir/xargs') -man({'usr.bin/xargs/xargs.1'}) - -fetch('local') diff --git a/pkg/sys/sbase/src b/pkg/sys/sbase/src @@ -1 +0,0 @@ -Subproject commit c1341583c96307cb0e6152c963ed23c4d56a4278 diff --git a/pkg/textproc/gen.lua b/pkg/textproc/gen.lua @@ -1 +0,0 @@ -subgen('md4c') diff --git a/pkg/textproc/md4c/src b/pkg/textproc/md4c/src @@ -1 +0,0 @@ -Subproject commit 729e6b8b320caa96328968ab27d7db2235e4fb47 diff --git a/pkg/devel/the_silver_searcher/config.h b/pkg/the_silver_searcher/config.h diff --git a/pkg/the_silver_searcher/gen.lua b/pkg/the_silver_searcher/gen.lua @@ -0,0 +1,24 @@ +cflags{ + '-D _GNU_SOURCE', + '-I $dir', + '-isystem $builddir/pkg/pcre/include', + '-isystem $builddir/pkg/zlib/include', +} + +pkg.deps = { + 'pkg/pcre/headers', + 'pkg/zlib/headers', +} + +exe('ag', [[ + src/( + ignore.c log.c options.c print.c print_w32.c scandir.c search.c lang.c + util.c decompress.c main.c + ) + $builddir/pkg/pcre/libpcre.a + $builddir/pkg/zlib/libz.a +]]) +file('bin/ag', '755', '$outdir/ag') +man({'doc/ag.1'}) + +fetch('git') diff --git a/pkg/devel/the_silver_searcher/patch/0001-Remove-after-function-definition.patch b/pkg/the_silver_searcher/patch/0001-Remove-after-function-definition.patch diff --git a/pkg/devel/the_silver_searcher/patch/0002-Use-inline-function-for-min-instead-of-statement-exp.patch b/pkg/the_silver_searcher/patch/0002-Use-inline-function-for-min-instead-of-statement-exp.patch diff --git a/pkg/devel/the_silver_searcher/patch/0003-Prevent-duplicate-definitions-of-global-variables.patch b/pkg/the_silver_searcher/patch/0003-Prevent-duplicate-definitions-of-global-variables.patch diff --git a/pkg/the_silver_searcher/src b/pkg/the_silver_searcher/src @@ -0,0 +1 @@ +Subproject commit 520ff29c528503668020c8cbedb5b03bccf4c7e0 diff --git a/pkg/devel/the_silver_searcher/ver b/pkg/the_silver_searcher/ver diff --git a/pkg/net/transmission/.gitignore b/pkg/transmission/.gitignore diff --git a/pkg/net/transmission/README.md b/pkg/transmission/README.md diff --git a/pkg/net/transmission/config.h b/pkg/transmission/config.h diff --git a/pkg/transmission/gen.lua b/pkg/transmission/gen.lua @@ -0,0 +1,156 @@ +sub('libnatpmp.ninja', function() + cflags{'-D ENABLE_STRNATPMPERR'} + lib('libnatpmp.a', 'third-party/libnatpmp/(getgateway.c natpmp.c wingettimeofday.c)') +end) +sub('libminiupnp.ninja', function() + cflags{ + '-D _GNU_SOURCE', + '-I $outdir/miniupnpc', + '-isystem $outdir/pkg/openbsd/include', + } + + build('sed', '$outdir/miniupnpc/miniupnpcstrings.h', '$srcdir/third-party/miniupnpc/miniupnpcstrings.h.in', { + expr='-e s,OS/version,Linux, -e s,version,,', + }) + + lib('libminiupnp.a', [[ + third-party/miniupnpc/( + connecthostport.c + igd_desc_parse.c + minisoap.c + minissdpc.c + miniupnpc.c + miniwget.c + minixml.c + portlistingparse.c + receivedata.c + upnpcommands.c + upnpdev.c + upnperrors.c + upnpreplyparse.c + ) + ]], {'$outdir/miniupnpc/miniupnpcstrings.h', 'pkg/openbsd/headers'}) +end) + +cflags({ + '-D __TRANSMISSION__', + '-I $dir', + '-I $srcdir', + '-isystem $builddir/pkg/bearssl/include', + '-isystem $builddir/pkg/curl/include', + '-isystem $builddir/pkg/libevent/include', + '-isystem $builddir/pkg/libutp/include', + '-isystem $builddir/pkg/openbsd/include', + '-isystem $builddir/pkg/zlib/include', + '-isystem $srcdir/third-party', + '-isystem $srcdir/third-party/libb64/include', + '-isystem $srcdir/third-party/libnatpmp', + '-include config.h', +}) + +pkg.deps = { + 'pkg/bearssl/headers', + 'pkg/curl/headers', + 'pkg/libevent/headers', + 'pkg/libutp/headers', + 'pkg/openbsd/headers', + 'pkg/zlib/headers', +} + +lib('libtransmission.a', [[ + libtransmission/( + announcer.c + announcer-http.c + announcer-udp.c + bandwidth.c + bitfield.c + blocklist.c + cache.c + clients.c + completion.c + ConvertUTF.c + crypto.c + crypto-utils.c + crypto-utils-fallback.c + error.c + fdlimit.c + file.c + handshake.c + history.c + inout.c + list.c + log.c + magnet.c + makemeta.c + metainfo.c + natpmp.c + net.c + peer-io.c + peer-mgr.c + peer-msgs.c + platform.c + platform-quota.c + port-forwarding.c + ptrarray.c + quark.c + resume.c + rpcimpl.c + rpc-server.c + session.c + session-id.c + stats.c + torrent.c + torrent-ctor.c + torrent-magnet.c + tr-assert.c + tr-dht.c + tr-lpd.c + tr-udp.c + tr-utp.c + tr-getopt.c + trevent.c + upnp.c + utils.c + variant.c + variant-benc.c + variant-json.c + verify.c + watchdir.c + watchdir-generic.c + web.c + webseed.c + wildmat.c + + watchdir-inotify.c + file-posix.c + subprocess-posix.c + crypto-utils-bearssl.c + ) + libb64.a libdht.a libminiupnp.a libnatpmp.a + $builddir/pkg/( + bearssl/libbearssl.a + curl/libcurl.a.d + libevent/libevent.a + libutp/libutp.a + zlib/libz.a + ) +]]) + +lib('libb64.a', {'third-party/libb64/src/cdecode.c', 'third-party/libb64/src/cencode.c'}) +lib('libdht.a', {'third-party/dht/dht.c'}) + +exe('transmission-daemon', { + 'daemon/daemon.c', + 'daemon/daemon-posix.c', + 'libtransmission.a.d', +}) +file('bin/transmission-daemon', '755', '$outdir/transmission-daemon') +man({'daemon/transmission-daemon.1'}) + +for _, tool in ipairs({'create', 'edit', 'remote', 'show'}) do + exe('transmission-'..tool, {'utils/'..tool..'.c', 'libtransmission.a.d'}) + file('bin/transmission-'..tool, '755', '$outdir/transmission-'..tool) + man({'utils/transmission-'..tool..'.1'}) +end + +fetch('curl') diff --git a/pkg/net/transmission/patch/0001-Use-BearSSL-for-SHA1-and-DH-add-fallback-RC4.patch b/pkg/transmission/patch/0001-Use-BearSSL-for-SHA1-and-DH-add-fallback-RC4.patch diff --git a/pkg/net/transmission/patch/0002-Choose-larger-pieces-for-larger-sizes.patch b/pkg/transmission/patch/0002-Choose-larger-pieces-for-larger-sizes.patch diff --git a/pkg/net/transmission/patch/0003-Fix-type-signature-of-utp_on_overhead.patch b/pkg/transmission/patch/0003-Fix-type-signature-of-utp_on_overhead.patch diff --git a/pkg/net/transmission/sha256 b/pkg/transmission/sha256 diff --git a/pkg/net/transmission/url b/pkg/transmission/url diff --git a/pkg/net/transmission/ver b/pkg/transmission/ver diff --git a/pkg/devel/u-config/gen.lua b/pkg/u-config/gen.lua diff --git a/pkg/u-config/src b/pkg/u-config/src @@ -0,0 +1 @@ +Subproject commit e57b719b709f9112b2570a914e5efef7faf0ff03 diff --git a/pkg/devel/u-config/ver b/pkg/u-config/ver diff --git a/pkg/vis/gen.lua b/pkg/vis/gen.lua @@ -0,0 +1,82 @@ +set('version', 'v0.9') +cflags({ + '-std=c99', + '-D CONFIG_HELP=1', + '-D CONFIG_CURSES=0', + '-D CONFIG_LUA=1', + '-D CONFIG_LPEG=1', + '-D CONFIG_TRE=0', + '-D CONFIG_SELINUX=0', + '-D CONFIG_ACL=0', + '-D HAVE_MEMRCHR=1', + '-D _XOPEN_SOURCE=700', + [[-D 'VERSION="$version"']], + string.format([[-D 'VIS_PATH="%s/share/vis"']], config.prefix), + '-D NDEBUG', + '-I $outdir', + '-isystem $builddir/pkg/libtermkey/include', + '-isystem $builddir/pkg/lua/include', +}) + +build('copy', '$outdir/config.h', '$srcdir/config.def.h') + +pkg.deps = { + '$outdir/config.h', + 'pkg/libtermkey/headers', + 'pkg/lua/headers', +} + +exe('vis', [[ + array.c + buffer.c + libutf.c + main.c + map.c + sam.c + text.c + text-common.c + text-io.c + text-iterator.c + text-motions.c + text-objects.c + text-util.c + ui-terminal.c + view.c + vis.c + vis-lua.c + vis-marks.c + vis-modes.c + vis-motions.c + vis-operators.c + vis-prompt.c + vis-registers.c + vis-subprocess.c + vis-text-objects.c + text-regex.c + $builddir/pkg/libtermkey/libtermkey.a.d + $builddir/pkg/lpeg/liblpeg.a + $builddir/pkg/lua/liblua.a +]]) + +exe('vis-digraph', {'vis-digraph.c'}) +exe('vis-menu', {'vis-menu.c'}) + +for _, b in ipairs({'vis', 'vis-digraph', 'vis-menu'}) do + file('bin/'..b, '755', '$outdir/'..b) + build('sed', '$outdir/'..b..'.1', '$srcdir/man/'..b..'.1', {expr='s,VERSION,$version,'}) + man({'$outdir/'..b.. '.1'}) +end + +for _, s in ipairs({'vis-complete', 'vis-clipboard', 'vis-open'}) do + file('bin/'..s, '755', '$srcdir/'..s) + build('sed', '$outdir/'..s..'.1', '$srcdir/man/'..s..'.1', {expr='s,VERSION,$version,'}) + man({'$outdir/'..s.. '.1'}) +end + +for f in iterlines('lua.txt') do + file('share/vis/'..f, '644', '$srcdir/lua/'..f) +end +sym('share/vis/lexer.lua', 'lexers/lexer.lua') +sym('share/vis/themes/default.lua', 'base-16.lua') + +fetch('git') diff --git a/pkg/editors/vis/lua.txt b/pkg/vis/lua.txt diff --git a/pkg/editors/vis/patch/0001-HACK-Avoid-wide-string-literals-for-now.patch b/pkg/vis/patch/0001-HACK-Avoid-wide-string-literals-for-now.patch diff --git a/pkg/vis/src b/pkg/vis/src @@ -0,0 +1 @@ +Subproject commit 438ee1a66ba71274b86acaa107958db28e20eed4 diff --git a/pkg/editors/vis/ver b/pkg/vis/ver diff --git a/pkg/www/gen.lua b/pkg/www/gen.lua @@ -1 +0,0 @@ -subgen('stagit') diff --git a/pkg/www/stagit/gen.lua b/pkg/www/stagit/gen.lua @@ -1,29 +0,0 @@ -cflags({ - '-std=c99', '-Wall', '-Wpedantic', - '-D _XOPEN_SOURCE=700', - '-isystem $builddir/pkg/libs/libgit2/include', -}) - -pkg.deps = {'pkg/libs/libgit2/headers'} - -lib('libcompat.a', {'strlcat.c', 'strlcpy.c', 'reallocarray.c'}) - -for _, tool in ipairs({'stagit', 'stagit-index'}) do - exe(tool, {tool..'.c', 'libcompat.a', '$builddir/pkg/libs/libgit2/libgit2.a.d'}) - file('bin/'..tool, '755', '$outdir/'..tool) - man({tool..'.1'}) -end - -local examples = { - 'example_create.sh', - 'example_post-receive.sh', - 'favicon.png', - 'logo.png', - 'style.css' -} - -for _, ex in ipairs(examples) do - file('share/stagit/'..ex, '644', '$srcdir/'..ex) -end - -fetch('git') diff --git a/pkg/www/stagit/src b/pkg/www/stagit/src @@ -1 +0,0 @@ -Subproject commit 02c00248d8134c69758557a78e3c632ac77ae687 diff --git a/pkg/libs/zlib/gen.lua b/pkg/zlib/gen.lua diff --git a/pkg/zlib/src b/pkg/zlib/src @@ -0,0 +1 @@ +Subproject commit 51b7f2abdade71cd9bb0e7a373ef2610ec6f9daf diff --git a/pkg/libs/zlib/ver b/pkg/zlib/ver diff --git a/pkg/arch/zstd/config.h b/pkg/zstd/config.h diff --git a/pkg/arch/zstd/gen.lua b/pkg/zstd/gen.lua diff --git a/pkg/arch/zstd/patch/0001-Only-use-__asm__-on-GNU-compatible-compilers.patch b/pkg/zstd/patch/0001-Only-use-__asm__-on-GNU-compatible-compilers.patch diff --git a/pkg/zstd/src b/pkg/zstd/src @@ -0,0 +1 @@ +Subproject commit f8745da6ff1ad1e7bab384bd1f9d742439278e99 diff --git a/pkg/arch/zstd/ver b/pkg/zstd/ver diff --git a/rules.ninja b/rules.ninja @@ -116,16 +116,16 @@ rule git-init command = git init $repo_flags $repo && touch $out rule fspec-hash - command = $builddir/pkg/devel/fspec-sync/host/fspec-hash <$in >$out + command = $builddir/pkg/fspec-sync/host/fspec-hash <$in >$out rule fspec-sort - command = $builddir/pkg/devel/fspec-sync/host/fspec-sort -p <$in >$out + command = $builddir/pkg/fspec-sync/host/fspec-sort -p <$in >$out rule fspec-tar - command = $builddir/pkg/devel/fspec-sync/host/fspec-tar <$in | zstd >$out + command = $builddir/pkg/fspec-sync/host/fspec-tar <$in | zstd >$out rule fetch - command = cd $basedir && PAX=$$OLDPWD/$builddir/pkg/arch/pax/host/pax sh $$OLDPWD/$script $gendir && touch $$OLDPWD/$out + command = cd $basedir && PAX=$$OLDPWD/$builddir/pkg/pax/host/pax sh $$OLDPWD/$script $gendir && touch $$OLDPWD/$out description = FETCH $gendir restat = 1 generator = 1 diff --git a/setup.lua b/setup.lua @@ -90,7 +90,7 @@ local function gen(gendir) else os.rename(tmp, out) end - build('fspec-hash', '$outdir/local-hashed.fspec', {'$outdir/local.fspec', '|', '$builddir/pkg/devel/fspec-sync/host/fspec-hash', srcs}) + build('fspec-hash', '$outdir/local-hashed.fspec', {'$outdir/local.fspec', '|', '$builddir/pkg/fspec-sync/host/fspec-hash', srcs}) table.insert(pkg.inputs.fspec, '$outdir/local-hashed.fspec') end if next(pkg.inputs.index) then