Skip to content

Commit 3fc0da6

Browse files
nfntynfnty
committed
Update
1 parent 27c6c48 commit 3fc0da6

File tree

7 files changed

+133
-16
lines changed

7 files changed

+133
-16
lines changed

‎cadvisor/cadvisor/PKGBUILD‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
pkgname=('cadvisor')
33
_srcname='cadvisor'
44
pkgdesc='Analyzes resource usage and performance characteristics of running containers'
5-
pkgver='0.48.1'
6-
_commit='2129e1c4fae8567551d1ac252c7a1dec27617e21'
5+
pkgver='0.49.1'
6+
_commit='6f3f25bac19f9f485935a19a28bdcf4edb507d80'
77
pkgrel='1'
88
arch=('i686' 'x86_64')
99
url="https://github.com/google/${_srcname}"

‎ethereum/go-ethereum/PKGBUILD‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
# Maintainer: Justin Kromlinger <hashworks@archlinux.org>
22

33
pkgname=go-ethereum
4-
pkgver=1.14.3
5-
_commit=ab48ba42f4f34873d65fd1737fabac5c680baff6
4+
pkgver=1.14.9
65
pkgrel=1
76
pkgdesc='Official Go implementation of the Ethereum protocol'
87
arch=('x86_64')
@@ -13,9 +12,9 @@ makedepends=('git' 'go')
1312
provides=('geth')
1413
conflicts=('geth')
1514
replaces=('geth')
16-
source=("git+https://github.com/ethereum/go-ethereum.git#commit=${_commit}"
15+
source=("git+https://github.com/ethereum/go-ethereum.git#tag=v${pkgver}"
1716
'geth-user.service')
18-
sha256sums=('753f3838bc9a1458eb7cb7120e286eaf79ca7637bf2fe382be885297daa91d6d'
17+
sha256sums=('95735c4274d3fc1790d166ec39d6c1f5e0cd28a34dfbd2f913b9a81db15713d7'
1918
'806ab43221f0c203e663a78afced694786a5adb033f06fab07d07904384d7645')
2019

2120
build() {

‎ethereum/lighthouse/PKGBUILD‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
pkgname=('lighthouse')
33
_srcname='lighthouse'
44
pkgdesc='An open-source Ethereum 2.0 client, written in Rust and maintained by Sigma Prime'
5-
pkgver='5.1.3'
6-
_commit='3058b96f2560f1da04ada4f9d8ba8e5651794ff6'
5+
pkgver='5.3.0'
6+
_commit='d6ba8c397557f5c977b70f0d822a9228e98ca214'
77
pkgrel='1'
88
arch=('x86_64')
99
url="https://github.com/sigp/${_srcname}"

‎ethereum/prysm/PKGBUILD‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
pkgname=('prysm')
33
_srcname='prysm'
44
pkgdesc='Go implementation of the Ethereum 2.0 blockchain'
5-
pkgver='2.0.2'
6-
_commit='a80b1c252a9b4773493b41999769bf3134ac373f'
5+
pkgver='5.1.0'
6+
_commit='b8cd77945df2b8fa8fe50520df0495309a52c2f3'
77
pkgrel='1'
88
arch=('x86_64')
99
url="https://github.com/prysmaticlabs/${_srcname}"
@@ -13,8 +13,20 @@ makedepends=('git' 'go')
1313
provides=("${pkgname[0]%-git}")
1414
conflicts=("${pkgname[0]%-git}")
1515

16-
source=("${_srcname}::git+${url}.git#commit=${_commit}")
17-
sha512sums=('SKIP')
16+
source=(
17+
"${_srcname}::git+${url}.git#commit=${_commit}"
18+
'memsize.patch'
19+
)
20+
sha512sums=(
21+
'SKIP'
22+
'SKIP'
23+
)
24+
25+
prepare() {
26+
cd "${srcdir}/${_srcname}"
27+
28+
git apply "${srcdir}/memsize.patch"
29+
}
1830

1931
build() {
2032
cd "${srcdir}/${_srcname}"

‎ethereum/prysm/memsize.patch‎

Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
diff --git a/deps.bzl b/deps.bzl
2+
index da7c8c7d0..72d0fda7b 100644
3+
--- a/deps.bzl
4+
+++ b/deps.bzl
5+
@@ -912,12 +912,6 @@ def prysm_deps():
6+
sum = "h1:bBLctRc7kr01YGvaDfgLbTwjFNW5jdp5y5rj8XXBHfY=",
7+
version = "v0.0.0-20230517082657-f9840df7b83e",
8+
)
9+
- go_repository(
10+
- name = "com_github_fjl_memsize",
11+
- importpath = "github.com/fjl/memsize",
12+
- sum = "h1:FtmdgXiUlNeRsoNMFlKLDt+S+6hbjVMEW6RGQ7aUf7c=",
13+
- version = "v0.0.0-20190710130421-bcb5799ab5e5",
14+
- )
15+
go_repository(
16+
name = "com_github_flosch_pongo2_v4",
17+
importpath = "github.com/flosch/pongo2/v4",
18+
diff --git a/go.mod b/go.mod
19+
index 482659fb5..a35c2e6b7 100644
20+
--- a/go.mod
21+
+++ b/go.mod
22+
@@ -18,7 +18,6 @@ require (
23+
github.com/dustin/go-humanize v1.0.0
24+
github.com/emicklei/dot v0.11.0
25+
github.com/ethereum/go-ethereum v1.13.5
26+
- github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5
27+
github.com/fsnotify/fsnotify v1.6.0
28+
github.com/ghodss/yaml v1.0.0
29+
github.com/go-yaml/yaml v2.1.0+incompatible
30+
diff --git a/go.sum b/go.sum
31+
index c15dec2fc..de8075ae0 100644
32+
--- a/go.sum
33+
+++ b/go.sum
34+
@@ -272,8 +272,6 @@ github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w=
35+
github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=
36+
github.com/ferranbt/fastssz v0.0.0-20210120143747-11b9eff30ea9 h1:9VDpsWq096+oGMDTT/SgBD/VgZYf4pTF+KTPmZ+OaKM=
37+
github.com/ferranbt/fastssz v0.0.0-20210120143747-11b9eff30ea9/go.mod h1:DyEu2iuLBnb/T51BlsiO3yLYdJC6UbGMrIkqK1KmQxM=
38+
-github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5 h1:FtmdgXiUlNeRsoNMFlKLDt+S+6hbjVMEW6RGQ7aUf7c=
39+
-github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5/go.mod h1:VvhXpOYNQvB+uIk2RvXzuaQtkQJzzIx6lSBe1xv7hi0=
40+
github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc=
41+
github.com/flynn/noise v1.1.0 h1:KjPQoQCEFdZDiP03phOvGi11+SVVhBG2wOWAorLsstg=
42+
github.com/flynn/noise v1.1.0/go.mod h1:xbMo+0i6+IGbYdJhF31t2eR1BIU0CYc12+BNAKwUTag=
43+
diff --git a/runtime/debug/BUILD.bazel b/runtime/debug/BUILD.bazel
44+
index db34de5e7..bd3d7bdce 100644
45+
--- a/runtime/debug/BUILD.bazel
46+
+++ b/runtime/debug/BUILD.bazel
47+
@@ -18,7 +18,6 @@ go_library(
48+
importpath = "github.com/prysmaticlabs/prysm/v5/runtime/debug",
49+
visibility = ["//visibility:public"],
50+
deps = [
51+
- "@com_github_fjl_memsize//memsizeui:go_default_library",
52+
"@com_github_prometheus_client_golang//prometheus:go_default_library",
53+
"@com_github_prometheus_client_golang//prometheus/promauto:go_default_library",
54+
"@com_github_sirupsen_logrus//:go_default_library",
55+
diff --git a/runtime/debug/debug.go b/runtime/debug/debug.go
56+
index ab79ec4be..45c6994c5 100644
57+
--- a/runtime/debug/debug.go
58+
+++ b/runtime/debug/debug.go
59+
@@ -37,7 +37,6 @@ import (
60+
"sync"
61+
"time"
62+
63+
- "github.com/fjl/memsize/memsizeui"
64+
log "github.com/sirupsen/logrus"
65+
"github.com/urfave/cli/v2"
66+
)
67+
@@ -45,8 +44,6 @@ import (
68+
// Handler is the global debugging handler.
69+
var Handler = new(HandlerT)
70+
71+
-// Memsize is the memsizeui Handler(?).
72+
-var Memsize memsizeui.Handler
73+
var (
74+
// PProfFlag to enable pprof HTTP server.
75+
PProfFlag = &cli.BoolFlag{
76+
@@ -351,7 +348,6 @@ func Setup(ctx *cli.Context) error {
77+
}
78+
79+
func startPProf(address string) {
80+
- http.Handle("/memsize/", http.StripPrefix("/memsize", &Memsize))
81+
log.WithField("addr", fmt.Sprintf("http://%s/debug/pprof", address)).Info("Starting pprof server")
82+
go func() {
83+
srv := &http.Server{

‎ntp/PKGBUILD‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
1-
# Maintainer: Lukas Fleischer <lfleischer@archlinux.org>
1+
# Maintainer:
2+
# Contributor: Lukas Fleischer <lfleischer@archlinux.org>
3+
# Contributor: Christian Heusel <gromit@archlinux.org>
24
# Contributor: Gaetan Bisson <bisson@archlinux.org>
35
# Contributor: kevin <kevin@archlinux.org>
46

57
pkgname=ntp
68
_pkgname=ntp #-dev
7-
_pkgver=4.2.8p17
9+
_pkgver=4.2.8p18
810
pkgver=${_pkgver/p/.p}
911
pkgrel=1
1012
pkgdesc='Network Time Protocol reference implementation'
@@ -14,22 +16,27 @@ arch=('x86_64')
1416
depends=('openssl' 'perl' 'libcap' 'libedit')
1517
backup=('etc/ntp.conf')
1618
source=("https://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/${_pkgname}-${_pkgver}.tar.gz"
19+
ntp-4.2.8.p18-fix-build.patch
1720
'ntp.conf'
1821
'ntpd.service'
1922
'ntpdate.service'
2023
'noroot.patch'
2124
'ntp.sysusers')
22-
sha256sums=('103dd272e6a66c5b8df07dce5e9a02555fcd6f1397bdfb782237328e89d3a866'
25+
sha256sums=('cf84c5f3fb1a295284942624d823fffa634144e096cfc4f9969ac98ef5f468e5'
26+
'9c4afa0daed5fd3cc9544ec808b2bb1dd959e5d40c4cae307b7025b16885903c'
2327
'abccefe0b3a65cd375d5071ce780be8d2d205439aa6d34bcd3c56de6e80ba821'
2428
'1edd7e7916766b4aebb4d96a5da4b0a1086f43d3e0e4ffc90c2e4f92bd13ce7e'
2529
'63b0f8c03905daecad3f901664db70a608519b6ca4f4e7b159ab2c971cffacf4'
26-
'SKIP'
30+
'SKIP'
2731
'f839a3b6d8e64fcd9332274131b4d5aa0b2c272db072dc310af1735ef286746a')
2832
options=('!emptydirs')
2933

3034
prepare() {
3135
cd "${_pkgname}-${_pkgver}"
36+
3237
patch --strip=1 --input="${srcdir}/noroot.patch"
38+
patch -Np1 < ../ntp-4.2.8.p18-fix-build.patch
39+
autoreconf -fiv
3340
}
3441

3542
build() {

‎ntp/ntp-4.2.8.p18-fix-build.patch‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
diff -Nru a/sntp/m4/openldap-thread-check.m4 b/sntp/m4/openldap-thread-check.m4
2+
--- a/sntp/m4/openldap-thread-check.m4 2024-05-19 18:38:30 +0000
3+
+++ b/sntp/m4/openldap-thread-check.m4 2024-05-19 18:38:30 +0000
4+
@@ -262,10 +262,8 @@
5+
dnl save the flags
6+
AC_LINK_IFELSE([AC_LANG_PROGRAM([[
7+
#include <pthread.h>
8+
-#ifndef NULL
9+
-#define NULL (void*)0
10+
-#endif
11+
-]], [[pthread_detach(NULL);]])],[ol_cv_func_pthread_detach=yes],[ol_cv_func_pthread_detach=no])
12+
+pthread_t thread;
13+
+]], [[pthread_detach(thread);]])],[ol_cv_func_pthread_detach=yes],[ol_cv_func_pthread_detach=no])
14+
])
15+
16+
if test $ol_cv_func_pthread_detach = no ; then

0 commit comments

Comments
 (0)