diff options
| author | Carlo Landmeter <clandmeter@gmail.com> | 2016-08-11 15:46:16 +0000 |
|---|---|---|
| committer | Carlo Landmeter <clandmeter@gmail.com> | 2016-08-11 15:46:29 +0000 |
| commit | fd66cecfa78189e78c52742a9f601dd6475830e1 (patch) | |
| tree | e3d2f1f7f66d6534bc292a07b5e3aff6572f676f /main/tlsdate | |
| parent | 70cf6f6408691a3881bb5966c19157afa4295565 (diff) | |
| download | aports-fd66cecfa78189e78c52742a9f601dd6475830e1.tar.bz2 aports-fd66cecfa78189e78c52742a9f601dd6475830e1.tar.xz | |
main/tlsdate: build fix for aarch64
Diffstat (limited to 'main/tlsdate')
| -rw-r--r-- | main/tlsdate/APKBUILD | 38 | ||||
| -rw-r--r-- | main/tlsdate/tlsdate-add-secondary-archs.patch | 37 |
2 files changed, 51 insertions, 24 deletions
diff --git a/main/tlsdate/APKBUILD b/main/tlsdate/APKBUILD index c377444b89..84cd66ba46 100644 --- a/main/tlsdate/APKBUILD +++ b/main/tlsdate/APKBUILD @@ -18,22 +18,13 @@ source="tlsdate-${pkgver}.tar.gz::https://github.com/ioerror/tlsdate/tarball/tls tlsdate.initd tlsdated.confd tlsdated.initd + tlsdate-add-secondary-archs.patch " -_builddir="$srcdir/tlsdate-${pkgver}" -prepare() { - local i - mv $srcdir/ioerror-tlsdate-* "$srcdir/tlsdate-${pkgver}" - cd "$_builddir" - for i in $source; do - case $i in - *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; - esac - done -} +builddir="$srcdir"/ioerror-tlsdate-ae33169 build() { - cd "$_builddir" + cd "$builddir" autoreconf --install ./configure \ --build=$CBUILD \ @@ -48,30 +39,29 @@ build() { } package() { - cd "$_builddir" + cd "$builddir" make install DESTDIR="$pkgdir" || return 1 - for i in $source; do - case "$i" in - *.initd) install -Dm755 "$srcdir"/$i "$pkgdir"/etc/init.d/$i \ - || return 1;; - *.confd) install -Dm644 "$srcdir"/$i "$pkgdir"/etc/conf.d/$i \ - || return 1;; - esac - done + install -Dm755 "$srcdir"/tlsdate.initd "$pkgdir"/etc/init.d/tlsdate + install -Dm644 "$srcdir"/tlsdate.confd "$pkgdir"/etc/conf.d/tlsdate + install -Dm755 "$srcdir"/tlsdated.initd "$pkgdir"/etc/init.d/tlsdated + install -Dm644 "$srcdir"/tlsdated.confd "$pkgdir"/etc/conf.d/tlsdated } md5sums="0c854eb5d54535540e7e953aed9589c6 tlsdate-0.0.13.tar.gz 18b3d4a8153a7d61fbd499a1d3a97231 tlsdate.confd ee0e2f5ba3d5aa1ed12995c9af61022f tlsdate.initd 53e956dbaf6b67c408c080e6b9f2f3a5 tlsdated.confd -e636192886e247c9144df9a747902a59 tlsdated.initd" +e636192886e247c9144df9a747902a59 tlsdated.initd +f2296ce3b0f7baae19d25009ebe7233a tlsdate-add-secondary-archs.patch" sha256sums="482640a5efb8489f287da1018176fb1196adf7cb1b81ac0c7f2b419b43d44258 tlsdate-0.0.13.tar.gz d3e4f1ca2941813cdee93ef039a5156db410cea2dc4b0e1a738a9bae89835d63 tlsdate.confd 4652276edc4c4cec8b26735c81ee34c35aa887e8a5ddcfe78170360092c7f5fe tlsdate.initd 1c52ff7bc7ce0fbd876a4f594948a70e30e6197bae2b9bc1b55cc6d398091131 tlsdated.confd -2a39cde73cf628ff168a156cd1ce14c324be5bcd0384f9979a89d79ef1d60325 tlsdated.initd" +2a39cde73cf628ff168a156cd1ce14c324be5bcd0384f9979a89d79ef1d60325 tlsdated.initd +bbf3658def6f253fa8ca2ab40a0814a68eeb43c398f8fc179173e304555e4dd7 tlsdate-add-secondary-archs.patch" sha512sums="9c4fd51439976a8541fdf1bb70afa5333b43b2e43b801a65b3b1ac3e4a437fd3021ef2aaeeb13fc1ba63ccd119f6eff4c10e3a5a28cf0cfd96bbc7a174dbb789 tlsdate-0.0.13.tar.gz 62149e3a9f26a71624bd851780f92a41c9aaf138793b5da762aa3002bcc5a409686d1bbe687b4abf1fc2e12205720a3825d9603cab0b0d978c2d0fd41422efe7 tlsdate.confd c54d11ead7ee5035e4829df92b23cd54a71535199844b4f64ecfa715d9838ef954e7c2434df0767bb32c8226448d2fa080180be76ed8e417d5fa6dfc9c08dce6 tlsdate.initd 38bd7d64473ab487eea2539b11a7acadfc3fa5a627fb12e78931b62c46d3ebedab4c75d56839b0dee9fd8f42d4b7ae9ace08ea3f58941b8e2d183828c6a4fef2 tlsdated.confd -9601ab4f9bd8870ed0c8e4f9dcbc32df902a5998ea6eeb8c40b8a8286515f35bf2d755784d267f78d53ac9baaf2d20051e99c35ceabe9d846d9a2a40cf135760 tlsdated.initd" +9601ab4f9bd8870ed0c8e4f9dcbc32df902a5998ea6eeb8c40b8a8286515f35bf2d755784d267f78d53ac9baaf2d20051e99c35ceabe9d846d9a2a40cf135760 tlsdated.initd +03ebe29088f91eb45a13a467797c4f5a88233e2ebea957ca72012fe892dea1377b652f8aadaab865352a37d255df674f1abba09f6670bf8a9015aebfce89cf77 tlsdate-add-secondary-archs.patch" diff --git a/main/tlsdate/tlsdate-add-secondary-archs.patch b/main/tlsdate/tlsdate-add-secondary-archs.patch new file mode 100644 index 0000000000..eeb3bbd785 --- /dev/null +++ b/main/tlsdate/tlsdate-add-secondary-archs.patch @@ -0,0 +1,37 @@ +From: Marcin Juszkiewicz <mjuszkiewicz@redhat.com> + +Upstream-status: https://github.com/ioerror/tlsdate/pull/184 + +diff --git a/src/seccomp.c b/src/seccomp.c +index fbc5a33..8c23bf9 100644 +--- a/src/seccomp.c ++++ b/src/seccomp.c +@@ -48,6 +48,18 @@ + # define EM_ARM 40 + # endif + # define SECCOMP_AUDIT_ARCH AUDIT_ARCH_ARM ++#elif defined(__aarch64__) ++# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_AARCH64 ++#elif defined(__powerpc__) ++# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_PPC ++#elif defined(__powerpc64le__) ++# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_PPC64LE ++#elif defined(__powerpc64__) ++# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_PPC64 ++#elif defined(__s390__) ++# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_S390 ++#elif defined(__s390x__) ++# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_S390X + #else + # error "Platform does not support seccomp filter yet" + #endif +@@ -87,7 +99,9 @@ enable_setter_seccomp (void) + SC_ALLOW (exit_group), + SC_ALLOW (exit), + ++#ifdef __NR_open + SC_DENY (open, EINVAL), ++#endif + SC_DENY (fcntl, EINVAL), + SC_DENY (fstat, EINVAL), + #ifdef __NR_mmap |