diff options
Diffstat (limited to 'system')
| -rw-r--r-- | system/cryptsetup/APKBUILD | 2 | ||||
| -rw-r--r-- | system/git/APKBUILD | 4 | ||||
| -rw-r--r-- | system/json-c/APKBUILD | 46 | ||||
| -rw-r--r-- | system/json-c/fix-libdir.patch | 11 | ||||
| -rw-r--r-- | system/ncurses/APKBUILD | 29 |
5 files changed, 36 insertions, 56 deletions
diff --git a/system/cryptsetup/APKBUILD b/system/cryptsetup/APKBUILD index f9d5dab28..1786fbb0d 100644 --- a/system/cryptsetup/APKBUILD +++ b/system/cryptsetup/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: pkgname=cryptsetup pkgver=2.3.4 -pkgrel=0 +pkgrel=1 pkgdesc="Utility for setting up encrypted filesystems" url="https://gitlab.com/cryptsetup/cryptsetup" arch="all" diff --git a/system/git/APKBUILD b/system/git/APKBUILD index 646c48434..7a2b458b1 100644 --- a/system/git/APKBUILD +++ b/system/git/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Łukasz Jendrysik <scadu@yandex.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=git -pkgver=2.29.1 +pkgver=2.29.2 pkgrel=0 pkgdesc="Distributed version control system" url="https://www.git-scm.com/" @@ -165,7 +165,7 @@ subtree() { make install prefix=/usr DESTDIR="$subpkgdir" } -sha512sums="4c72afd33a83b93769bdd16350925f4776a2c92bdbffd951bf8b0bb0fc6a474b3f54b08fc4252cc5b1a029d9d21e1f8993d49e991af89ee9b676c6d18d696822 git-2.29.1.tar.xz +sha512sums="34117628c6d43ac0940c43bffaa1bda7f12af863728f391492725a3e57d1bbda523cf7734e90f463fe9a9ae4e70fc1cc2523643dbb3c27377d98dc4736b0ea62 git-2.29.2.tar.xz 0a0935d876024d96156df3aeec06b47fd9e370484d4552786c450cb500ae671a631e64c30994ec39f43a2f313f75d68909688ea92b47327d1af65e365dc77480 dont-test-other-encodings.patch 89528cdd14c51fd568aa61cf6c5eae08ea0844e59f9af9292da5fc6c268261f4166017d002d494400945e248df6b844e2f9f9cd2d9345d516983f5a110e4c42a git-daemon.initd fbf1f425206a76e2a8f82342537ed939ff7e623d644c086ca2ced5f69b36734695f9f80ebda1728f75a94d6cd2fcb71bf845b64239368caab418e4d368c141ec git-daemon.confd" diff --git a/system/json-c/APKBUILD b/system/json-c/APKBUILD index 32ee431dd..c05a7d9b7 100644 --- a/system/json-c/APKBUILD +++ b/system/json-c/APKBUILD @@ -1,52 +1,36 @@ # Maintainer: pkgname=json-c -pkgver=0.13.1 -pkgrel=1 +pkgver=0.15 +pkgrel=0 pkgdesc="A JSON implementation in C" url="https://github.com/json-c/json-c/wiki" arch="all" license="MIT" depends="" -makedepends="autoconf automake libtool" -subpackages="$pkgname-static $pkgname-dev" +makedepends="cmake doxygen" +subpackages="$pkgname-dev" source="https://s3.amazonaws.com/${pkgname}_releases/releases/$pkgname-${pkgver}.tar.gz - fix-libdir.patch " -prepare() { - default_prepare - autoreconf -f -v -i -} +# secfixes: +# 0.15-r0: +# - CVE-2020-12762 build() { - export CFLAGS="${CFLAGS} -Wno-error=unused-but-set-variable" - ./configure --prefix=/usr \ - --build=$CBUILD \ - --host=$CHOST \ - --libdir=/lib \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --infodir=/usr/share/info \ - --localstatedir=/var \ - --enable-shared \ - ac_cv_func_malloc_0_nonnull=yes \ - ac_cv_func_realloc_0_nonnull=yes - make -j1 + cmake -B "$builddir" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=ON + make + make doc } check() { - make check + make test } package() { make -j1 DESTDIR="$pkgdir" install } -static() { - pkgdesc="Static JSON C library" - mkdir -p "$subpkgdir"/lib - mv "$pkgdir"/lib/*.a "$subpkgdir"/lib/ -} - -sha512sums="e984db2a42b9c95b52c798b2e8dd1b79951a8dcba27370af30c43b9549fbb00008dbcf052a535c528209aaee38e6d1f760168b706905ae72f3e704ed20f8a1a1 json-c-0.13.1.tar.gz -939f2b02fe5beb5d85ebc3fd8463bee0cff6b7da98b48edb599e88dda7955b6ba65afc17f9e828025086a1b384aa99703be06b6613e405d9c48541cf52c380f0 fix-libdir.patch" +sha512sums="dc01298bcc78f0f31a34f5fcfe45c0feebfd88518e97fb4f96f1a652f71ccdd303415a4c7bf5b573bdcbcca80428281f0dfccefc6545ea3a7f18dbb819332f34 json-c-0.15.tar.gz" diff --git a/system/json-c/fix-libdir.patch b/system/json-c/fix-libdir.patch deleted file mode 100644 index bf69168e7..000000000 --- a/system/json-c/fix-libdir.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- json-c-0.13.1/Makefile.am.old 2018-03-06 04:13:22.000000000 +0000 -+++ json-c-0.13.1/Makefile.am 2018-07-19 02:12:00.270000000 +0000 -@@ -14,7 +14,7 @@ - - lib_LTLIBRARIES = libjson-c.la - --pkgconfigdir = $(libdir)/pkgconfig -+pkgconfigdir = /usr/lib/pkgconfig - pkgconfig_DATA = json-c.pc - - libjson_cincludedir = $(includedir)/json-c diff --git a/system/ncurses/APKBUILD b/system/ncurses/APKBUILD index 73f5d922b..d2ad46900 100644 --- a/system/ncurses/APKBUILD +++ b/system/ncurses/APKBUILD @@ -2,7 +2,7 @@ pkgname=ncurses pkgver=6.2 _ver=${pkgver}-20200212 -pkgrel=0 +pkgrel=1 pkgdesc="Console display library" url="https://invisible-island.net/ncurses/ncurses.html" arch="all" @@ -12,9 +12,9 @@ depends="" makedepends_build="ncurses" subpackages="$pkgname-static $pkgname-dev $pkgname-doc $pkgname-libs $pkgname-terminfo-base:base:noarch $pkgname-terminfo:terminfo:noarch" -source="https://mirrormaster.adelielinux.org/source/upstream/ncurses-$_ver.tgz" - -builddir="$srcdir"/ncurses-$_ver +source="https://distfiles.adelielinux.org/source/upstream/$pkgname-$_ver.tgz + " +builddir="$srcdir/$pkgname-$_ver" # secfixes: # 6.0_p20171125-r0: @@ -48,16 +48,23 @@ package() { # Install basic terms in /etc/terminfo for i in ansi console dumb linux rxvt screen sun vt52 vt100 vt102 \ - vt200 vt220 xterm xterm-color xterm-xfree86; do - local termfile="$(find "$pkgdir"/usr/share/terminfo/ -name "$i" 2>/dev/null)" + vt200 vt220 xterm xterm-color xterm-xfree86 xterm-256color \ + alacritty tmux tmux-256color terminator 'terminology*' \ + vte vte-256color gnome gnome-256color kitty konsole konsole-256color \ + konsole-linux putty putty-256color rxvt-256color 'st-*' \ + screen-256color; do + local termfiles="$(find "$pkgdir"/usr/share/terminfo/ -name "$i" 2>/dev/null)" local basedir="$(basename $(dirname "$termfile"))" - [ -z "$termfile" ] && continue - + [ -z "$termfiles" ] && continue + + for termfile in $termfiles; do + local basedir=$(basename "$(dirname "$termfile")") install -d "$pkgdir"/etc/terminfo/$basedir - mv ${termfile} "$pkgdir"/etc/terminfo/$basedir/ - ln -s ../../../../etc/terminfo/$basedir/$i \ - "$pkgdir"/usr/share/terminfo/$basedir/$i + mv "$termfile" "$pkgdir"/etc/terminfo/$basedir/ + ln -s ../../../../etc/terminfo/$basedir/${termfile##*/} \ + "$pkgdir"/usr/share/terminfo/$basedir/${termfile##*/} + done done } |