From 47e102a7d81f520e222e947282d0da35f9dc5e03 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Fri, 23 Jun 2017 20:46:39 +0200 Subject: [PATCH] libbsd: update to 0.8.4. --- srcpkgs/libbsd/files/a.out.h | 138 ---------------------- srcpkgs/libbsd/files/bits/a.out.h | 11 -- srcpkgs/libbsd/patches/musl-a_out_h.patch | 26 ---- srcpkgs/libbsd/template | 13 +- 4 files changed, 2 insertions(+), 186 deletions(-) delete mode 100644 srcpkgs/libbsd/files/a.out.h delete mode 100644 srcpkgs/libbsd/files/bits/a.out.h delete mode 100644 srcpkgs/libbsd/patches/musl-a_out_h.patch diff --git a/srcpkgs/libbsd/files/a.out.h b/srcpkgs/libbsd/files/a.out.h deleted file mode 100644 index e3f4bdd08f..0000000000 --- a/srcpkgs/libbsd/files/a.out.h +++ /dev/null @@ -1,138 +0,0 @@ -#ifndef __A_OUT_GNU_H__ -#define __A_OUT_GNU_H__ - -#include - -#define __GNU_EXEC_MACROS__ - -struct exec -{ - unsigned long a_info; /* Use macros N_MAGIC, etc for access. */ - unsigned int a_text; /* Length of text, in bytes. */ - unsigned int a_data; /* Length of data, in bytes. */ - unsigned int a_bss; /* Length of uninitialized data area for file, in bytes. */ - unsigned int a_syms; /* Length of symbol table data in file, in bytes. */ - unsigned int a_entry; /* Start address. */ - unsigned int a_trsize;/* Length of relocation info for text, in bytes. */ - unsigned int a_drsize;/* Length of relocation info for data, in bytes. */ -}; - -enum machine_type -{ - M_OLDSUN2 = 0, - M_68010 = 1, - M_68020 = 2, - M_SPARC = 3, - M_386 = 100, - M_MIPS1 = 151, - M_MIPS2 = 152 -}; - -#define N_MAGIC(exec) ((exec).a_info & 0xffff) -#define N_MACHTYPE(exec) ((enum machine_type)(((exec).a_info >> 16) & 0xff)) -#define N_FLAGS(exec) (((exec).a_info >> 24) & 0xff) -#define N_SET_INFO(exec, magic, type, flags) \ - ((exec).a_info = ((magic) & 0xffff) \ - | (((int)(type) & 0xff) << 16) \ - | (((flags) & 0xff) << 24)) -#define N_SET_MAGIC(exec, magic) \ - ((exec).a_info = ((exec).a_info & 0xffff0000) | ((magic) & 0xffff)) -#define N_SET_MACHTYPE(exec, machtype) \ - ((exec).a_info = \ - ((exec).a_info&0xff00ffff) | ((((int)(machtype))&0xff) << 16)) -#define N_SET_FLAGS(exec, flags) \ - ((exec).a_info = \ - ((exec).a_info&0x00ffffff) | (((flags) & 0xff) << 24)) - -/* Code indicating object file or impure executable. */ -#define OMAGIC 0407 -/* Code indicating pure executable. */ -#define NMAGIC 0410 -/* Code indicating demand-paged executable. */ -#define ZMAGIC 0413 -/* This indicates a demand-paged executable with the header in the text. - The first page is unmapped to help trap NULL pointer references. */ -#define QMAGIC 0314 -/* Code indicating core file. */ -#define CMAGIC 0421 - -#define N_TRSIZE(a) ((a).a_trsize) -#define N_DRSIZE(a) ((a).a_drsize) -#define N_SYMSIZE(a) ((a).a_syms) -#define N_BADMAG(x) \ - (N_MAGIC(x) != OMAGIC && N_MAGIC(x) != NMAGIC \ - && N_MAGIC(x) != ZMAGIC && N_MAGIC(x) != QMAGIC) -#define _N_HDROFF(x) (1024 - sizeof (struct exec)) -#define N_TXTOFF(x) \ - (N_MAGIC(x) == ZMAGIC ? _N_HDROFF((x)) + sizeof (struct exec) : \ - (N_MAGIC(x) == QMAGIC ? 0 : sizeof (struct exec))) -#define N_DATOFF(x) (N_TXTOFF(x) + (x).a_text) -#define N_TRELOFF(x) (N_DATOFF(x) + (x).a_data) -#define N_DRELOFF(x) (N_TRELOFF(x) + N_TRSIZE(x)) -#define N_SYMOFF(x) (N_DRELOFF(x) + N_DRSIZE(x)) -#define N_STROFF(x) (N_SYMOFF(x) + N_SYMSIZE(x)) - -/* Address of text segment in memory after it is loaded. */ -#define N_TXTADDR(x) (N_MAGIC(x) == QMAGIC ? 4096 : 0) - -/* Address of data segment in memory after it is loaded. */ -#define SEGMENT_SIZE 1024 - -#define _N_SEGMENT_ROUND(x) (((x) + SEGMENT_SIZE - 1) & ~(SEGMENT_SIZE - 1)) -#define _N_TXTENDADDR(x) (N_TXTADDR(x)+(x).a_text) - -#define N_DATADDR(x) \ - (N_MAGIC(x)==OMAGIC? (_N_TXTENDADDR(x)) \ - : (_N_SEGMENT_ROUND (_N_TXTENDADDR(x)))) -#define N_BSSADDR(x) (N_DATADDR(x) + (x).a_data) - -#if !defined (N_NLIST_DECLARED) -struct nlist -{ - union - { - char *n_name; - struct nlist *n_next; - long n_strx; - } n_un; - unsigned char n_type; - char n_other; - short n_desc; - unsigned long n_value; -}; -#endif /* no N_NLIST_DECLARED. */ - -#define N_UNDF 0 -#define N_ABS 2 -#define N_TEXT 4 -#define N_DATA 6 -#define N_BSS 8 -#define N_FN 15 -#define N_EXT 1 -#define N_TYPE 036 -#define N_STAB 0340 -#define N_INDR 0xa -#define N_SETA 0x14 /* Absolute set element symbol. */ -#define N_SETT 0x16 /* Text set element symbol. */ -#define N_SETD 0x18 /* Data set element symbol. */ -#define N_SETB 0x1A /* Bss set element symbol. */ -#define N_SETV 0x1C /* Pointer to set vector in data area. */ - -#if !defined (N_RELOCATION_INFO_DECLARED) -/* This structure describes a single relocation to be performed. - The text-relocation section of the file is a vector of these structures, - all of which apply to the text section. - Likewise, the data-relocation section applies to the data section. */ - -struct relocation_info -{ - int r_address; - unsigned int r_symbolnum:24; - unsigned int r_pcrel:1; - unsigned int r_length:2; - unsigned int r_extern:1; - unsigned int r_pad:4; -}; -#endif /* no N_RELOCATION_INFO_DECLARED. */ - -#endif /* __A_OUT_GNU_H__ */ diff --git a/srcpkgs/libbsd/files/bits/a.out.h b/srcpkgs/libbsd/files/bits/a.out.h deleted file mode 100644 index 0e4a7c911f..0000000000 --- a/srcpkgs/libbsd/files/bits/a.out.h +++ /dev/null @@ -1,11 +0,0 @@ -#ifndef __A_OUT_GNU_H__ -# error "Never use directly; include instead." -#endif - -#ifdef __x86_64__ - -/* Signal to users of this header that this architecture really doesn't - support a.out binary format. */ -#define __NO_A_OUT_SUPPORT 1 - -#endif diff --git a/srcpkgs/libbsd/patches/musl-a_out_h.patch b/srcpkgs/libbsd/patches/musl-a_out_h.patch deleted file mode 100644 index 7680738aa8..0000000000 --- a/srcpkgs/libbsd/patches/musl-a_out_h.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- include/bsd/nlist.h 2013-10-10 08:14:26.000000000 +0200 -+++ include/bsd/nlist.h 2015-10-31 14:32:06.038427778 +0100 -@@ -28,7 +28,11 @@ - #define LIBBSD_NLIST_H - - #include -+#if defined(__GLIBC__) - #include -+#else -+#include "a.out.h" -+#endif /* !defined(__GLIBC__) */ - - __BEGIN_DECLS - extern int nlist(const char *filename, struct nlist *list); ---- src/nlist.c 2015-10-31 14:36:20.857402580 +0100 -+++ src/nlist.c 2015-10-31 14:24:23.407473525 +0100 -@@ -40,7 +40,7 @@ - #include - - #include - #include --#include -+#include "nlist.h" - #include - #include - #include diff --git a/srcpkgs/libbsd/template b/srcpkgs/libbsd/template index 600bfb1bb4..48ffd6e5f2 100644 --- a/srcpkgs/libbsd/template +++ b/srcpkgs/libbsd/template @@ -1,6 +1,6 @@ # Template file for 'libbsd' pkgname=libbsd -version=0.8.3 +version=0.8.4 revision=1 build_style=gnu-configure makedepends="libressl-devel" @@ -9,17 +9,8 @@ maintainer="Juan RP " homepage="http://libbsd.freedesktop.org/" license="BSD" distfiles="http://libbsd.freedesktop.org/releases/libbsd-${version}.tar.xz" -checksum=934b634f4dfd865b6482650b8f522c70ae65c463529de8be907b53c89c3a34a8 +checksum=217af1642915703151ea6df077311633dd6ad7bfa3c7e07dd9329a93f642cab3 -post_extract() { - case "$XBPS_TARGET_MACHINE" in - *-musl) - sed -i '1i#include ' src/flopen.c src/nlist.c - sed -i '/#error/d' src/funopen.c - cp -pR ${FILESDIR}/* include/bsd - ;; - esac -} post_install() { vlicense COPYING }