summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorA. Wilcox <AWilcox@Wilcox-Tech.com>2018-07-09 17:39:57 -0500
committerA. Wilcox <AWilcox@Wilcox-Tech.com>2018-07-09 17:39:57 -0500
commit00add29283170ea81e0e6631a33a38975fd898ea (patch)
tree3255bc2b2fee95f10169a9e9d64e9fbeed9fb2a0
parent3d43cb0886138d8d9f88aa226ad4c12eb8f78804 (diff)
downloadpackages-00add29283170ea81e0e6631a33a38975fd898ea.tar.gz
packages-00add29283170ea81e0e6631a33a38975fd898ea.tar.bz2
packages-00add29283170ea81e0e6631a33a38975fd898ea.tar.xz
packages-00add29283170ea81e0e6631a33a38975fd898ea.zip
user/libexecinfo: pull in, overhaul entirely, add check
-rw-r--r--user/libexecinfo/10-execinfo.patch64
-rw-r--r--user/libexecinfo/20-define-gnu-source.patch24
-rw-r--r--user/libexecinfo/30-linux-makefile.patch44
-rw-r--r--user/libexecinfo/APKBUILD48
4 files changed, 180 insertions, 0 deletions
diff --git a/user/libexecinfo/10-execinfo.patch b/user/libexecinfo/10-execinfo.patch
new file mode 100644
index 000000000..97bd8cd5d
--- /dev/null
+++ b/user/libexecinfo/10-execinfo.patch
@@ -0,0 +1,64 @@
+--- a/execinfo.c
++++ b/execinfo.c
+@@ -69,7 +69,8 @@
+ char **
+ backtrace_symbols(void *const *buffer, int size)
+ {
+- int i, clen, alen, offset;
++ size_t clen, alen;
++ int i, offset;
+ char **rval;
+ char *cp;
+ Dl_info info;
+@@ -78,7 +79,6 @@
+ rval = malloc(clen);
+ if (rval == NULL)
+ return NULL;
+- (char **)cp = &(rval[size]);
+ for (i = 0; i < size; i++) {
+ if (dladdr(buffer[i], &info) != 0) {
+ if (info.dli_sname == NULL)
+@@ -92,14 +92,14 @@
+ 2 + /* " <" */
+ strlen(info.dli_sname) + /* "function" */
+ 1 + /* "+" */
+- D10(offset) + /* "offset */
++ 10 + /* "offset */
+ 5 + /* "> at " */
+ strlen(info.dli_fname) + /* "filename" */
+ 1; /* "\0" */
+ rval = realloc_safe(rval, clen + alen);
+ if (rval == NULL)
+ return NULL;
+- snprintf(cp, alen, "%p <%s+%d> at %s",
++ snprintf((char *) rval + clen, alen, "%p <%s+%d> at %s",
+ buffer[i], info.dli_sname, offset, info.dli_fname);
+ } else {
+ alen = 2 + /* "0x" */
+@@ -108,12 +108,15 @@
+ rval = realloc_safe(rval, clen + alen);
+ if (rval == NULL)
+ return NULL;
+- snprintf(cp, alen, "%p", buffer[i]);
++ snprintf((char *) rval + clen, alen, "%p", buffer[i]);
+ }
+- rval[i] = cp;
+- cp += alen;
++ rval[i] = (char *) clen;
++ clen += alen;
+ }
+
++ for (i = 0; i < size; i++)
++ rval[i] += (long) rval;
++
+ return rval;
+ }
+
+@@ -155,6 +158,6 @@
+ return;
+ snprintf(buf, len, "%p\n", buffer[i]);
+ }
+- write(fd, buf, len - 1);
++ write(fd, buf, strlen(buf));
+ }
+ }
diff --git a/user/libexecinfo/20-define-gnu-source.patch b/user/libexecinfo/20-define-gnu-source.patch
new file mode 100644
index 000000000..ac18f6eeb
--- /dev/null
+++ b/user/libexecinfo/20-define-gnu-source.patch
@@ -0,0 +1,24 @@
+--- a/execinfo.c
++++ b/execinfo.c
+@@ -26,6 +26,7 @@
+ * $Id: execinfo.c,v 1.3 2004/07/19 05:21:09 sobomax Exp $
+ */
+
++#define _GNU_SOURCE
+ #include <sys/types.h>
+ #include <sys/uio.h>
+ #include <dlfcn.h>
+--- a/stacktraverse.c
++++ b/stacktraverse.c
+@@ -1,3 +1,4 @@
++#define _GNU_SOURCE
+ #include <stddef.h>
+
+ #include "stacktraverse.h"
+--- a/test.c
++++ b/test.c
+@@ -1,3 +1,4 @@
++#define _GNU_SOURCE
+ #include <stdio.h>
+ #include <stdlib.h>
+
diff --git a/user/libexecinfo/30-linux-makefile.patch b/user/libexecinfo/30-linux-makefile.patch
new file mode 100644
index 000000000..f832adce7
--- /dev/null
+++ b/user/libexecinfo/30-linux-makefile.patch
@@ -0,0 +1,44 @@
+--- a/Makefile
++++ b/Makefile
+@@ -23,24 +23,25 @@
+ # SUCH DAMAGE.
+ #
+ # $Id: Makefile,v 1.3 2004/07/19 05:19:55 sobomax Exp $
++#
++# Linux Makefile by Matt Smith <mcs@darkregion.net>, 2011/01/04
+
+-LIB= execinfo
++CC=cc
++AR=ar
++EXECINFO_CFLAGS=$(CFLAGS) -O2 -pipe -fno-strict-aliasing -std=gnu99 -fstack-protector -c
++EXECINFO_LDFLAGS=$(LDFLAGS)
+
+-SRCS= stacktraverse.c stacktraverse.h execinfo.c execinfo.h
++all: static dynamic
+
+-INCS= execinfo.h
++static:
++ $(CC) $(EXECINFO_CFLAGS) $(EXECINFO_LDFLAGS) stacktraverse.c
++ $(CC) $(EXECINFO_CFLAGS) $(EXECINFO_LDFLAGS) execinfo.c
++ $(AR) rcs libexecinfo.a stacktraverse.o execinfo.o
+
+-SHLIB_MAJOR= 1
+-SHLIB_MINOR= 0
++dynamic:
++ $(CC) -fpic -DPIC $(EXECINFO_CFLAGS) $(EXECINFO_LDFLAGS) stacktraverse.c -o stacktraverse.So
++ $(CC) -fpic -DPIC $(EXECINFO_CFLAGS) $(EXECINFO_LDFLAGS) execinfo.c -o execinfo.So
++ $(CC) -shared -Wl,-soname,libexecinfo.so.1 -o libexecinfo.so.1 stacktraverse.So execinfo.So
+
+-NOPROFILE= yes
+-
+-DPADD= ${LIBM}
+-LDADD= -lm
+-
+-#WARNS?= 4
+-
+-#stacktraverse.c: gen.py
+-# ./gen.py > stacktraverse.c
+-
+-.include <bsd.lib.mk>
++clean:
++ rm -rf *.o *.So *.a *.so
diff --git a/user/libexecinfo/APKBUILD b/user/libexecinfo/APKBUILD
new file mode 100644
index 000000000..3f1040343
--- /dev/null
+++ b/user/libexecinfo/APKBUILD
@@ -0,0 +1,48 @@
+# Contributor: Philipp Andronov <filipp.andronov@gmail.com>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=libexecinfo
+pkgver=1.1
+pkgrel=1
+pkgdesc="Library for inspecting backtraces"
+url="https://www.freshports.org/devel/libexecinfo"
+arch="all"
+license="BSD-2-Clause"
+depends=""
+makedepends=""
+subpackages="$pkgname-dev"
+source="http://distcache.freebsd.org/local-distfiles/itetcu/$pkgname-$pkgver.tar.bz2
+ 10-execinfo.patch
+ 20-define-gnu-source.patch
+ 30-linux-makefile.patch
+ "
+
+build() {
+ cd "$builddir"
+ make
+}
+
+check() {
+ cd "$builddir"
+ ${CC:-cc} -I. -L. -ggdb -fno-omit-frame-pointer $CFLAGS -o test test.c -lexecinfo
+ ./test
+}
+
+package() {
+ cd "$builddir"
+
+ install -D -m755 "$builddir"/execinfo.h \
+ "$pkgdir"/usr/include/execinfo.h
+ install -D -m755 "$builddir"/stacktraverse.h \
+ "$pkgdir"/usr/include/stacktraverse.h
+ install -D -m755 "$builddir"/libexecinfo.a \
+ "$pkgdir"/usr/lib/libexecinfo.a
+ install -D -m755 "$builddir"/libexecinfo.so.1 \
+ "$pkgdir"/usr/lib/libexecinfo.so.1
+ ln -s /usr/lib/libexecinfo.so.1 \
+ "$pkgdir"/usr/lib/libexecinfo.so
+}
+
+sha512sums="51fea7910ef6873061a25c22434ce4da724e9d8e37616a069ad0a58c0463755be4c6c7da88cd747484c2f3373909d7be4678b32a4bd91b6d9e0f74526094e92c libexecinfo-1.1.tar.bz2
+97dab43979f6bc07deb11b20cc134c7d95619536b108058388856bcc48dc5a7de4ebceebe88e79d92ccbb9307975bb91a630cc569a5ed35a37a0f92f2d7f83d0 10-execinfo.patch
+6b1d5ba0a2765fcbcde2d88e85c6ee9fb49ef1878284fd7da15afebed17b8415959233c735574661b0a5e77d4d40c132552477dbbf4432512a32629727ebdbbc 20-define-gnu-source.patch
+7d83e3113b93ed9d54a2077d6b9381aa69c6a5d2066dd3cd7c5ec3ce0c93eb7b86fd47481151117f9c8f3790bde6125498a49e32e81d3ff6630b6d8e0ec391d0 30-linux-makefile.patch"