summaryrefslogtreecommitdiff
path: root/system
diff options
context:
space:
mode:
Diffstat (limited to 'system')
-rw-r--r--system/docbook-xsl/APKBUILD8
-rw-r--r--system/docbook-xsl/docbook-xsl-ns.post-deinstall8
-rw-r--r--system/docbook-xsl/docbook-xsl-ns.post-install29
-rw-r--r--system/docbook-xsl/docbook-xsl-ns.post-upgrade32
-rw-r--r--system/docbook-xsl/docbook-xsl.install47
-rw-r--r--system/docbook-xsl/docbook-xsl.post-deinstall3
-rw-r--r--system/docbook-xsl/docbook-xsl.post-install8
-rw-r--r--system/docbook-xsl/docbook-xsl.post-upgrade12
-rw-r--r--system/lddtree/APKBUILD15
-rw-r--r--system/libssh2/APKBUILD1
-rw-r--r--system/lvm2/APKBUILD23
-rw-r--r--system/lvm2/library_dir-default-config.patch10
-rw-r--r--system/perl-cpanel-json-xs/APKBUILD4
-rw-r--r--system/perl-net-ssleay/APKBUILD8
-rw-r--r--system/vim/APKBUILD4
15 files changed, 118 insertions, 94 deletions
diff --git a/system/docbook-xsl/APKBUILD b/system/docbook-xsl/APKBUILD
index ebfbf4dee..11a858afa 100644
--- a/system/docbook-xsl/APKBUILD
+++ b/system/docbook-xsl/APKBUILD
@@ -2,8 +2,8 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=docbook-xsl
pkgver=1.79.1
-pkgrel=3
-pkgdesc="XML stylesheets for Docbook-xml transformations."
+pkgrel=4
+pkgdesc="XML stylesheets for DocBook transformations"
url="http://docbook.sourceforge.net/"
arch="noarch"
options="!check" # Just XML files
@@ -11,7 +11,9 @@ license="MIT"
depends="libxml2-utils libxslt docbook-xml"
subpackages="$pkgname-ns"
makedepends=""
-install="$pkgname.post-install $pkgname.post-upgrade $pkgname.post-deinstall"
+install="$pkgname.post-install $pkgname.post-upgrade $pkgname.post-deinstall
+ $pkgname-ns.post-install $pkgname-ns.post-upgrade
+ $pkgname-ns.post-deinstall"
source="http://downloads.sourceforge.net/sourceforge/docbook/$pkgname-$pkgver.tar.bz2
https://downloads.sourceforge.net/project/docbook/docbook-xsl-ns/$pkgver/$pkgname-ns-$pkgver.tar.bz2
765567_non-recursive_string_subst.patch
diff --git a/system/docbook-xsl/docbook-xsl-ns.post-deinstall b/system/docbook-xsl/docbook-xsl-ns.post-deinstall
new file mode 100644
index 000000000..fdd4d3652
--- /dev/null
+++ b/system/docbook-xsl/docbook-xsl-ns.post-deinstall
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+if command -v xmlcatalog > /dev/null; then
+ xmlcatalog --noout --del \
+ "/usr/share/xml/docbook/xsl-stylesheets-ns" \
+ etc/xml/catalog
+fi
+
diff --git a/system/docbook-xsl/docbook-xsl-ns.post-install b/system/docbook-xsl/docbook-xsl-ns.post-install
new file mode 100644
index 000000000..aa708e534
--- /dev/null
+++ b/system/docbook-xsl/docbook-xsl-ns.post-install
@@ -0,0 +1,29 @@
+#!/bin/sh
+
+if [ ! -f /etc/xml/catalog ]; then
+ xmlcatalog --noout --create /etc/xml/catalog
+fi
+
+
+_NEW=${1%-r[0-9]*}
+
+xmlcatalog --noout --add "rewriteSystem" \
+ "http://docbook.sourceforge.net/release/xsl-ns/${_NEW}" \
+ "/usr/share/xml/docbook/xsl-stylesheets-ns" \
+ etc/xml/catalog
+
+xmlcatalog --noout --add "rewriteURI" \
+ "http://docbook.sourceforge.net/release/xsl-ns/${_NEW}" \
+ "/usr/share/xml/docbook/xsl-stylesheets-ns" \
+ etc/xml/catalog &&
+
+xmlcatalog --noout --add "rewriteSystem" \
+ "http://docbook.sourceforge.net/release/xsl-ns/current" \
+ "/usr/share/xml/docbook/xsl-stylesheets-ns" \
+ etc/xml/catalog &&
+
+xmlcatalog --noout --add "rewriteURI" \
+ "http://docbook.sourceforge.net/release/xsl-ns/current" \
+ "/usr/share/xml/docbook/xsl-stylesheets-ns" \
+ etc/xml/catalog
+
diff --git a/system/docbook-xsl/docbook-xsl-ns.post-upgrade b/system/docbook-xsl/docbook-xsl-ns.post-upgrade
new file mode 100644
index 000000000..92c32378f
--- /dev/null
+++ b/system/docbook-xsl/docbook-xsl-ns.post-upgrade
@@ -0,0 +1,32 @@
+#!/bin/sh
+
+if [ ! -f /etc/xml/catalog ]; then
+ xmlcatalog --noout --create /etc/xml/catalog
+fi
+
+_NEW=${1%-r[0-9]*}
+
+xmlcatalog --noout --del \
+ "/usr/share/xml/docbook/xsl-stylesheets-ns" \
+ etc/xml/catalog
+
+xmlcatalog --noout --add "rewriteSystem" \
+ "http://docbook.sourceforge.net/release/xsl-ns/${_NEW}" \
+ "/usr/share/xml/docbook/xsl-stylesheets-ns" \
+ etc/xml/catalog
+
+xmlcatalog --noout --add "rewriteURI" \
+ "http://docbook.sourceforge.net/release/xsl-ns/${_NEW}" \
+ "/usr/share/xml/docbook/xsl-stylesheets-ns" \
+ etc/xml/catalog
+
+xmlcatalog --noout --add "rewriteSystem" \
+ "http://docbook.sourceforge.net/release/xsl-ns/current" \
+ "/usr/share/xml/docbook/xsl-stylesheets-ns" \
+ etc/xml/catalog
+
+xmlcatalog --noout --add "rewriteURI" \
+ "http://docbook.sourceforge.net/release/xsl-ns/current" \
+ "/usr/share/xml/docbook/xsl-stylesheets-ns" \
+ etc/xml/catalog
+
diff --git a/system/docbook-xsl/docbook-xsl.install b/system/docbook-xsl/docbook-xsl.install
deleted file mode 100644
index a8ea3e72b..000000000
--- a/system/docbook-xsl/docbook-xsl.install
+++ /dev/null
@@ -1,47 +0,0 @@
-post_install() {
- if [ ! -f /etc/xml/catalog ]; then
- xmlcatalog --noout --create /etc/xml/catalog
- fi
- _NEW=`echo $1 | sed 's|\(.*\)\-.*|\1|'`
-
- xmlcatalog --noout --add "rewriteSystem" \
- "http://docbook.sourceforge.net/release/xsl/${_NEW}" \
- "/usr/share/xml/docbook/xsl-stylesheets-${_NEW}" \
- etc/xml/catalog
-
- xmlcatalog --noout --add "rewriteURI" \
- "http://docbook.sourceforge.net/release/xsl/${_NEW}" \
- "/usr/share/xml/docbook/xsl-stylesheets-${_NEW}" \
- etc/xml/catalog &&
-
- xmlcatalog --noout --add "rewriteSystem" \
- "http://docbook.sourceforge.net/release/xsl/current" \
- "/usr/share/xml/docbook/xsl-stylesheets-${_NEW}" \
- etc/xml/catalog &&
-
- xmlcatalog --noout --add "rewriteURI" \
- "http://docbook.sourceforge.net/release/xsl/current" \
- "/usr/share/xml/docbook/xsl-stylesheets-${_NEW}" \
- etc/xml/catalog
-}
-
-post_upgrade() {
- post_remove $2
- post_install $1
-}
-
-post_remove() {
- _OLD=`echo $1 | sed 's|\(.*\)\-.*|\1|'`
- xmlcatalog --noout --del "/usr/share/xml/docbook/xsl-stylesheets-${_OLD}" etc/xml/catalog
-
- if [ $(vercmp $1 1.72.0-3) -lt 0 ]; then
- xmlcatalog --noout --del "/usr/share/xml/docbook" etc/xml/catalog
- xmlcatalog --noout --del "file:///etc/xml/docbook" etc/xml/catalog
- fi
-}
-
-op=$1
-shift
-
-$op $*
-
diff --git a/system/docbook-xsl/docbook-xsl.post-deinstall b/system/docbook-xsl/docbook-xsl.post-deinstall
index 3faecd5a3..ffe2a0f23 100644
--- a/system/docbook-xsl/docbook-xsl.post-deinstall
+++ b/system/docbook-xsl/docbook-xsl.post-deinstall
@@ -6,5 +6,8 @@ if command -v xmlcatalog > /dev/null; then
xmlcatalog --noout --del \
"/usr/share/xml/docbook/xsl-stylesheets-${_OLD}" \
etc/xml/catalog
+ xmlcatalog --noout --del \
+ "/usr/share/xml/docbook/xsl-stylesheets" \
+ etc/xml/catalog
fi
diff --git a/system/docbook-xsl/docbook-xsl.post-install b/system/docbook-xsl/docbook-xsl.post-install
index 6afae6abe..250f7b986 100644
--- a/system/docbook-xsl/docbook-xsl.post-install
+++ b/system/docbook-xsl/docbook-xsl.post-install
@@ -9,21 +9,21 @@ _NEW=${1%-r[0-9]*}
xmlcatalog --noout --add "rewriteSystem" \
"http://docbook.sourceforge.net/release/xsl/${_NEW}" \
- "/usr/share/xml/docbook/xsl-stylesheets-${_NEW}" \
+ "/usr/share/xml/docbook/xsl-stylesheets" \
etc/xml/catalog
xmlcatalog --noout --add "rewriteURI" \
"http://docbook.sourceforge.net/release/xsl/${_NEW}" \
- "/usr/share/xml/docbook/xsl-stylesheets-${_NEW}" \
+ "/usr/share/xml/docbook/xsl-stylesheets" \
etc/xml/catalog &&
xmlcatalog --noout --add "rewriteSystem" \
"http://docbook.sourceforge.net/release/xsl/current" \
- "/usr/share/xml/docbook/xsl-stylesheets-${_NEW}" \
+ "/usr/share/xml/docbook/xsl-stylesheets" \
etc/xml/catalog &&
xmlcatalog --noout --add "rewriteURI" \
"http://docbook.sourceforge.net/release/xsl/current" \
- "/usr/share/xml/docbook/xsl-stylesheets-${_NEW}" \
+ "/usr/share/xml/docbook/xsl-stylesheets" \
etc/xml/catalog
diff --git a/system/docbook-xsl/docbook-xsl.post-upgrade b/system/docbook-xsl/docbook-xsl.post-upgrade
index d481480fc..5c82ae7d9 100644
--- a/system/docbook-xsl/docbook-xsl.post-upgrade
+++ b/system/docbook-xsl/docbook-xsl.post-upgrade
@@ -11,23 +11,27 @@ xmlcatalog --noout --del \
"/usr/share/xml/docbook/xsl-stylesheets-${_OLD}" \
etc/xml/catalog
+xmlcatalog --noout --del \
+ "/usr/share/xml/docbook/xsl-stylesheets" \
+ etc/xml/catalog
+
xmlcatalog --noout --add "rewriteSystem" \
"http://docbook.sourceforge.net/release/xsl/${_NEW}" \
- "/usr/share/xml/docbook/xsl-stylesheets-${_NEW}" \
+ "/usr/share/xml/docbook/xsl-stylesheets" \
etc/xml/catalog
xmlcatalog --noout --add "rewriteURI" \
"http://docbook.sourceforge.net/release/xsl/${_NEW}" \
- "/usr/share/xml/docbook/xsl-stylesheets-${_NEW}" \
+ "/usr/share/xml/docbook/xsl-stylesheets" \
etc/xml/catalog
xmlcatalog --noout --add "rewriteSystem" \
"http://docbook.sourceforge.net/release/xsl/current" \
- "/usr/share/xml/docbook/xsl-stylesheets-${_NEW}" \
+ "/usr/share/xml/docbook/xsl-stylesheets" \
etc/xml/catalog
xmlcatalog --noout --add "rewriteURI" \
"http://docbook.sourceforge.net/release/xsl/current" \
- "/usr/share/xml/docbook/xsl-stylesheets-${_NEW}" \
+ "/usr/share/xml/docbook/xsl-stylesheets" \
etc/xml/catalog
diff --git a/system/lddtree/APKBUILD b/system/lddtree/APKBUILD
index fc8fa2101..0780a4fd1 100644
--- a/system/lddtree/APKBUILD
+++ b/system/lddtree/APKBUILD
@@ -2,24 +2,17 @@
# Maintainer:
pkgname=lddtree
pkgver=1.26
-pkgrel=1
+pkgrel=2
pkgdesc="List dynamic dependencies as a tree"
url="https://github.com/ncopa/lddtree"
arch="noarch"
options="!check"
license="GPL-2.0-only"
-depends="scanelf"
-depends_dev=""
-makedepends="$depends_dev"
+depends="scanelf cmd:which"
+makedepends=""
replaces="pax-utils"
-install=""
subpackages=""
-source="lddtree-$pkgver.tar.gz::https://github.com/ncopa/lddtree/archive/v$pkgver.tar.gz
- "
-
-build() {
- return 0
-}
+source="lddtree-$pkgver.tar.gz::https://github.com/ncopa/lddtree/archive/v$pkgver.tar.gz"
package() {
cd "$builddir"
diff --git a/system/libssh2/APKBUILD b/system/libssh2/APKBUILD
index 69989c72f..383854b8f 100644
--- a/system/libssh2/APKBUILD
+++ b/system/libssh2/APKBUILD
@@ -7,6 +7,7 @@ pkgdesc="Library for accessing SSH servers"
url="https://libssh2.org/"
arch="all"
license="BSD-3-Clause"
+checkdepends="openssh-server"
makedepends="openssl-dev zlib-dev"
subpackages="$pkgname-dev $pkgname-doc"
source="https://www.libssh2.org/download/libssh2-$pkgver.tar.gz"
diff --git a/system/lvm2/APKBUILD b/system/lvm2/APKBUILD
index 8287d3813..f00157787 100644
--- a/system/lvm2/APKBUILD
+++ b/system/lvm2/APKBUILD
@@ -2,14 +2,14 @@
# Maintainer: Dan Theisen <djt@hxx.in>
pkgname=lvm2
pkgver=2.03.05
-pkgrel=0
+pkgrel=1
pkgdesc="Logical Volume Manager 2 utilities"
url="https://sourceware.org/lvm2/"
arch="all"
options="!check" # Test tries to use real /dev/mapper/control.
license="GPL-2.0+ AND LGPL-2.1-only"
# lvm2 will dlopen libs so we need to add explicit depend
-depends="lvm2-libs=$pkgver-r$pkgrel"
+depends="lvm2-libs=$pkgver-r$pkgrel util-linux"
depends_dev="linux-headers"
makedepends_build="coreutils libaio-dev"
makedepends_host="$depends_dev util-linux-dev"
@@ -17,7 +17,6 @@ makedepends="$makedepends_build $makedepends_host"
source="https://mirrors.kernel.org/sourceware/$pkgname/LVM2.$pkgver.tgz
fix-stdio-usage.patch
mallinfo.patch
- library_dir-default-config.patch
mlockall-default-config.patch
lvm.initd
lvm.confd
@@ -32,6 +31,7 @@ subpackages="
device-mapper-libs:dm_libs
device-mapper-event-libs:dm_event_libs
$pkgname-libs
+ $pkgname-udev
"
builddir="$srcdir/LVM2.$pkgver"
@@ -84,7 +84,7 @@ dm() {
libs() {
pkgdesc="LVM2 shared libraries"
- depends=
+ depends=""
mkdir -p "$subpkgdir"/lib
mv "$pkgdir"/lib/liblvm2*.so.* "$subpkgdir"/lib/
mv "$pkgdir"/lib/libdevmapper-event-lvm2*.so.* "$subpkgdir"/lib/
@@ -93,22 +93,31 @@ libs() {
dm_libs() {
pkgdesc="Device-mapper shared library"
- depends=
+ depends=""
mkdir -p "$subpkgdir"/lib
mv "$pkgdir"/lib/libdevmapper.so.* "$subpkgdir"/lib/
}
dm_event_libs() {
pkgdesc="Device-mapper event daemon shared library"
- depends=
+ depends=""
mkdir -p "$subpkgdir"/lib
mv "$pkgdir"/lib/libdevmapper-event.so.* "$subpkgdir"/lib/
}
+udev() {
+ pkgdesc="udev rules for LVM and device mapper"
+ install_if="$pkgname=$pkgver-r$pkgrel eudev"
+
+ make -C "$builddir"/udev
+ install -m644 -Dt "$subpkgdir"/lib/udev/rules.d/ \
+ "$builddir"/udev/*.rules
+}
+
+
sha512sums="3b00f53771e99faa6459ae73353bff06ae37c64bd2659586ec25d0bb43bc3ff8ba5f713c68617fd7662a5f6cb65bca1ad0aea554819048d79c1cce20bf67c50a LVM2.2.03.05.tgz
6ea4efad03f8632f2883f33f9d9f8ca295f7d8d2aa1bfbfa7738e7d711727a511758848dde5776b222bd74e6fb60bed8b56a3cd2f74ca448b8d86f50470a42b9 fix-stdio-usage.patch
9272ec8c5184ef5dc776ead8f74132e072b7563b5119a3a38b712f00d92a1e3878c9b3a54eb2b01dcba038110c686b39d4c17ecd0eb258537e9217d7ed03c408 mallinfo.patch
-33004594a5cce7af1e493a2a66ce8ad2f864dde3b2ec0960d0fda9df9b7bcf65d9455f9eccf7860f48726c48f14111b843b0a0c9bd395ef2952b41aaab8092b2 library_dir-default-config.patch
d190c40a137b006d7b63298069c93ff08d2804b990e85d44739cd7c48beec9a569903b98f0d940895fc7365723ba886acd7ef0e08f1f65a1a391d1c448ce080e mlockall-default-config.patch
a853078660fd2fd943538924f56e81dc5793294e26b8f61d93e6188893f15f4a438d33792b341c1865d61e03f4a371b7c7ee0db5f4130ef7cb7aeaeb9290086a lvm.initd
07caf8fa942290f3c953cc2463aaf55bac01d0bcb9351daf3880fa4d0eefb67fe00761c46a7a4da91cd2f8e492a12fed35853a15dc939cd80d19d3303bc3951d lvm.confd
diff --git a/system/lvm2/library_dir-default-config.patch b/system/lvm2/library_dir-default-config.patch
deleted file mode 100644
index 6e3b95832..000000000
--- a/system/lvm2/library_dir-default-config.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./conf/example.conf.in.orig
-+++ ./conf/example.conf.in
-@@ -694,6 +694,7 @@
- # Configuration option global/library_dir.
- # Search this directory first for shared libraries.
- # This configuration option does not have a default value defined.
-+ library_dir="/lib/device-mapper"
-
- # Configuration option global/locking_library.
- # The external locking library to use for locking_type 2.
diff --git a/system/perl-cpanel-json-xs/APKBUILD b/system/perl-cpanel-json-xs/APKBUILD
index 08b33c3e9..ef5094438 100644
--- a/system/perl-cpanel-json-xs/APKBUILD
+++ b/system/perl-cpanel-json-xs/APKBUILD
@@ -3,7 +3,7 @@
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-cpanel-json-xs
_pkgreal=Cpanel-JSON-XS
-pkgver=4.11
+pkgver=4.12
pkgrel=0
pkgdesc="cPanel's fork of JSON::XS, fast and correct serialising"
url="https://metacpan.org/release/Cpanel-JSON-XS"
@@ -40,4 +40,4 @@ package() {
find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
}
-sha512sums="a14fe211b769184c28d946b9e88d9a380331d6a16c67a0f286fb4bf0f25e2a3b80f3df907bdf1a7eceaa8a34e69f13b3296cc135bc1ea2d2fcba6355dcf88579 Cpanel-JSON-XS-4.11.tar.gz"
+sha512sums="8545095726d833d7404e8fc2a6e71a4f4b8e6c2f5d7d9939758bb8eb1ffcf33f28867a8e70fb1df995ec6c14eccde53c5c85fb6d3da2929337b15905d4195c5b Cpanel-JSON-XS-4.12.tar.gz"
diff --git a/system/perl-net-ssleay/APKBUILD b/system/perl-net-ssleay/APKBUILD
index ae01038ca..593eb4886 100644
--- a/system/perl-net-ssleay/APKBUILD
+++ b/system/perl-net-ssleay/APKBUILD
@@ -2,17 +2,17 @@
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-net-ssleay
_realname=Net-SSLeay
-pkgver=1.85
+pkgver=1.88
pkgrel=0
pkgdesc="Perl extension for using OpenSSL"
url="https://metacpan.org/release/Net-SSLeay"
arch="all"
-license="GPL-2.0-only OR Artistic-1.0-Perl"
+license="Artistic-2.0"
depends="perl"
makedepends="perl-dev openssl-dev zlib-dev"
checkdepends="perl-test-exception perl-test-warn perl-test-nowarnings"
subpackages="$pkgname-doc"
-source="https://search.cpan.org/CPAN/authors/id/M/MI/MIKEM/Net-SSLeay-$pkgver.tar.gz"
+source="https://cpan.metacpan.org/authors/id/C/CH/CHRISN/Net-SSLeay-$pkgver.tar.gz"
builddir="$srcdir/$_realname-$pkgver"
build() {
@@ -35,4 +35,4 @@ package() {
find "$pkgdir" -name perllocal.pod -delete
}
-sha512sums="74e0f2f56b707f1ff845c78c1fa7ce26a71b8f943bb99e994d4e065d1f42259fe4cd1a6a17d333459727534158f9541f116dbc8515122380807d9450b0faa26b Net-SSLeay-1.85.tar.gz"
+sha512sums="37fc32ec003337f3dc18bf928139079a3127628c6fa0fccaed0c27b6bf3b216c2c5338ed1aaf9408b0add3be549df3218d3c5a6d6299793c1329d8a0813a1682 Net-SSLeay-1.88.tar.gz"
diff --git a/system/vim/APKBUILD b/system/vim/APKBUILD
index 4399681eb..aecdbcc4a 100644
--- a/system/vim/APKBUILD
+++ b/system/vim/APKBUILD
@@ -4,7 +4,7 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
pkgname=vim
-pkgver=8.1.1583
+pkgver=8.1.1635
pkgrel=0
pkgdesc="advanced text editor"
url="https://www.vim.org"
@@ -81,6 +81,6 @@ vimdiff() {
mv "$pkgdir"/usr/bin/vimdiff "$subpkgdir"/usr/bin
}
-sha512sums="ad66bfc031f61d652fe6700656416b3d5d708cc7407bc45c757ce89d1346ba5fc597a2623d7593b819626076f7a74179d768ac425fa5b145a5de0fb27a6474a1 vim-8.1.1583.tar.gz
+sha512sums="41b79ff52438ecbf56366696d3a12d34531a835b64d2ea809597797531950f2f8eb73d753375d23e1411631afaa3f9413fad8af7b0a1fed1532a1714ec1dbb4b vim-8.1.1635.tar.gz
12ee3f96c94d74215159fba379ed61907ec5982a9f1643575dcb7c3d5e30824665d683de95f97b5067718b3f2a1238fb7534a70803bc170614498ad026f352d8 vimrc
16026a3ed3e080b3f8281948579ab678e9acd724ad594463279712fbf1024bcd923155a133bd08118848d2c6cdf11c69489d85b1c7438f60b4c279094714d181 no-default-mouse.patch"
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-10-21 05:15:14 +0000