summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--legacy/paxmark/APKBUILD (renamed from system/paxmark/APKBUILD)0
-rw-r--r--legacy/paxmark/paxmark (renamed from system/paxmark/paxmark)0
-rw-r--r--system/pcre2/APKBUILD2
-rw-r--r--system/sudo/APKBUILD6
-rw-r--r--user/cloc/APKBUILD30
-rw-r--r--user/emacs/APKBUILD2
-rw-r--r--user/libpcap/APKBUILD9
-rw-r--r--user/openjdk8/APKBUILD1
-rw-r--r--user/perl-parallel-forkmanager/APKBUILD31
-rw-r--r--user/perl-regexp-common/APKBUILD31
-rw-r--r--user/sntpd/APKBUILD47
-rw-r--r--user/sntpd/select.patch12
-rw-r--r--user/tcpdump/APKBUILD38
-rw-r--r--user/tcpdump/CVE-2017-16808.patch26
14 files changed, 196 insertions, 39 deletions
diff --git a/system/paxmark/APKBUILD b/legacy/paxmark/APKBUILD
index 3c9c69400..3c9c69400 100644
--- a/system/paxmark/APKBUILD
+++ b/legacy/paxmark/APKBUILD
diff --git a/system/paxmark/paxmark b/legacy/paxmark/paxmark
index 87a84f4f7..87a84f4f7 100644
--- a/system/paxmark/paxmark
+++ b/legacy/paxmark/paxmark
diff --git a/system/pcre2/APKBUILD b/system/pcre2/APKBUILD
index ef1fa1492..7bca0e450 100644
--- a/system/pcre2/APKBUILD
+++ b/system/pcre2/APKBUILD
@@ -9,7 +9,7 @@ arch="all"
license="BSD-3-Clause"
depends=""
depends_dev="libedit-dev zlib-dev"
-makedepends="$depends_dev paxmark"
+makedepends="$depends_dev"
subpackages="$pkgname-dev $pkgname-doc $pkgname-tools
libpcre2-16:_libpcre libpcre2-32:_libpcre"
source="https://ftp.pcre.org/pub/pcre/$pkgname-$pkgver.tar.gz"
diff --git a/system/sudo/APKBUILD b/system/sudo/APKBUILD
index 6b8685d86..2cb62343a 100644
--- a/system/sudo/APKBUILD
+++ b/system/sudo/APKBUILD
@@ -9,7 +9,7 @@ if [ "${pkgver%_*}" != "$pkgver" ]; then
else
_realver=$pkgver
fi
-pkgrel=0
+pkgrel=1
pkgdesc="Give certain users the ability to run some commands as root"
url="https://www.sudo.ws/sudo/"
arch="all"
@@ -42,7 +42,9 @@ build() {
--with-env-editor \
--with-pam \
--without-skey \
- --with-passprompt="[sudo] Password for %p: "
+ --with-passprompt="[sudo] Password for %p: " \
+ --with-insults=disabled \
+ --with-all-insults
make
}
diff --git a/user/cloc/APKBUILD b/user/cloc/APKBUILD
new file mode 100644
index 000000000..ede81a9c5
--- /dev/null
+++ b/user/cloc/APKBUILD
@@ -0,0 +1,30 @@
+# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+pkgname=cloc
+pkgver=1.84
+pkgrel=0
+pkgdesc="Perl utility for counting lines of code in various languages"
+url="https://github.com/AlDanial/cloc"
+arch="all"
+license="GPL-2.0+"
+depends="perl perl-regexp-common perl-algorithm-diff"
+checkdepends="perl-parallel-forkmanager"
+subpackages="$pkgname-doc"
+source="https://github.com/AlDanial/cloc/releases/download/$pkgver/cloc-$pkgver.tar.gz"
+
+build() {
+ cd Unix
+ make DESTDIR="$pkgdir" doc
+}
+
+check() {
+ cd Unix
+ make DESTDIR="$pkgdir" test-perl
+}
+
+package() {
+ cd Unix
+ make DESTDIR="$pkgdir" install
+}
+
+sha512sums="cfcc1854d7f3257bcd66f13b1053a856ae31acc35f94537e20cbb341ab256390bded1f00ff6b1ce2bc60a1a69379b6915d398297e2f878bc4eea190c59b22669 cloc-1.84.tar.gz"
diff --git a/user/emacs/APKBUILD b/user/emacs/APKBUILD
index 9f02d79a6..a1db01ae7 100644
--- a/user/emacs/APKBUILD
+++ b/user/emacs/APKBUILD
@@ -9,7 +9,7 @@ options="!check !dbg"
url="https://www.gnu.org/software/emacs/"
license="GPL-3.0+"
depends="emacs-nox"
-makedepends="autoconf automake linux-headers paxmark
+makedepends="autoconf automake linux-headers
librsvg-dev giflib-dev libxpm-dev gtk+2.0-dev gconf-dev alsa-lib-dev
glib-dev fontconfig-dev libpng-dev
libxml2-dev pango-dev tiff-dev libjpeg-turbo-dev ncurses-dev
diff --git a/user/libpcap/APKBUILD b/user/libpcap/APKBUILD
index 77512f900..714e098f2 100644
--- a/user/libpcap/APKBUILD
+++ b/user/libpcap/APKBUILD
@@ -14,6 +14,15 @@ source="http://www.tcpdump.org/release/$pkgname-$pkgver.tar.gz
add-missing-header.patch
"
+# secfixes:
+# 1.9.1-r0:
+# - CVE-2018-16301
+# - CVE-2019-15161
+# - CVE-2019-15162
+# - CVE-2019-15163
+# - CVE-2019-15164
+# - CVE-2019-15165
+
build() {
./configure \
--build=$CBUILD \
diff --git a/user/openjdk8/APKBUILD b/user/openjdk8/APKBUILD
index 8ac3960b4..4861c4f9b 100644
--- a/user/openjdk8/APKBUILD
+++ b/user/openjdk8/APKBUILD
@@ -168,7 +168,6 @@ build() {
--with-jdk-src-zip="$srcdir/jdk-$_dropsver.tar.xz" \
--with-langtools-src-zip="$srcdir/langtools-$_dropsver.tar.xz" \
--with-nashorn-src-zip="$srcdir/nashorn-$_dropsver.tar.xz" \
- --with-pax=paxmark \
--with-jdk-home="$_bootstrap_java_home" \
--with-pkgversion="Adelie ${pkgver}-r${pkgrel}" \
--enable-nss \
diff --git a/user/perl-parallel-forkmanager/APKBUILD b/user/perl-parallel-forkmanager/APKBUILD
new file mode 100644
index 000000000..77fe566db
--- /dev/null
+++ b/user/perl-parallel-forkmanager/APKBUILD
@@ -0,0 +1,31 @@
+# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Maintainer: Adelie Perl Team <adelie-perl@lists.adelielinux.org>
+pkgname=perl-parallel-forkmanager
+pkgver=2.02
+pkgrel=0
+pkgdesc="Perl library for managing fork()-based parallelization"
+url="https://metacpan.org/pod/Parallel::ForkManager"
+arch="noarch"
+license="Artistic-1.0-Perl OR GPL-2.0-only"
+depends="perl perl-moo"
+checkdepends="perl-test-warn"
+makedepends=""
+subpackages="$pkgname-doc"
+source="https://cpan.metacpan.org/authors/id/Y/YA/YANICK/Parallel-ForkManager-$pkgver.tar.gz"
+builddir="$srcdir/Parallel-ForkManager-$pkgver"
+
+build() {
+ PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+ make
+}
+
+check() {
+ make test
+}
+
+package() {
+ make DESTDIR="$pkgdir" install
+ find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
+}
+
+sha512sums="2b390ec8f252e7bf2b6be8d602b231b1fd347bc5256bf7f16a6d56f67256938f3d96b7a28c92c662d8b91441b7fa4cb5922c655e64a7a4a9332eb58f19b6bcfb Parallel-ForkManager-2.02.tar.gz"
diff --git a/user/perl-regexp-common/APKBUILD b/user/perl-regexp-common/APKBUILD
new file mode 100644
index 000000000..91cff6808
--- /dev/null
+++ b/user/perl-regexp-common/APKBUILD
@@ -0,0 +1,31 @@
+# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Maintainer: Adelie Perl Team <adelie-perl@lists.adelielinux.org>
+pkgname=perl-regexp-common
+_pkgname=Regexp-Common
+pkgver=2017060201
+pkgrel=0
+pkgdesc="Perl library for common regular expression utilities"
+url="https://metacpan.org/pod/Regexp::Common"
+arch="noarch"
+license="Artistic-1.0-Perl OR Artistic-2.0 OR BSD-3-Clause OR MIT"
+depends="perl"
+makedepends=""
+subpackages="$pkgname-doc"
+source="https://cpan.metacpan.org/authors/id/A/AB/ABIGAIL/Regexp-Common-$pkgver.tar.gz"
+builddir="$srcdir/Regexp-Common-$pkgver"
+
+build() {
+ PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+ make
+}
+
+check() {
+ make test
+}
+
+package() {
+ make DESTDIR="$pkgdir" install
+ find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
+}
+
+sha512sums="fd046d775214bdca42f868557559595360b069121a75fc119f45e064091000968d9d84154f8a0f06072ecff169dccecf68be58f99a7196932fcb4ffcbd678608 Regexp-Common-2017060201.tar.gz"
diff --git a/user/sntpd/APKBUILD b/user/sntpd/APKBUILD
new file mode 100644
index 000000000..d15fbff92
--- /dev/null
+++ b/user/sntpd/APKBUILD
@@ -0,0 +1,47 @@
+# Maintainer: Samuel Holland <samuel@sholland.org>
+pkgname=sntpd
+pkgver=3.0_git20190119
+_commit=7e372536855687f0af3c7ddde5fcb965b93d5d1e
+pkgrel=0
+pkgdesc="A small SNTP client for UNIX systems, implementing RFC 1305 and RFC 4330"
+url="https://github.com/troglobit/sntpd"
+arch="all"
+license="GPL-2.0-only"
+depends=""
+makedepends="autoconf automake"
+subpackages="$pkgname-doc"
+source="$pkgname-$pkgver.tar.gz::https://github.com/troglobit/sntpd/archive/$_commit.tar.gz
+ select.patch
+ "
+builddir="$srcdir/$pkgname-$_commit"
+
+prepare() {
+ default_prepare
+ autoreconf -vif
+}
+
+build() {
+ ./configure \
+ --build=$CBUILD \
+ --host=$CHOST \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --mandir=/usr/share/man \
+ --infodir=/usr/share/info \
+ --localstatedir=/var \
+ --disable-debug \
+ --enable-replay \
+ --without-systemd
+ make
+}
+
+check() {
+ make check
+}
+
+package() {
+ make DESTDIR="$pkgdir" install
+}
+
+sha512sums="49a9d16c2aef82c3d009f3e5678763d440764c67e4d7b27b07deac71ae9cb6d3b64a0991d3a79904b397441d9ce480287bb022d5e466fc99bbc393dc9d79b2a5 sntpd-3.0_git20190119.tar.gz
+09ddc920bdbb00480859a8e9cd7b06bcfe73a6d51d070dde6bf78038bae11092fff9c72a401e1a3d7e3e6f6dcd1bdb6cec3b025ccc07608a8feb0ddaa854c678 select.patch"
diff --git a/user/sntpd/select.patch b/user/sntpd/select.patch
new file mode 100644
index 000000000..00121d80b
--- /dev/null
+++ b/user/sntpd/select.patch
@@ -0,0 +1,12 @@
+select(3) does not modify its timeout in musl, as permitted by POSIX
+--- sntpd-7e372536855687f0af3c7ddde5fcb965b93d5d1e/src/sntpd.c
++++ sntpd-7e372536855687f0af3c7ddde5fcb965b93d5d1e/src/sntpd.c
+@@ -686,7 +686,7 @@ static void primary_loop(int usd, struct ntp_control *ntpc)
+ ERR(errno, "Failed select()");
+ continue;
+ }
+- if (to.tv_sec == 0) {
++ if (1) {
+ if (probes_sent >= ntpc->probe_count && ntpc->probe_count != 0)
+ break;
+
diff --git a/user/tcpdump/APKBUILD b/user/tcpdump/APKBUILD
index d273d4acc..f39d5c9d5 100644
--- a/user/tcpdump/APKBUILD
+++ b/user/tcpdump/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Dan Theisen <djt@hxx.in>
pkgname=tcpdump
-pkgver=4.9.2
-pkgrel=2
+pkgver=4.9.3
+pkgrel=0
pkgdesc="A tool for network monitoring and data acquisition"
url="http://www.tcpdump.org"
arch="all"
@@ -11,7 +11,6 @@ depends=""
makedepends="libpcap-dev openssl-dev perl"
subpackages="$pkgname-doc"
source="http://www.tcpdump.org/release/$pkgname-$pkgver.tar.gz
- CVE-2017-16808.patch
CVE-2018-19519.patch
"
@@ -20,9 +19,35 @@ source="http://www.tcpdump.org/release/$pkgname-$pkgver.tar.gz
# - CVE-2018-19519
# 4.9.2-r2:
# - CVE-2017-16808
+# 4.9.3-r0:
+# - CVE-2018-10103
+# - CVE-2018-10105
+# - CVE-2018-14461
+# - CVE-2018-14462
+# - CVE-2018-14463
+# - CVE-2018-14464
+# - CVE-2018-14465
+# - CVE-2018-14466
+# - CVE-2018-14467
+# - CVE-2018-14468
+# - CVE-2018-14469
+# - CVE-2018-14470
+# - CVE-2018-14879
+# - CVE-2018-14880
+# - CVE-2018-14881
+# - CVE-2018-14882
+# - CVE-2018-16227
+# - CVE-2018-16228
+# - CVE-2018-16229
+# - CVE-2018-16230
+# - CVE-2018-16300
+# - CVE-2018-16301
+# - CVE-2018-16451
+# - CVE-2018-16452
+# - CVE-2019-15166
+# - CVE-2019-15167
build () {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -34,16 +59,13 @@ build () {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
rm -f "$pkgdir"/usr/sbin/tcpdump.4*
}
-sha512sums="e1bc19a5867d6e3628f3941bdf3ec831bf13784f1233ca1bccc46aac1702f47ee9357d7ff0ca62cddf211b3c8884488c21144cabddd92c861e32398cd8f7c44b tcpdump-4.9.2.tar.gz
-d7f4761bee96ec69cdb93602ea59518f238089967d1ede4e91d139febe0ffe0818d49ad19b96c741a379938c369952405dadd3be2766b6524c43c70066cb4fc4 CVE-2017-16808.patch
+sha512sums="3aec673f78b996a4df884b1240e5d0a26a2ca81ee7aca8a2e6d50255bb53476e008a5ced4409e278a956710d8a4d31d85bbb800c9f1aab92b0b1046b59292a22 tcpdump-4.9.3.tar.gz
eb4232e434064ec59b07840aa394cfcc05c89e817f2d4ebeb4da1dbb1c910fe1805857356d6304ebdb16e32aa6476ce90f164aabc60501b493fd5601b380af7e CVE-2018-19519.patch"
diff --git a/user/tcpdump/CVE-2017-16808.patch b/user/tcpdump/CVE-2017-16808.patch
deleted file mode 100644
index 6b41aad8c..000000000
--- a/user/tcpdump/CVE-2017-16808.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 28f610026d901660dd370862b62ec328727446a2 Mon Sep 17 00:00:00 2001
-From: Denis Ovsienko <denis@ovsienko.info>
-Date: Thu, 31 Aug 2017 21:15:37 +0100
-Subject: [PATCH] CVE-2017-16808/AoE: Add a missing bounds check.
-
-In aoev1_reserve_print() check bounds before trying to print an Ethernet
-address.
-
-This fixes a buffer over-read discovered by Bhargava Shastry,
-SecT/TU Berlin.
----
- print-aoe.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/print-aoe.c b/print-aoe.c
-index 97e93df2e..2c78a55d3 100644
---- a/print-aoe.c
-+++ b/print-aoe.c
-@@ -325,6 +325,7 @@ aoev1_reserve_print(netdissect_options *ndo,
- goto invalid;
- /* addresses */
- for (i = 0; i < nmacs; i++) {
-+ ND_TCHECK2(*cp, ETHER_ADDR_LEN);
- ND_PRINT((ndo, "\n\tEthernet Address %u: %s", i, etheraddr_string(ndo, cp)));
- cp += ETHER_ADDR_LEN;
- }
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-02 18:45:12 +0000