summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--system/psmisc/APKBUILD12
-rw-r--r--system/psmisc/dont-underlink-peekfd.patch10
-rw-r--r--system/psmisc/fix-peekfd-on-ppc.patch2
-rw-r--r--user/keyutils/APKBUILD7
-rw-r--r--user/libevent/APKBUILD4
-rw-r--r--user/mtr/APKBUILD38
-rw-r--r--user/mtr/handle-program-suffix.patch15
-rw-r--r--user/py3-pbr/APKBUILD4
-rw-r--r--user/rtmpdump/APKBUILD15
-rw-r--r--user/wayland-protocols/APKBUILD4
-rw-r--r--user/xapian-core/APKBUILD4
11 files changed, 61 insertions, 54 deletions
diff --git a/system/psmisc/APKBUILD b/system/psmisc/APKBUILD
index 2ffe67d71..f98d21cf1 100644
--- a/system/psmisc/APKBUILD
+++ b/system/psmisc/APKBUILD
@@ -1,11 +1,13 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer:
pkgname=psmisc
-pkgver=23.1
-pkgrel=1
+pkgver=23.2
+pkgrel=0
pkgdesc="Miscellaneous utilities that use the proc filesystem"
url="https://gitlab.com/psmisc/psmisc"
arch="all"
+options="!check" # killall(8) is known-broken on musl:
+ # https://gitlab.com/psmisc/psmisc/issues/18
license="GPL-2.0+"
makedepends_build="autoconf>=2.69 automake"
makedepends_host="ncurses-dev"
@@ -13,7 +15,6 @@ checkdepends="dejagnu"
subpackages="$pkgname-doc"
[ "$CBUILD" != "$CHOST" ] || subpackages="$subpackages $pkgname-lang"
source="$pkgname-$pkgver.tar.bz2::https://gitlab.com/$pkgname/$pkgname/repository/archive.tar.bz2?ref=v$pkgver
- dont-underlink-peekfd.patch
fix-peekfd-on-ppc.patch
musl_ptregs.patch
"
@@ -54,7 +55,6 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="636f33b628f07599c7a08d0fe0e084469647e2b03046f9c220f6a24475ab1d5dd07db2501bc1a581ca68c72c212367b5dab8b44edfe477a70bfc8740af2b1365 psmisc-23.1.tar.bz2
-a68c75eb3c66a9df0d4e574a9439eeed0cd2dc97b3cad3fcd8b945619c2ec238b73bf479d1b55ddd4821471cd8934ee1fbc7871c92de7ef72c3d3f989ab62c9f dont-underlink-peekfd.patch
-b16139606e1ccaebd94b7b7a14f49f530b180f1fd24338008e4c4d48761b57953458c46e57b0f7ec191353514f68126f79c281875c4cd56ed2f1220ace131ce1 fix-peekfd-on-ppc.patch
+sha512sums="210dd327f1ff614587ff5b4ae60cd843426302a020fe7f1c018ddba99dcdff7b7ad0620e2b1f10f6204402c1dc0deebcb4332235bcca082d6be21dcb68043619 psmisc-23.2.tar.bz2
+a910611896368a088503f50a04a1c2af00d57ee20f3613e81c79cd89574805a505dff43e356ed833a464e3b59d7c1e11fd52cf0bbf32fcfece4dbd2380f23b71 fix-peekfd-on-ppc.patch
57e3ebf427bae9d3ef5b40be1cbc29743009720a75369c91d338f7634fea5bf522f20ec54404b99f3a39e2c4c146c40baee2b22f68e5ede76678d488fde00db5 musl_ptregs.patch"
diff --git a/system/psmisc/dont-underlink-peekfd.patch b/system/psmisc/dont-underlink-peekfd.patch
deleted file mode 100644
index e1623f193..000000000
--- a/system/psmisc/dont-underlink-peekfd.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- psmisc-23.0/Makefile.am.old 2017-06-12 00:29:46.000000000 +0000
-+++ psmisc-23.0/Makefile.am 2017-06-28 10:21:04.148955051 +0000
-@@ -65,6 +65,7 @@
- src_killall_SOURCES = src/killall.c src/comm.h src/signals.c src/signals.h src/i18n.h
- src_killall_LDADD = @LIBINTL@ @SELINUX_LIB@
- src_peekfd_SOURCES = src/peekfd.c
-+src_peekfd_LDADD = @LIBINTL@
- src_pslog_SOURCES = src/pslog.c
- src_pstree_SOURCES = src/pstree.c src/comm.h src/i18n.h
- src_pstree_LDADD = @LIBINTL@ @TERMCAP_LIB@ @SELINUX_LIB@
diff --git a/system/psmisc/fix-peekfd-on-ppc.patch b/system/psmisc/fix-peekfd-on-ppc.patch
index d9fc1d5f1..b28e17efb 100644
--- a/system/psmisc/fix-peekfd-on-ppc.patch
+++ b/system/psmisc/fix-peekfd-on-ppc.patch
@@ -1,6 +1,6 @@
--- psmisc-23.0/src/peekfd.c.old 2017-06-12 00:29:46.000000000 +0000
+++ psmisc-23.0/src/peekfd.c 2017-06-28 10:15:18.635344983 +0000
-@@ -233,11 +233,11 @@
+@@ -266,11 +266,11 @@
if (WIFSTOPPED(status)) {
#ifdef PPC
struct pt_regs regs;
diff --git a/user/keyutils/APKBUILD b/user/keyutils/APKBUILD
index a5b6bb18e..7efd00a7a 100644
--- a/user/keyutils/APKBUILD
+++ b/user/keyutils/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer:
pkgname=keyutils
-pkgver=1.6
+pkgver=1.6.1
pkgrel=0
pkgdesc="Linux key management utilities"
url="https://people.redhat.com/~dhowells/keyutils/"
@@ -11,7 +11,7 @@ license="GPL-2.0+ AND LGPL-2.1+"
depends=""
makedepends="file linux-headers"
subpackages="$pkgname-dev $pkgname-doc $pkgname-libs"
-source="https://people.redhat.com/~dhowells/keyutils/keyutils-$pkgver.tar.bz2"
+source="https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/snapshot/keyutils-$pkgver.tar.gz"
build() {
make -j1 \
@@ -29,6 +29,7 @@ package() {
LIBDIR=/lib \
USRLIBDIR=/usr/lib \
install
+ mv "$pkgdir"/lib/pkgconfig "$pkgdir"/usr/lib/pkgconfig
}
libs() {
@@ -37,4 +38,4 @@ libs() {
mv "$pkgdir"/lib "$subpkgdir"/
}
-sha512sums="ee50da165099ea26904066d24b27c5165cb1eb78df6768cba3a534aa318a5c8d926ec6e5322a38c8cedaa768cd79bdcb26ef918aa8447df2e5dfbbe7b8f200ff keyutils-1.6.tar.bz2"
+sha512sums="a717d9bc6142edefc02da9e92242db352e0bc835483c303629c236e6d9cc51fb495b03fdf9e0e9f0864d7e755c92b7a67f018e806a5de1944673e60e317134a2 keyutils-1.6.1.tar.gz"
diff --git a/user/libevent/APKBUILD b/user/libevent/APKBUILD
index 1fd530507..3e864cc4f 100644
--- a/user/libevent/APKBUILD
+++ b/user/libevent/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Sergei Lukin <sergej.lukin@gmail.com>
# Maintainer:
pkgname=libevent
-pkgver=2.1.10
+pkgver=2.1.11
pkgrel=0
pkgdesc="An event notification library"
url="http://libevent.org/"
@@ -48,5 +48,5 @@ dev() {
mv "$pkgdir"/usr/bin "$subpkgdir"/usr/
}
-sha512sums="2a449b60c5bba0908f693d3169a2941f0952b462ea18cf3c7a7288cd902592f35a42c76096af502f04259ffce2567233fda3586578c2ac53fbfce6e00d35c086 libevent-2.1.10-stable.tar.gz
+sha512sums="9d0517b117f128f4f196b19a810524814bab75fa967d533063aaa619d3cf2dca97b443edd5805b764da2993d8e37caa536dce39f68ffcc2a88d32a89204c2de3 libevent-2.1.11-stable.tar.gz
ca097528f88b0a86248be594b44eaa7edcb3a1ee2b808685c09aa7947bb5c10342f4b584e7f2fcef6bc4a185fecb80da4a7a6660dd5c075f3416f9a55a1389b0 py3_rpcgen.patch"
diff --git a/user/mtr/APKBUILD b/user/mtr/APKBUILD
index 5bb39cb8a..b2483b326 100644
--- a/user/mtr/APKBUILD
+++ b/user/mtr/APKBUILD
@@ -1,24 +1,28 @@
# Contributor: John Keith Hohm <john@hohm.net>
# Maintainer:
pkgname=mtr
-pkgver=0.92
-pkgrel=1
+pkgver=0.93
+pkgrel=0
pkgdesc="Full screen ncurses traceroute tool"
url="https://www.bitwizard.nl/mtr/"
arch="all"
options="!check suid" # Tests need networking.
license="GPL-2.0-only AND LGPL-3.0-only AND BSD-3-Clause"
depends="ncurses"
-makedepends="gtk+2.0-dev libcap-dev ncurses-dev"
+makedepends="autoconf automake gtk+2.0-dev libcap-dev ncurses-dev"
subpackages="$pkgname-doc $pkgname-gtk"
-source="https://www.bitwizard.nl/$pkgname/files/$pkgname-$pkgver.tar.gz
+source="$pkgname-$pkgver.tar.gz::https://github.com/traviscross/mtr/archive/v$pkgver.tar.gz
+ handle-program-suffix.patch
mtr-gtk.desktop
"
build() {
- cd "$builddir"
+ msg "Creating build system..."
+ ./bootstrap.sh
+
mkdir -p mtr curses gtk
+ msg "Building curses variant..."
export GIT_DIR="$builddir"
export LIBS="-ltinfo"
cd "$builddir"/curses
@@ -26,9 +30,11 @@ build() {
--without-gtk
make
+ msg "Building GTK+ variant..."
cd "$builddir"/gtk
../configure --prefix=/usr \
--with-gtk \
+ --without-ncurses \
--program-suffix=-gtk
make
unset LIBS GIT_DIR
@@ -37,21 +43,21 @@ build() {
package() {
cd "$builddir"/curses
make DESTDIR="$pkgdir" install
- cd "$builddir"/gtk
- make DESTDIR="$pkgdir" install
- install -D -m 644 "$srcdir"/mtr-gtk.desktop \
- "$pkgdir"/usr/share/applications/mtr-gtk.desktop
- install -D -m 644 "$builddir"/img/mtr_icon.xpm \
- "$pkgdir"/usr/share/pixmaps/mtr_icon.xpm
}
gtk() {
pkgdesc="Graphical traceroute tool"
- mkdir -p "$subpkgdir"/usr/sbin "$subpkgdir"/usr/share
- mv "$pkgdir"/usr/sbin/mtr*-gtk "$subpkgdir"/usr/sbin/
- mv "$pkgdir"/usr/share/applications "$subpkgdir"/usr/share/
- mv "$pkgdir"/usr/share/pixmaps "$subpkgdir"/usr/share/
+ depends=""
+ cd "$builddir"/gtk
+ make DESTDIR="$subpkgdir" install
+ install -D -m 644 "$srcdir"/mtr-gtk.desktop \
+ "$subpkgdir"/usr/share/applications/mtr-gtk.desktop
+ install -D -m 644 "$builddir"/img/mtr_icon.xpm \
+ "$subpkgdir"/usr/share/pixmaps/mtr_icon.xpm
+ mv "$subpkgdir"/usr/share/man/man8/* "$pkgdir"/../mtr-doc/usr/share/man/man8/
+ rm -r "$subpkgdir"/usr/share/man
}
-sha512sums="d362a418b6c17fd2d08da1ed9e033fa3330e4c0497e1bb0644f6193d23f4e20dd8ee181942c2a20ec0025a8b96c521394a21be5a1d9036f8a0a8c4cddfbe381f mtr-0.92.tar.gz
+sha512sums="865c394d8dfa234c472832dc205ddc9ec3cf0552475f565782fd4f4e878251c03f1473e2d28d6799e59da4fcb33c5355049f1e6f02e8610c6bbf681ffb78f53e mtr-0.93.tar.gz
+60c11b27c4d20a75010cadc31d5c1ac94094aaaee0c2f0ad14246b00b0d5301f581ef55eaefa48692d4449a8e7580e67abbb58ea3183fae8f449f7969242f1a9 handle-program-suffix.patch
ecf7543e0125fad6d3f17c30f29f1fc8a3b1e2e477802fe8464e436c3cdfa30d0630b8543cc3f022c475228e94ac8f92981df4d8fb08fe01d004be3d78d6da77 mtr-gtk.desktop"
diff --git a/user/mtr/handle-program-suffix.patch b/user/mtr/handle-program-suffix.patch
new file mode 100644
index 000000000..283966ff4
--- /dev/null
+++ b/user/mtr/handle-program-suffix.patch
@@ -0,0 +1,15 @@
+--- mtr-0.93/Makefile.am.old 2019-08-03 08:31:26.000000000 +0000
++++ mtr-0.93/Makefile.am 2019-08-06 03:44:08.329829268 +0000
+@@ -40,9 +40,10 @@
+ dist_man_MANS = mtr.8 mtr-packet.8
+ PATHFILES += man/mtr.8 man/mtr-packet.8
+
+ install-exec-hook:
+- `setcap cap_net_raw+ep $(DESTDIR)$(sbindir)/mtr-packet` \
+- || chmod u+s $(DESTDIR)$(sbindir)/mtr-packet
++ f="`echo mtr-packet | sed '$(transform)'`"; \
++ `setcap cap_net_raw+ep $(DESTDIR)$(sbindir)/$$f` \
++ || chmod u+s $(DESTDIR)$(sbindir)/$$f
+
+ mtr_SOURCES = ui/mtr.c ui/mtr.h \
+ ui/net.c ui/net.h \
diff --git a/user/py3-pbr/APKBUILD b/user/py3-pbr/APKBUILD
index 53bd5311c..0b45bbf34 100644
--- a/user/py3-pbr/APKBUILD
+++ b/user/py3-pbr/APKBUILD
@@ -5,7 +5,7 @@ pkgname=py3-pbr
_pkgname=${pkgname#py3-}
_p="${_pkgname#?}"
_p="${_pkgname%"$_p"}"
-pkgver=5.4.1
+pkgver=5.4.2
pkgrel=0
pkgdesc="Python Build Reasonableness"
url="https://pypi.org/project/pbr"
@@ -27,4 +27,4 @@ package() {
python3 setup.py install --prefix=/usr --root="$pkgdir"
}
-sha512sums="ac955b472a3cbfdae1743ffb4c1f2196900dca2366d92bb1ace0ab7b47f100393bab0517c6788e7f58e6cf1dcceddf1ba3d70d1851f715ec1ab84251b2a2533c pbr-5.4.1.tar.gz"
+sha512sums="fd1ff768ed589760a1c9d339f3ddaaa0f13723a196913b0524659085333bbb3485506998875b9e293935ece2bb2ea042fba317822ac171ef99bdd43103525bed pbr-5.4.2.tar.gz"
diff --git a/user/rtmpdump/APKBUILD b/user/rtmpdump/APKBUILD
index aeaf04c49..eb14d000c 100644
--- a/user/rtmpdump/APKBUILD
+++ b/user/rtmpdump/APKBUILD
@@ -1,9 +1,8 @@
# Contributor: Carlo Landmeter
-# Maintainer:
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=rtmpdump
-verbase=2.4
-pkgver=2.4_git20160909
-pkgrel=4
+pkgver=2.4
+pkgrel=0
pkgdesc="A tool to download rtmp:// and rtmpe:// streams"
url="http://rtmpdump.mplayerhq.hu/"
arch="all"
@@ -13,18 +12,14 @@ depends=""
depends_dev="zlib-dev"
makedepends="$depends_dev linux-headers openssl-dev"
subpackages="$pkgname-dev $pkgname-doc librtmp"
-giturl="git://git.ffmpeg.org/rtmpdump"
-disturl="dev.alpinelinux.org:/archive/rtmpdump"
-source="http://dev.alpinelinux.org/archive/rtmpdump/rtmpdump-${pkgver}.tar.gz
+source="https://distfiles.adelielinux.org/source/rtmpdump-$pkgver.tar.xz
fix-chunk-size.patch"
build() {
- cd "$builddir"
make
}
package() {
- cd "$builddir"
make -j1 prefix=/usr MANDIR="$pkgdir/usr/share/man" DESTDIR="$pkgdir" install
}
@@ -35,5 +30,5 @@ librtmp() {
mv "$pkgdir"/usr/lib "$subpkgdir"/usr/
}
-sha512sums="e42eda75679addb6f919f42ddce2d27a6988f505602bb70ecb4d071324b59f21d573f8b73fda3b29960c095e20303b84f6eb6254cd327803430d8065cf5d172b rtmpdump-2.4_git20160909.tar.gz
+sha512sums="5273452508b3187aa1a7431fb0b44b1a5883dc6b28f6eda92b4a2db6925c72dea68bdd666a2affd68476ef8db714db4022a9417323c8ef3c58bbf1f407fe99d4 rtmpdump-2.4.tar.xz
f97b4780fb8cfffccf59785c5a89c8d4929e21ec587192f10602caaf9a0b008dfbfebaa09db1d9d955fc9911fc443d76bf19972cc59fedfab5a8889f7fe70b5d fix-chunk-size.patch"
diff --git a/user/wayland-protocols/APKBUILD b/user/wayland-protocols/APKBUILD
index 445ee8df8..4addb5f3f 100644
--- a/user/wayland-protocols/APKBUILD
+++ b/user/wayland-protocols/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
# Maintainer:
pkgname=wayland-protocols
-pkgver=1.17
+pkgver=1.18
pkgrel=0
pkgdesc="Protocols and protocol extensions complementing the Wayland core protocol"
url="https://wayland.freedesktop.org"
@@ -32,4 +32,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="5f3aacbba58717092036659d9b665dc10ff05ee51df61b1de38b22f0417285a74fd8a6d15ca049ad60d204f28203aa13d773c52140c7c02db2c498a6964c2643 wayland-protocols-1.17.tar.xz"
+sha512sums="166be44f370a99281da442e7e2c2fc2f3169b61eeaa69263611b4e33847e93d1071f3cc89537597e1252d48d03993ce39c7d65f43b66a23c9b1551f47959e483 wayland-protocols-1.18.tar.xz"
diff --git a/user/xapian-core/APKBUILD b/user/xapian-core/APKBUILD
index a0b70daac..102f86751 100644
--- a/user/xapian-core/APKBUILD
+++ b/user/xapian-core/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Francesco Colista <fcolista@alpinelinux.org>
# Maintainer:
pkgname=xapian-core
-pkgver=1.4.11
+pkgver=1.4.12
pkgrel=0
pkgdesc="Open source search engine library"
url="https://xapian.org/"
@@ -51,5 +51,5 @@ libxapian() {
mv "$pkgdir"/usr/lib/$subpkgname* "$subpkgdir"/usr/lib
}
-sha512sums="72ab7b0c774390f38319d241689b2dc3c2837fbbf933616574f6ad167f14a25c2eff747910022065508dc7c44f806dc2b71dae80a1b4f1f47e1675fb951bc785 xapian-core-1.4.11.tar.xz
+sha512sums="230b39e012366267cf5ea09d01d3b463818c0d05861b8c8643bc6fc238be21bd3f4862adeba864b4af2962b1c0748b3d380dfe845da467f5164b0d938288c430 xapian-core-1.4.12.tar.xz
639c0ecd75be0627d334628b5adf581a7da92c4f86dfb86a92669368ff8a874d4bf4e344b8f3b1276d22d126d2bc44c8ab727e39e1c29c0358fe7bbc8aa8050d timeval-t.patch"
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-10-18 09:48:58 +0000