summaryrefslogtreecommitdiff
path: root/user
diff options
context:
space:
mode:
authorA. Wilcox <awilcox@wilcox-tech.com>2020-09-28 00:39:29 +0000
committerA. Wilcox <awilcox@wilcox-tech.com>2020-09-28 00:39:29 +0000
commitde0d755b388a126132db106b636917357cfb81ec (patch)
treea2c71cfb18766cb6b588012f9bb69b1e78c2909d /user
parentf4d6f1cb36ca25b976488021ac0458c8f1df6c85 (diff)
parentb2b6da629119ac3ae061a842a42ea5074dc16106 (diff)
downloadpackages-de0d755b388a126132db106b636917357cfb81ec.tar.gz
packages-de0d755b388a126132db106b636917357cfb81ec.tar.bz2
packages-de0d755b388a126132db106b636917357cfb81ec.tar.xz
packages-de0d755b388a126132db106b636917357cfb81ec.zip
Merge branch 'smaeul-bumps' into 'master'
Bumps of my maintained packages See merge request adelie/packages!499
Diffstat (limited to 'user')
-rw-r--r--user/gprbuild/APKBUILD14
-rw-r--r--user/sntpd/APKBUILD19
-rw-r--r--user/sntpd/select.patch8
3 files changed, 18 insertions, 23 deletions
diff --git a/user/gprbuild/APKBUILD b/user/gprbuild/APKBUILD
index 4ffe06950..9400b0400 100644
--- a/user/gprbuild/APKBUILD
+++ b/user/gprbuild/APKBUILD
@@ -1,8 +1,8 @@
# Maintainer: Samuel Holland <samuel@sholland.org>
pkgname=gprbuild
-pkgver=2019
-_pkgver=2019-20190517-194D8
-_xmlver=2019-20190429-19B9D
+pkgver=2020
+_pkgver=2020-20200814-19ABE
+_xmlver=2020-20200814-19BC4
pkgrel=0
pkgdesc="An advanced build system for multi-language systems"
url="https://github.com/AdaCore/gprbuild"
@@ -11,8 +11,8 @@ options="!check" # No test suite.
license="GPL-3.0+"
depends=""
makedepends="gcc-gnat"
-source="https://distfiles.adelielinux.org/source/$pkgname-$_pkgver-src.tar.gz
- https://distfiles.adelielinux.org/source/xmlada-$_xmlver-src.tar.gz
+source="$pkgname-$_pkgver-src.tar.gz::https://community.download.adacore.com/v1/4e13d41920eac86fd139b5d7984eb908d697d868?filename=$pkgname-$_pkgver-src.tar.gz
+ xmlada-$_xmlver-src.tar.gz::https://community.download.adacore.com/v1/9cf1ab59b526d1260e007fa9719126c5498632d2?filename=xmlada-$_xmlver-src.tar.gz
foxkit.xml
"
builddir="$srcdir/$pkgname-$_pkgver-src"
@@ -47,6 +47,6 @@ package() {
"$pkgdir"/usr/share/gprconfig
}
-sha512sums="0388d7e6cdf625fef40b33da764091b3283dd88714c64ecfad4b5e99253f183b1a9b717c19281e6d45cc4277a05fadb2e2ace394d6f30638664b66c97123052b gprbuild-2019-20190517-194D8-src.tar.gz
-f8e0e25b0aee9a7a18223ae7761603082af55134f062c767d0cd0dbf0dbcb2058fc7c57532b567fb2c6efa464a53ead57b300578e98962025866e5c3ad73e380 xmlada-2019-20190429-19B9D-src.tar.gz
+sha512sums="cd9cb2a1f7867f17a5b69d8500476f3a97ca4856b171344d3bf887f55a4860d0ae32ec89ad82e9c7cec13fa20e58cd8ab890554115774095111ed38f9760050e gprbuild-2020-20200814-19ABE-src.tar.gz
+51365bc1baaa0886caf46d75d3d27d56b37d5a02f04673321a60bda14a2adda0edd43321f8b34583d4aeaf852f4a21a924f841899c458076b3f261d881bb29a1 xmlada-2020-20200814-19BC4-src.tar.gz
e369c094963d3dcfb03d7ac0949825531bae6410ef9c4bec774cb0da70d2bd4a784bdec37db5151c0371ce769712ee02fc04f36896ccc8bddcdb585c1ee8dbbc foxkit.xml"
diff --git a/user/sntpd/APKBUILD b/user/sntpd/APKBUILD
index d15fbff92..5171813e7 100644
--- a/user/sntpd/APKBUILD
+++ b/user/sntpd/APKBUILD
@@ -1,24 +1,17 @@
# Maintainer: Samuel Holland <samuel@sholland.org>
pkgname=sntpd
-pkgver=3.0_git20190119
-_commit=7e372536855687f0af3c7ddde5fcb965b93d5d1e
+pkgver=3.0
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"
+makedepends=""
subpackages="$pkgname-doc"
-source="$pkgname-$pkgver.tar.gz::https://github.com/troglobit/sntpd/archive/$_commit.tar.gz
+source="https://github.com/troglobit/sntpd/releases/download/v$pkgver/$pkgname-$pkgver.tar.gz
select.patch
"
-builddir="$srcdir/$pkgname-$_commit"
-
-prepare() {
- default_prepare
- autoreconf -vif
-}
build() {
./configure \
@@ -31,6 +24,8 @@ build() {
--localstatedir=/var \
--disable-debug \
--enable-replay \
+ --with-adjtimex \
+ --with-ntpclient \
--without-systemd
make
}
@@ -43,5 +38,5 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="49a9d16c2aef82c3d009f3e5678763d440764c67e4d7b27b07deac71ae9cb6d3b64a0991d3a79904b397441d9ce480287bb022d5e466fc99bbc393dc9d79b2a5 sntpd-3.0_git20190119.tar.gz
-09ddc920bdbb00480859a8e9cd7b06bcfe73a6d51d070dde6bf78038bae11092fff9c72a401e1a3d7e3e6f6dcd1bdb6cec3b025ccc07608a8feb0ddaa854c678 select.patch"
+sha512sums="664e95e590b329dc847275c99829711c159bf91fadb2a90989c2706fbd8b074480146a7a05c5532a1bbfcaebd4b489262a44e418fa8ac57362c4f7db659fd1ea sntpd-3.0.tar.gz
+966ae71a41f31b37b0be8dc361471f72d085ca06161deeedc37cc82d6b80852ca79b37bfc8f9948988bedaeba6a77a0b4edf19848a12e8107ec13ab86524c5dd select.patch"
diff --git a/user/sntpd/select.patch b/user/sntpd/select.patch
index 00121d80b..f0e25055a 100644
--- a/user/sntpd/select.patch
+++ b/user/sntpd/select.patch
@@ -1,10 +1,10 @@
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()");
+--- sntpd-3.0/src/sntpd.c
++++ sntpd-3.0/src/sntpd.c
+@@ -663,7 +663,7 @@ static void loop(struct ntp_control *ntpc)
continue;
}
+
- if (to.tv_sec == 0) {
+ if (1) {
if (probes_sent >= ntpc->probe_count && ntpc->probe_count != 0)