rebase community pkg version; add rb.patch

source rb.patch:
https://raw.githubusercontent.com/archlinux/svntogit-community/feb2e1fc8ddccae7f4e366e2aa610bc03fb3b4e8/go-ipfs/repos/community-x86_64/rb.patch

1 files changed, 56 insertions, 39 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 520644f96d18..4d1207ae9048 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,8 @@
 # Maintainer: @RubenKelevra
+# Contributor: Johannes Löthberg <johannes@kyriasis.com>
+# Contributor: Anatol Pomozov
+# Contributor: kpcyrd <git@rxv.cc>
+# Contributor: Frederik “Freso” S. Olesen <freso.dk@gmail.com>
 # Contributor: Jakub "Kubuxu" Sztandera <kubuxu@protonmail.ch>
 # Contributor: Frederik “Freso” S. Olesen <freso.dk@gmail.com>
 # Contributor: kpcyrd <git@rxv.cc>
@@ -6,82 +10,95 @@
 
 _pkgname=go-ipfs
 pkgname=$_pkgname-git
-pkgver=0.13.0rc1.r2.gb72125522
+pkgver=0.13.0rc1.r18.ga72753bad
 pkgrel=1
+
 pkgdesc='A peer-to-peer hypermedia distribution protocol'
 url="https://github.com/ipfs/$_pkgname"
 arch=('i686' 'x86_64' 'armv7h' 'aarch64')
-license=('MIT')
-makedepends=("go>=2:1.15.2-1" git)
-optdepends=('fuse2: for mounting/advanced use'
-            'bash-completion: bash completion support')
+license=(MIT)
+
+depends=(glibc)
+makedepends=("go>=2:1.18-1" git)
+optdepends=('bash-completion: bash completion support')
+
 provides=("$_pkgname")
 conflicts=("$_pkgname")
 install="$pkgname.install"
-source=("git+${url}.git")
+source=("git+$url.git"
+        # https://github.com/ipfs/go-ipfs/pull/8213#issuecomment-881866789
+        rb.patch)
+
+sha512sums=('SKIP'
+            '5591bb5b309ccf6464723650831e7ed1bf6ffc7e18645c3563452df965091b94d265b079db92ae0b359aa964540b2ee1c1b60b3000102168bfd32730b640f12c')
+b2sums=('SKIP'
+        'e806cac9fbfa396bdfad6e236bbfe4141b41b81da0a4c92b045b82c5c7237af7048bc16db4d9078c7351dbc4d82e658bb78f07bbc48b603c0589bca59c63f02d')
 
-b2sums=('SKIP')
 
 prepare() {
   cd "$srcdir/$_pkgname"
-  mkdir -p "${srcdir}/../go"
-  export GOPATH="${srcdir}/../go"
-  export PATH="$PATH:$GOPATH/bin"
-  # fix for broken version
+  patch -Np1 -i ../rb.patch
+
+  cd "$srcdir/.."
+  mkdir -p "go"
+  export GOPATH="$(pwd)/go" 
+  # export PATH="$PATH:$GOPATH/bin" ?
+
+  # fix for broken versions of this package
   chmod u+w -R "$GOPATH"
-  go get -d -v ./...
+
+  cd "$srcdir/$_pkgname"
+
+#  # dirty fix go1.18
+#  sed -i -r 's,^go 1\.[0-9]+,go 1.18,' go.mod
+  go get -d -v ./... # old fetch
+  
 }
 
 pkgver() {
   EXCLUDE_TAGS="floodsub|sharding-pre|-dev"
 
   cd "$srcdir/$_pkgname"
-  #VERSION=$(grep -E "^const CurrentVersionNumber = " version.go | awk '{ print $4 }' | sed 's/"//g')
   VERSION=$(git tag | grep -vE "$EXCLUDE_TAGS" | sed 's/-/~/g' | sort --version-sort --reverse | sed 's/~/-/g' | head -n1)
   COUNT=$(git rev-list "$VERSION.." --count)
   CHKSUM="$(git rev-parse --short HEAD)"
   VERSION=$(echo "$VERSION" | sed 's/^v//' | sed 's/-//')
-  printf "%s.%s.%s" "$VERSION" "r$COUNT" "g${CHKSUM}"
+  printf "%s.%s.%s" "$VERSION" "r$COUNT" "g$CHKSUM"
 }
 
 build() {
   cd "$srcdir/$_pkgname"
-  export GOPATH="${srcdir}/../go"
-  export PATH="$PATH:$GOPATH/bin"
-  export CGO_LDFLAGS="${LDFLAGS}"
-  export CGO_CFLAGS="${CFLAGS}"
-  export CGO_CPPFLAGS="${CPPFLAGS}"
-  export CGO_CXXFLAGS="${CXXFLAGS}"
-  make GOFLAGS="-buildmode=pie -trimpath -modcacherw" nofuse
-}
 
-package() {
-  cd "$srcdir/$_pkgname"
-  install -Dm 755 cmd/ipfs/ipfs "$pkgdir/usr/bin/ipfs"
-  install -Dm 644 misc/systemd/ipfs-api.socket "$pkgdir/usr/lib/systemd/system/ipfs-api.socket"
-  install -Dm 644 misc/systemd/ipfs-gateway.socket "$pkgdir/usr/lib/systemd/system/ipfs-gateway.socket"
-  # use the hardened service file
-  install -Dm 644 misc/systemd/ipfs-hardened.service "$pkgdir/usr/lib/systemd/system/ipfs.service"
+  export CGO_LDFLAGS="$LDFLAGS"
+  export CGO_CFLAGS="$CFLAGS"
+  export CGO_CPPFLAGS="$CPPFLAGS"
+  export CGO_CXXFLAGS="$CXXFLAGS"
+  export GOFLAGS="-buildmode=pie -trimpath -modcacherw"
+  make nofuse
+  cmd/ipfs/ipfs commands completion bash > "$srcdir"/ipfs-completion.bash
 
   ### Patch service file ###
 
   # set IPFS_PATH if not set by upstream already
-  sed -i  '/StateDirectory=ipfs/,/ExecStart=\/usr\/bin\/ipfs daemon --init --migrate/c StateDirectory=ipfs\nEnvironment=IPFS_PATH=\~\nExecStart=\/usr\/bin\/ipfs daemon --init --migrate' "$pkgdir/usr/lib/systemd/system/ipfs.service"
+  sed -i  '/StateDirectory=ipfs/,/ExecStart=\/usr\/bin\/ipfs daemon --init --migrate/c StateDirectory=ipfs\nEnvironment=IPFS_PATH=\~\nExecStart=\/usr\/bin\/ipfs daemon --init --migrate' "misc/systemd/ipfs-hardened.service"
   # remove --init (handled by install file)
-  sed -i 's/ExecStart=\/usr\/bin\/ipfs daemon --init --migrate/ExecStart=\/usr\/bin\/ipfs daemon --migrate/g' "$pkgdir/usr/lib/systemd/system/ipfs.service"
+  sed -i 's/ExecStart=\/usr\/bin\/ipfs daemon --init --migrate/ExecStart=\/usr\/bin\/ipfs daemon --migrate/g' "misc/systemd/ipfs-hardened.service"
   # enable gc and pubsub by default (sane defaults)
-  sed -i 's/ExecStart=\/usr\/bin\/ipfs daemon/ExecStart=\/usr\/bin\/ipfs daemon --enable-gc --enable-pubsub-experiment --enable-namesys-pubsub/g' "$pkgdir/usr/lib/systemd/system/ipfs.service"
+  sed -i 's/ExecStart=\/usr\/bin\/ipfs daemon/ExecStart=\/usr\/bin\/ipfs daemon --enable-gc --enable-pubsub-experiment --enable-namesys-pubsub/g' "misc/systemd/ipfs-hardened.service"
   # increase timeouts (see #7283)
-  sed -i 's/MemorySwapMax=0/MemorySwapMax=0\n\nTimeoutStartSec=15min\nTimeoutStopSec=15min\nTimeoutAbortSec=15min/' "$pkgdir/usr/lib/systemd/system/ipfs.service"
-
+  sed -i 's/MemorySwapMax=0/MemorySwapMax=0\n\nTimeoutStartSec=15min\nTimeoutStopSec=15min\nTimeoutAbortSec=15min/' "misc/systemd/ipfs-hardened.service"
+}
 
+package() {
+  cd "$srcdir/$_pkgname"
+  install -Dm 755 cmd/ipfs/ipfs "$pkgdir/usr/bin/ipfs"
+  install -Dm 644 misc/systemd/ipfs-api.socket "$pkgdir/usr/lib/systemd/system/ipfs-api.socket"
+  install -Dm 644 misc/systemd/ipfs-gateway.socket "$pkgdir/usr/lib/systemd/system/ipfs-gateway.socket"
+  # use the hardened service file
+  install -Dm 644 misc/systemd/ipfs-hardened.service "$pkgdir/usr/lib/systemd/system/ipfs.service"
 
-  install -Dm 644 "misc/systemd/ipfs-sysusers.conf" "${pkgdir}/usr/lib/sysusers.d/ipfs.conf"
-  ./cmd/ipfs/ipfs commands completion bash > ipfs-completion.bash
-  install -Dm 644 ipfs-completion.bash "$pkgdir/usr/share/bash-completion/completions/ipfs"
+  install -Dm 644 "$srcdir"/ipfs-completion.bash "$pkgdir/usr/share/bash-completion/completions/ipfs"
   install -Dm 644 -t "$pkgdir/usr/share/licenses/$pkgname/MIT" LICENSE-MIT
   install -Dm 644 -t "$pkgdir/usr/share/licenses/$pkgname/APACHE" LICENSE-APACHE
   install -Dm 644 -t "$pkgdir/usr/share/doc/$pkgname" README.md
-  # make sure the gopath is writeable
-  chmod u+w -R "$GOPATH"
 }