AOSC-Dev · CamberLoid · Jul 8, 2022 · Apr 3, 2022 · Apr 7, 2022 · Apr 7, 2022
diff --git a/extra-admin/gotop/autobuild/build b/extra-admin/gotop/autobuild/build
@@ -1,4 +1,20 @@
+abinfo "Enabling trimpath for a reproducible build ..."
+export GOFLAGS="${GOFLAGS} -trimpath"
+
+abinfo "Setting other GOFLAGS ..."
+export GOFLAGS="${GOFLAGS} -mod=readonly -modcacherw"
+
+if [[ "${CROSS:-$ARCH}" != "loongson3" ]]; then
+    abinfo "Enabling buildmode=pie ..."
+    export GOFLAGS="${GOFLAGS} -buildmode=pie"
+fi
+
 abinfo "Building gotop ..."
 go build \
+     -ldflags "-X main.Version=v${PKGVER} --extldflags \"${LDFLAGS}\"" \
      -o "$PKGDIR"/usr/bin/gotop \
      ./cmd/gotop
+
+abinfo "Generating and installing manpage ..."
+"$PKGDIR"/usr/bin/gotop --create-manpage > gotop.8
+install -Dvm644 gotop.8 "$PKGDIR"/usr/share/man/man8/gotop.8
diff --git a/...n/gotop/autobuild/patches/0001-Fix-build-failure-on-riscv64-caused-by-missing-sysca.patch b/...n/gotop/autobuild/patches/0001-Fix-build-failure-on-riscv64-caused-by-missing-sysca.patch
@@ -0,0 +1,47 @@
+From 658926bd0fa8e15c75c4db1426f2b20307312870 Mon Sep 17 00:00:00 2001
+From: Camber Huang <camber@poi.science>
+Date: Mon, 9 May 2022 14:04:06 +0800
+Subject: [PATCH] Fix build failure on riscv64 caused by missing syscall
+
+On RISC-V 64-bit linux systems, syscall `dup2()` is not available, therefore
+syscall.Dup2 will be undefined and gotop will fail to be built from soure.
+This patch updates building target of logging/logging_{other,arm64} and
+renames them based on syscall used.
+
+Signed-off-by: Camber Huang <camber@aosc.io>
+---
+ logging/{logging_other.go => logging_dup2.go} | 2 +-
+ logging/{logging_arm64.go => logging_dup3.go} | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+ rename logging/{logging_other.go => logging_dup2.go} (67%)
+ rename logging/{logging_arm64.go => logging_dup3.go} (73%)
+
+diff --git a/logging/logging_other.go b/logging/logging_dup2.go
+similarity index 67%
+rename from logging/logging_other.go
+rename to logging/logging_dup2.go
+index d7d75d5..c7371c4 100644
+--- a/logging/logging_other.go
++++ b/logging/logging_dup2.go
+@@ -1,4 +1,4 @@
+-// +build linux,!arm64 openbsd,!arm64 freebsd darwin
++// +build linux,!arm64,!riscv64 openbsd,!arm64 freebsd darwin
+
+ package logging
+
+diff --git a/logging/logging_arm64.go b/logging/logging_dup3.go
+similarity index 73%
+rename from logging/logging_arm64.go
+rename to logging/logging_dup3.go
+index 9d62f0f..de6a638 100644
+--- a/logging/logging_arm64.go
++++ b/logging/logging_dup3.go
+@@ -1,4 +1,4 @@
+-// +build !freebsd,!darwin,arm64
++// +build !freebsd,!darwin,arm64 linux,riscv64
+
+ package logging
+
+-- 
+2.36.0
+
diff --git a/extra-admin/gotop/spec b/extra-admin/gotop/spec
@@ -1,4 +1,4 @@
-VER=4.1.2
+VER=4.1.3
 SRCS="https://github.com/xxxserxxx/gotop/archive/v$VER.tar.gz"
-CHKSUMS="sha256::81518fecfdab4f4c25a4713e24d9c033ba8311bbd3e2c0435ba76349028356da"
+CHKSUMS="sha256::c0a02276e718b988d1220dc452063759c8634d42e1c01a04c021486c1e61612d"
 CHKUPDATE="anitya::id=226757"
diff --git a/extra-admin/podman/spec b/extra-admin/podman/spec
@@ -1,4 +1,5 @@
 VER=4.0.3
+REL=1
 SRCS="tbl::https://github.com/containers/podman/archive/v${VER}.tar.gz \
       git::commit=tags/v1.3.1;rename=dnsname::https://github.com/containers/dnsname
       git::commit=tags/v1.1.1;rename=cni-plugins::https://github.com/containernetworking/plugins"

diff --git a/extra-android/android-platform-tools/spec b/extra-android/android-platform-tools/spec
@@ -1,5 +1,4 @@
-VER=31.0.0
+VER=31.0.3p1
 SRCS="https://github.com/nmeum/android-tools/releases/download/$VER/android-tools-$VER.tar.xz"
-CHKSUMS="sha256::0b8f16370072d03e9f26de17ecba7dd44771cb042a23e86869108d57eb22f20d"
+CHKSUMS="sha256::0ef69f919d58a2bdff2083d2e83a9ef38df079ec82651b2544e9e48086df5ab8"
 CHKUPDATE="anitya::id=226905"
-REL=2
diff --git a/extra-bases/golang-base/autobuild/defines b/extra-bases/golang-base/autobuild/defines
@@ -1,6 +1,8 @@
 PKGNAME=golang-base
 PKGSEC=Bases
-PKGDEP="go glide godep"
+PKGDEP="go glide"
+PKGDEP__AMD64="${PKGDEP} dep delve"
+PKGDEP__ARM64="${PKGDEP} delve"
 PKGDES="Meta package for AOSC OS Golang development support"
 
 VER_NONE=1

diff --git a/extra-bases/golang-base/spec b/extra-bases/golang-base/spec
@@ -1,2 +1,2 @@
-VER=0
+VER=1
 DUMMYSRC=1
diff --git a/extra-database/mongodb/autobuild/build b/extra-database/mongodb/autobuild/build
@@ -1,8 +1,12 @@
+abinfo "Phase 1/2: Building via scons ..."
+abinfo "Setting WIREDTIGER ..."
 if [[ "${CROSS:-$ARCH}" = "amd64" || "${CROSS:-$ARCH}" = "arm64" ]]; then
     WIREDTIGER="--wiredtiger=on"
 else
     WIREDTIGER="--wiredtiger=off"
 fi
+
+abinfo "Setting CFLAGS"
 # there is a bug with Mongodb's SConstruct file
 # where the flags need to be passed using commandline
 # however, if you also have env variables set, it will bug out
@@ -11,6 +15,8 @@ S_CXXFLAGS="$(echo "$CXXFLAGS" | tr -s ' ')"
 # you can't use unset here, otherwise scons will crash
 CFLAGS=''
 CXXFLAGS=''
+
+abinfo "Invoking scons ..."
 scons install-core \
 	${MAKEFLAGS/ /} \
         --use-system-boost \
@@ -30,18 +36,23 @@ scons install-core \
 install -dvm700 "$PKGDIR"/var/lib/mongodb
 install -dvm755 "$PKGDIR"/var/log/mongodb
 
+abinfo "Phase 2/2: Building via go ..."
+
+abinfo "Preparing sources ..."
 install -vd "$SRCDIR"/build/src/github.com/mongodb/bin
-mv -v "$SRCDIR"/mongo-tools-r4.2.12 \
+mv -v "$SRCDIR"/../mongo-tools-r4.2.20 \
       "$SRCDIR"/build/src/github.com/mongodb/mongo-tools
 sed -e 's/_Ctype_struct_/C.struct_/' \
     -i "$SRCDIR"/build/src/github.com/mongodb/mongo-tools/vendor/github.com/google/gopacket/pcap/pcap.go
 
 cd "$SRCDIR"/build/src/github.com/mongodb/mongo-tools
 
+abinfo "Setting Go environments ..."
 GOROOT=/usr . ./set_goenv.sh
 export GOPATH="$GOPATH:$SRCDIR/build"
 export GO111MODULE=auto
 
+abinfo "Invoking Go compiler and installing executables ..."
 mkdir -v bin
 for i in bsondump mongostat mongofiles mongoexport mongoimport \
          mongorestore mongodump mongotop mongoreplay; do

diff --git a/...odb/autobuild/patches/32bit-support.patch → ...utobuild/patches/0001.32bit-support.patch b/...odb/autobuild/patches/32bit-support.patch → ...utobuild/patches/0001.32bit-support.patch
diff --git a/...tobuild/patches/mongodb-4.4.1-boost.patch → ...ld/patches/0002.mongodb-4.4.1-boost.patch b/...tobuild/patches/mongodb-4.4.1-boost.patch → ...ld/patches/0002.mongodb-4.4.1-boost.patch
diff --git a/...ild/patches/mongodb-4.4.1-fix-scons.patch → ...atches/0003.mongodb-4.4.1-fix-scons.patch b/...ild/patches/mongodb-4.4.1-fix-scons.patch → ...atches/0003.mongodb-4.4.1-fix-scons.patch
diff --git a/extra-database/mongodb/autobuild/patches/0004.mongodb-4.4.14-fix-missing-header.patch b/extra-database/mongodb/autobuild/patches/0004.mongodb-4.4.14-fix-missing-header.patch
@@ -0,0 +1,12 @@
+diff --git a/src/mongo/db/exec/plan_stats.h b/src/mongo/db/exec/plan_stats.h
+index ea75f673..a1d9f78e 100644
+--- a/src/mongo/db/exec/plan_stats.h
++++ b/src/mongo/db/exec/plan_stats.h
+@@ -33,6 +33,7 @@
+ #include <cstdlib>
+ #include <string>
+ #include <vector>
++#include <optional>
+
+ #include "mongo/db/index/multikey_paths.h"
+ #include "mongo/db/jsobj.h"
diff --git a/extra-database/mongodb/autobuild/patches/mongodb-4.4.1-no-compass.patch b/extra-database/mongodb/autobuild/patches/mongodb-4.4.1-no-compass.patch
diff --git a/extra-database/mongodb/autobuild/prepare b/extra-database/mongodb/autobuild/prepare
@@ -1,6 +1,3 @@
-wget https://github.com/mongodb/mongo-tools/archive/r4.2.12.tar.gz
-tar xf r4.2.12.tar.gz
-
 if [[ "${CROSS:-$ARCH}" = "arm64" ]]; then
     export CFLAGS="${CFLAGS} -march=armv8-a+crc+crypto"
     export CXXFLAGS="${CXXFLAGS} -march=armv8-a+crc+crypto"

diff --git a/extra-database/mongodb/spec b/extra-database/mongodb/spec
@@ -1,5 +1,7 @@
-VER=4.4.4
-REL=3
-SRCS="https://fastdl.mongodb.org/src/mongodb-src-r$VER.tar.gz"
-CHKSUMS="sha256::33b15c80c61800a7bb73999159dfff374ba4fcc0b56b9949c81ff5e411a76956"
+VER=4.4.14
+SRCS="tbl::https://fastdl.mongodb.org/src/mongodb-src-r$VER.tar.gz \
+      tbl::https://github.com/mongodb/mongo-tools/archive/refs/tags/r4.2.20.tar.gz"
+CHKSUMS="sha256::2296eab606ffae4024575f6ff029d245765943085598ae23f109a3c19151dfeb \
+         sha256::ee577e506520170a6cf628c13debe543abdfd9d9be2d5dd8d7ea43673956b4c8"
 CHKUPDATE="anitya::id=2008"
+SUBDIR=mongodb-src-r"$VER"
diff --git a/extra-devel/cf-tool/autobuild/defines b/extra-devel/cf-tool/autobuild/defines
@@ -4,4 +4,8 @@ PKGDES="A command-line tool for Codeforces contests"
 PKGDEP="glibc"
 BUILDDEP="go"
 
+# Due to the difference of available syscall on riscv64, cf-toll is unable 
+# to be built on that platform.
+FAIL_ARCH="riscv64"
+
 ABSPLITDBG=0
diff --git a/extra-devel/cf-tool/spec b/extra-devel/cf-tool/spec
@@ -1,4 +1,5 @@
 VER=1.0.0
+REL=1
 SRCS="tbl::https://github.com/xalanq/cf-tool/archive/refs/tags/v$VER.tar.gz"
 CHKSUMS="sha256::6671392df969e7decf9bf6b89a43a93c2bde978e005e99ddb7fd84b0c513df9f"
 CHKUPDATE="anitya::id=235020"
diff --git a/extra-devel/git-lfs/spec b/extra-devel/git-lfs/spec
@@ -1,5 +1,4 @@
-VER=2.13.2
-REL=3
+VER=3.1.4
 SRCS=git::commit=tags/v${VER}::https://github.com/git-lfs/git-lfs.git
 CHKSUMS="SKIP"
 CHKUPDATE="anitya::id=11551"
diff --git a/extra-devel/pup/autobuild/beyond b/extra-devel/pup/autobuild/beyond
@@ -0,0 +1,5 @@
+abinfo "Removing unneeded executables ..."
+rm -v "$PKGDIR"/usr/bin/{run.py,test}
+
+abinfo "Installing README.md ..."
+install -Dvm644 "$SRCDIR"/README.md "$PKGDIR"/usr/share/doc/pup/README.md
diff --git a/extra-devel/pup/autobuild/build b/extra-devel/pup/autobuild/build
diff --git a/extra-devel/pup/spec b/extra-devel/pup/spec
@@ -1,5 +1,4 @@
-VER=0.4.0
-REL=14
-SRCS="tbl::https://github.com/ericchiang/pup/archive/v$VER.tar.gz"
-CHKSUMS="sha256::0d546ab78588e07e1601007772d83795495aa329b19bd1c3cde589ddb1c538b0"
+VER=0.4.0+git20220307
+SRCS="git::commit=5a57cf111366c7c08999a34b2afd7ba36d58a96d::https://github.com/ericchiang/pup"
+CHKSUMS="SKIP"
 CHKUPDATE="anitya::id=227247"
diff --git a/extra-devel/scons/spec b/extra-devel/scons/spec
@@ -1,5 +1,4 @@
-VER=4.1.0
-REL=2
+VER=4.3.0
 SRCS="tbl::https://github.com/SCons/scons/archive/refs/tags/$VER.tar.gz"
-CHKSUMS="sha256::7662af76d971bae3e9c01e6d025d4ff0f547b64cac081298fc19015c9c242311"
+CHKSUMS="sha256::e5926aa7f1523a4321c49f59d2150232ac0416a86ad1057683560dcde7e5b50a"
 CHKUPDATE="anitya::id=4770"
diff --git a/extra-doc/go-md2man/spec b/extra-doc/go-md2man/spec
@@ -1,5 +1,4 @@
-VER=2.0.0+git20201216
-SRCS="git::commit=af8da765f0460ccb1d91003b4945a792363a94ca::https://github.com/cpuguy83/go-md2man"
+VER=2.0.2
+SRCS="git::commit=tags/v${VER}::https://github.com/cpuguy83/go-md2man"
 CHKSUMS="SKIP"
 CHKUPDATE="anitya::id=14461"
-REL=2
diff --git a/extra-go/delve/autobuild/defines b/extra-go/delve/autobuild/defines
@@ -4,5 +4,5 @@ PKGDEP="glibc"
 BUILDDEP="go"
 PKGDES="Debugger for the Go programming language"
 
-FAIL_ARCH="!(amd64)"
+FAIL_ARCH="!(amd64|arm64)"
 ABSPLITDBG=0
diff --git a/extra-go/delve/spec b/extra-go/delve/spec
@@ -1,6 +1,5 @@
-VER=1.7.1
+VER=1.8.3
 SRCS="https://github.com/go-delve/delve/archive/refs/tags/v$VER.tar.gz"
-CHKSUMS="sha256::0734b86d48291749ba2537fa6c03e4c3451628f630055c877789e0346db8d67d"
+CHKSUMS="sha256::b18dc56de8768da055125663e7c368ecf24cdac4d72d9080ac90dc0ee99ea852"
 CHKUPDATE="anitya::id=40149"
 SUBDIR=.
-REL=1
diff --git a/extra-go/dep/spec b/extra-go/dep/spec
@@ -1,5 +1,5 @@
 VER=0.5.4
-REL=13
+REL=14
 SRCS="https://github.com/golang/dep/archive/v$VER.tar.gz"
 CHKSUMS="sha256::929c8f759838f98323211ba408a831ea80d93b75beda8584b6d950f393a3298a"
 CHKUPDATE="anitya::id=18652"

diff --git a/extra-go/glide/spec b/extra-go/glide/spec
@@ -1,5 +1,5 @@
 VER=0.13.3
-REL=13
+REL=14
 SRCS="git::commit=tags/v$VER::https://github.com/Masterminds/glide"
 CHKSUMS="SKIP"
 CHKUPDATE="anitya::id=11625"

diff --git a/extra-go/go/autobuild/build b/extra-go/go/autobuild/build
@@ -4,6 +4,9 @@ export GOBIN="$GOROOT/bin"
 export GOPATH="$SRCDIR/../"
 export GOROOT_FINAL=/usr/lib/go
 export GOROOT_BOOTSTRAP=/usr/lib/go
+if [[ "${CROSS:-$ARCH}" = "amd64" ]]; then
+    export GOAMD64=v1
+fi
 
 case ${CROSS:-$ARCH} in
     amd64)
@@ -29,7 +32,7 @@ export GOARCH="$buildarch"
 
     abinfo "Building Go toolchain ..."
     GO_LDFLAGS="-w -s" bash make.bash --no-clean -v
-    if [[ "${CROSS:-$ARCH}" != "ppc64" && "${CROSS:-$ARCH}" != "ppc64el" &&
+    if [[ "${CROSS:-$ARCH}" != "ppc64" &&
           "${CROSS:-$ARCH}" != "loongson3" && "${CROSS:-$ARCH}" != "riscv64" ]]; then
         abinfo "Building and preparing to install Go toolchain with data race detector ..."
         PATH="$GOBIN:$PATH" go install -v -race std

diff --git a/extra-go/go/autobuild/defines b/extra-go/go/autobuild/defines
@@ -1,6 +1,7 @@
 PKGNAME=go
 PKGSEC=devel
-PKGDEP="glibc"
+PKGDEP="glibc llvm"
+PKGDEP__LOONGSON3="glibc"
 BUILDDEP="inetutils git go llvm mercurial"
 BUILDDEP__LOONGSON3="${BUILDDEP/llvm/}"
 PKGDES="The Go language compiler and tools"

diff --git a/extra-go/go/spec b/extra-go/go/spec
@@ -1,9 +1,9 @@
-VER=1.17.2
-# FIXME: Using release-branch.go.${PKGVER:0:4} branch, 1.16 not yet ready?
-SRCS="tbl::https://golang.org/dl/go$VER.src.tar.gz \
-      git::commit=49064d2332f958d307bd213367033e5a74513995;rename=tools::https://go.googlesource.com/tools \
-      git::commit=6d2eada6345e1621bdc51e3311439576848c7ef5;rename=net::https://github.com/golang/net"
-CHKSUMS="sha256::2255eb3e4e824dd7d5fcdc2e7f84534371c186312e546fb1086a34c17752f431 \
+VER=1.18.1
+REL=1
+SRCS="tbl::https://go.dev/dl/go$VER.src.tar.gz \
+      git::commit=294080fd2f5aedacec87d7670af9d16000dd2d2f;rename=tools::https://go.googlesource.com/tools \
+      git::commit=491a49abca63de5e07ef554052d180a1b5fe2d70;rename=net::https://github.com/golang/net"
+CHKSUMS="sha256::efd43e0f1402e083b73a03d444b7b6576bb4c539ac46208b63a916b69aca4088 \
          SKIP \
          SKIP"
 CHKUPDATE="anitya::id=1227"

diff --git a/extra-libs/flatbuffers/autobuild/build b/extra-libs/flatbuffers/autobuild/build
@@ -0,0 +1,10 @@
+abinfo "Phase 1/2 - Running cmakeninja build script ..."
+build_cmakeninja_build
+
+abinfo "Phase 2/2 - Running python build script ..."
+pushd "$SRCDIR"/python
+    __SRCDIR="$SRCDIR"
+    SRCDIR="${SRCDIR}/python"
+    build_python_build
+    SRCDIR="$__SRCDIR"
+popd