commit c5fed8175075dd28582e64bedb8a5e5ae6602992
parent f74eb362c9b203ecc70f6bc96c6c4d270d7526f9
Author: aabacchus <ben@bvnf.space>
Date: Fri, 7 Jan 2022 16:19:11 +0000
ltrace: 0.7.3
using alpine patch
Diffstat:
7 files changed, 207 insertions(+), 0 deletions(-)
diff --git a/ltrace/build b/ltrace/build
@@ -0,0 +1,11 @@
+#!/bin/sh -e
+
+patch -p1 < musl.patch
+
+./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --disable-werror
+
+make
+make DESTDIR="$1" install
diff --git a/ltrace/checksums b/ltrace/checksums
@@ -0,0 +1,2 @@
+0e6f8c077471b544c06def7192d983861ad2f8688dd5504beae62f0c5f5b9503
+97932744324582e9f4f2536ca51457cf3bd1b23653ad40f735b24a4a999ee6b1
diff --git a/ltrace/depends b/ltrace/depends
@@ -0,0 +1 @@
+libelf
diff --git a/ltrace/manifest b/ltrace/manifest
@@ -0,0 +1,32 @@
+/var/db/kiss/installed/ltrace/version
+/var/db/kiss/installed/ltrace/sources
+/var/db/kiss/installed/ltrace/patches/musl.patch
+/var/db/kiss/installed/ltrace/patches/
+/var/db/kiss/installed/ltrace/manifest
+/var/db/kiss/installed/ltrace/etcsums
+/var/db/kiss/installed/ltrace/depends
+/var/db/kiss/installed/ltrace/checksums
+/var/db/kiss/installed/ltrace/build
+/var/db/kiss/installed/ltrace/
+/var/db/kiss/installed/
+/var/db/kiss/
+/var/db/
+/var/
+/usr/share/man/man5/ltrace.conf.5
+/usr/share/man/man5/
+/usr/share/man/man1/ltrace.1
+/usr/share/man/man1/
+/usr/share/man/
+/usr/share/doc/ltrace/TODO
+/usr/share/doc/ltrace/README
+/usr/share/doc/ltrace/INSTALL
+/usr/share/doc/ltrace/CREDITS
+/usr/share/doc/ltrace/COPYING
+/usr/share/doc/ltrace/
+/usr/share/doc/
+/usr/share/
+/usr/bin/ltrace
+/usr/bin/
+/usr/
+/etc/ltrace.conf
+/etc/
diff --git a/ltrace/patches/musl.patch b/ltrace/patches/musl.patch
@@ -0,0 +1,158 @@
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Tue, 18 Feb 2014 10:04:18 +000
+
+---
+https://gitlab.alpinelinux.org/alpine/aports/-/blob/master/main/ltrace/musl.patch
+--- ./configure.ac.orig
++++ ./configure.ac
+@@ -34,6 +34,7 @@
+ case "${host_os}" in
+ linux-gnu*) HOST_OS="linux-gnu" ;;
+ linux-uclibc*) HOST_OS="linux-gnu" ;;
++ linux-musl*) HOST_OS="linux-gnu" ;;
+ *) AC_MSG_ERROR([unkown host-os ${host_os}]) ;;
+ esac
+ AC_SUBST(HOST_OS)
+@@ -234,6 +235,7 @@
+ sys/param.h \
+ sys/time.h \
+ unistd.h \
++ error.h \
+ ])
+
+ # Checks for typedefs, structures, and compiler characteristics.
+diff --git a/expr.c b/expr.c
+index 32860fd..374c549 100644
+--- a/expr.c
++++ b/expr.c
+@@ -19,9 +19,12 @@
+ */
+
+ #include <string.h>
++#include <stdio.h>
+ #include <assert.h>
+ #include <errno.h>
++#ifdef HAVE_ERROR_H
+ #include <error.h>
++#endif
+ #include <stdlib.h>
+
+ #include "expr.h"
+@@ -330,8 +333,11 @@ expr_self(void)
+ static struct expr_node *node = NULL;
+ if (node == NULL) {
+ node = malloc(sizeof(*node));
+- if (node == NULL)
+- error(1, errno, "malloc expr_self");
++ if (node == NULL) {
++ fprintf(stderr, "%s: malloc expr_self\n",
++ strerror(errno));
++ exit(1);
++ }
+ expr_init_self(node);
+ }
+ return node;
+diff --git a/glob.c b/glob.c
+index 075c867..06fec47 100644
+--- a/glob.c
++++ b/glob.c
+@@ -180,7 +180,7 @@ glob_to_regex(const char *glob, char **retp)
+ goto fail;
+ }
+ *retp = buf;
+- return REG_NOERROR;
++ return 0;
+ }
+
+ int
+@@ -188,7 +188,7 @@ globcomp(regex_t *preg, const char *glob, int cflags)
+ {
+ char *regex = NULL;
+ int status = glob_to_regex(glob, ®ex);
+- if (status != REG_NOERROR)
++ if (status != 0)
+ return status;
+ assert(regex != NULL);
+ status = regcomp(preg, regex, cflags);
+diff --git a/options.c b/options.c
+index 1e19dc7..1dc5e1e 100644
+--- a/options.c
++++ b/options.c
+@@ -204,7 +204,7 @@ compile_libname(const char *expr, const char *a_lib, int lib_re_p,
+
+ regex_t lib_re;
+ int status = (lib_re_p ? regcomp : globcomp)(&lib_re, lib, 0);
+- if (status != REG_NOERROR) {
++ if (status != 0) {
+ char buf[100];
+ regerror(status, &lib_re, buf, sizeof buf);
+ fprintf(stderr, "Rule near '%s' will be ignored: %s.\n",
+diff --git a/read_config_file.c b/read_config_file.c
+index e247436..73528fe 100644
+--- a/read_config_file.c
++++ b/read_config_file.c
+@@ -27,7 +27,9 @@
+ #include <stdlib.h>
+ #include <ctype.h>
+ #include <errno.h>
++#ifdef HAVE_ERROR_H
+ #include <error.h>
++#endif
+ #include <assert.h>
+
+ #include "common.h"
+@@ -1258,8 +1260,12 @@ void
+ init_global_config(void)
+ {
+ struct arg_type_info *info = malloc(2 * sizeof(*info));
+- if (info == NULL)
+- error(1, errno, "malloc in init_global_config");
++ if (info == NULL) {
++ report_error(filename, line_no,
++ "%s: malloc in init_global_config",
++ strerror(errno));
++ exit(1);
++ }
+
+ memset(info, 0, 2 * sizeof(*info));
+ info[0].type = ARGTYPE_POINTER;
+diff --git a/zero.c b/zero.c
+index bc119ee..e685f59 100644
+--- a/zero.c
++++ b/zero.c
+@@ -18,8 +18,11 @@
+ * 02110-1301 USA
+ */
+
++#ifdef HAVE_ERROR_H
+ #include <error.h>
++#endif
+ #include <errno.h>
++#include <string.h>
+
+ #include "zero.h"
+ #include "common.h"
+@@ -96,8 +99,11 @@ expr_node_zero(void)
+ static struct expr_node *node = NULL;
+ if (node == NULL) {
+ node = malloc(sizeof(*node));
+- if (node == NULL)
+- error(1, errno, "malloc expr_node_zero");
++ if (node == NULL) {
++ report_global_error("%s: malloc expr_node_zero",
++ strerror(errno));
++ exit(1);
++ }
+ expr_init_cb1(node, &zero1_callback,
+ expr_self(), 0, (void *)-1);
+ }
+--- ./proc.h.orig
++++ ./proc.h
+@@ -26,6 +26,7 @@
+ #include "config.h"
+
+ #include <sys/time.h>
++#include <unistd.h>
+
+ #if defined(HAVE_LIBUNWIND)
+ # include <libunwind.h>
diff --git a/ltrace/sources b/ltrace/sources
@@ -0,0 +1,2 @@
+https://ltrace.org/ltrace_0.7.3.orig.tar.bz2
+patches/musl.patch
diff --git a/ltrace/version b/ltrace/version
@@ -0,0 +1 @@
+0.7.3 1
