mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2026-05-05 04:16:46 +02:00
main/strace: upgrade to 4.18
This commit is contained in:
tmpfile
Timo Teräs
parent
3453183c3d
commit
a0a777c398
@ -1,24 +1,19 @@
|
||||
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
|
||||
pkgname=strace
|
||||
pkgver=4.17
|
||||
pkgver=4.18
|
||||
pkgrel=0
|
||||
pkgdesc="A useful diagnositic, instructional, and debugging tool"
|
||||
url="http://sourceforge.net/projects/strace/"
|
||||
url="https://strace.io/"
|
||||
arch="all"
|
||||
license="BSD"
|
||||
depends=
|
||||
makedepends="linux-headers"
|
||||
depends=""
|
||||
makedepends="linux-headers autoconf automake"
|
||||
subpackages="$pkgname-doc"
|
||||
source="http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.xz
|
||||
source="$pkgname-$pkgver.tar.gz::https://github.com/strace/$pkgname/archive/v$pkgver.tar.gz
|
||||
fix-ppc-pt-regs-collision.patch
|
||||
"
|
||||
|
||||
builddir="$srcdir/$pkgname-$pkgver"
|
||||
prepare() {
|
||||
default_prepare || return 1
|
||||
sed -i -e 's/include <linux\/socket.h>/include <sys\/socket.h>/g' \
|
||||
"$builddir"/configure || return 1
|
||||
}
|
||||
|
||||
build() {
|
||||
cd "$builddir"
|
||||
@ -37,6 +32,8 @@ build() {
|
||||
;;
|
||||
esac
|
||||
|
||||
./bootstrap
|
||||
|
||||
ac_cv_have_long_long_off_t=yes \
|
||||
./configure \
|
||||
--build=$CBUILD \
|
||||
@ -44,9 +41,8 @@ build() {
|
||||
--prefix=/usr \
|
||||
--sysconfdir=/etc \
|
||||
--mandir=/usr/share/man \
|
||||
--localstatedir=/var \
|
||||
|| return 1
|
||||
make || return 1
|
||||
--localstatedir=/var
|
||||
make
|
||||
}
|
||||
|
||||
package() {
|
||||
@ -54,5 +50,5 @@ package() {
|
||||
make -j1 DESTDIR="$pkgdir" install
|
||||
}
|
||||
|
||||
sha512sums="dab376d9c5ac7db98e864f3cfb165eeec714e3ea492f32ee873cebe01fbd3a0793db09983af1da6530480666a59973ccd9855d348e754be1eead9c0a5d524029 strace-4.17.tar.xz
|
||||
sha512sums="744792cdb135b209a15413fe459c21cda74342d4b93d335a174dd788a18b4c61e99cf9c740968956c54ab184ad83b000e9de9003be7c19965e5e67575fdb8b2a strace-4.18.tar.gz
|
||||
b70cee89dd49a2b5a69dc2a56c3a11169d3306e1a73981155188b574486965c034aa52b4ac1c6edff5ef55c9d52f27750acb242fac095a8a9f69689b51b3fad1 fix-ppc-pt-regs-collision.patch"
|
||||
|
||||
@ -1,107 +0,0 @@
|
||||
Upstream: yes
|
||||
|
||||
From d34e00b293942b1012ddc49ed3ab379a32337611 Mon Sep 17 00:00:00 2001
|
||||
From: Felix Janda <felix.janda@posteo.de>
|
||||
Date: Sat, 28 Mar 2015 18:21:09 +0100
|
||||
Subject: [PATCH] Include <sys/stat.h> for S_I* macros
|
||||
|
||||
Fix a compilation failure with musl libc.
|
||||
|
||||
* mknod.c: Include <sys/stat.h>.
|
||||
* printmode.c: Likewise.
|
||||
|
||||
Reported-by: Dima Krasner <dima@dimakrasner.com>
|
||||
Acked-by: Mike Frysinger <vapier@gentoo.org>
|
||||
---
|
||||
mknod.c | 1 +
|
||||
printmode.c | 1 +
|
||||
2 files changed, 2 insertions(+)
|
||||
|
||||
diff --git a/mknod.c b/mknod.c
|
||||
index 07e9a45..1463232 100644
|
||||
--- a/mknod.c
|
||||
+++ b/mknod.c
|
||||
@@ -1,6 +1,7 @@
|
||||
#include "defs.h"
|
||||
|
||||
#include <fcntl.h>
|
||||
+#include <sys/stat.h>
|
||||
|
||||
#ifdef MAJOR_IN_SYSMACROS
|
||||
# include <sys/sysmacros.h>
|
||||
diff --git a/printmode.c b/printmode.c
|
||||
index 4df1b9f..a721936 100644
|
||||
--- a/printmode.c
|
||||
+++ b/printmode.c
|
||||
@@ -1,6 +1,7 @@
|
||||
#include "defs.h"
|
||||
|
||||
#include <fcntl.h>
|
||||
+#include <sys/stat.h>
|
||||
|
||||
#include "xlat/modetypes.h"
|
||||
|
||||
--
|
||||
1.9.1
|
||||
|
||||
From 3460dc486d333231998de0f19918204aacee9ae3 Mon Sep 17 00:00:00 2001
|
||||
From: Felix Janda <felix.janda@posteo.de>
|
||||
Date: Sat, 28 Mar 2015 18:40:13 +0100
|
||||
Subject: [PATCH] Include <linux/ioctl.h> for _IOC_* macros
|
||||
|
||||
Fix a compilation failure with musl libc.
|
||||
|
||||
* evdev.c: Include <linux/ioctl.h>.
|
||||
* ioctl.c: Include <linux/ioctl.h> instead of <asm/ioctl.h>.
|
||||
* ioctlsort.c: Likewise.
|
||||
|
||||
Reported-by: Dima Krasner <dima@dimakrasner.com>
|
||||
Acked-by: Mike Frysinger <vapier@gentoo.org>
|
||||
---
|
||||
evdev.c | 2 ++
|
||||
ioctl.c | 2 +-
|
||||
ioctlsort.c | 2 +-
|
||||
3 files changed, 4 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/evdev.c b/evdev.c
|
||||
index 9a7430d..e06f9c1 100644
|
||||
--- a/evdev.c
|
||||
+++ b/evdev.c
|
||||
@@ -28,6 +28,8 @@
|
||||
|
||||
#include "defs.h"
|
||||
|
||||
+#include <linux/ioctl.h>
|
||||
+
|
||||
#ifdef HAVE_LINUX_INPUT_H
|
||||
#include <linux/input.h>
|
||||
#include "xlat/evdev_abs.h"
|
||||
diff --git a/ioctl.c b/ioctl.c
|
||||
index 46f8334..c67d048 100644
|
||||
--- a/ioctl.c
|
||||
+++ b/ioctl.c
|
||||
@@ -29,7 +29,7 @@
|
||||
*/
|
||||
|
||||
#include "defs.h"
|
||||
-#include <asm/ioctl.h>
|
||||
+#include <linux/ioctl.h>
|
||||
#include "xlat/ioctl_dirs.h"
|
||||
|
||||
#ifdef HAVE_LINUX_INPUT_H
|
||||
diff --git a/ioctlsort.c b/ioctlsort.c
|
||||
index 333556c..9c31691 100644
|
||||
--- a/ioctlsort.c
|
||||
+++ b/ioctlsort.c
|
||||
@@ -33,7 +33,7 @@
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
-#include <asm/ioctl.h>
|
||||
+#include <linux/ioctl.h>
|
||||
|
||||
struct ioctlent {
|
||||
const char *info;
|
||||
--
|
||||
1.9.1
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user