* Re: [PR PATCH] [Updated] libredwg: update to 0.12.4.
2021-04-07 23:47 [PR PATCH] libredwg: update to 0.12.4 abenson
2021-04-08 13:57 ` abenson
@ 2021-11-07 18:22 ` abenson
2022-03-28 3:09 ` abenson
2022-03-28 3:09 ` [PR PATCH] [Closed]: " abenson
3 siblings, 0 replies; 5+ messages in thread
From: abenson @ 2021-11-07 18:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1602 bytes --]
There is an updated pull request by abenson against master on the void-packages repository
https://github.com/abenson/void-packages libredwg_0.12.4
https://github.com/void-linux/void-packages/pull/30082
libredwg: update to 0.12.4.
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [X] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/30082.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libredwg_0.12.4-30082.patch --]
[-- Type: text/x-diff, Size: 5223 bytes --]
From fcb1eaeae1eaadc13f397767f55f6a06cd4f2c4f Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 7 Apr 2021 18:47:11 -0500
Subject: [PATCH] libredwg: update to 0.12.4.
---
.../libredwg/patches/fix-asan-fuzzers.patch | 89 +++++++++++++++++++
srcpkgs/libredwg/template | 6 +-
2 files changed, 92 insertions(+), 3 deletions(-)
create mode 100644 srcpkgs/libredwg/patches/fix-asan-fuzzers.patch
diff --git a/srcpkgs/libredwg/patches/fix-asan-fuzzers.patch b/srcpkgs/libredwg/patches/fix-asan-fuzzers.patch
new file mode 100644
index 000000000000..03328536b1d3
--- /dev/null
+++ b/srcpkgs/libredwg/patches/fix-asan-fuzzers.patch
@@ -0,0 +1,89 @@
+https://github.com/LibreDWG/libredwg/commit/8853007218a7d7bfd3836cafc507311ce65b621a.patch
+
+From 8853007218a7d7bfd3836cafc507311ce65b621a Mon Sep 17 00:00:00 2001
+From: Reini Urban <rurban@cpan.org>
+Date: Thu, 8 Apr 2021 10:10:10 +0200
+Subject: [PATCH] build asan fuzzers only on request
+
+fixes failing cygwin smokes. we could install asan on the smokers,
+but we dont need it. only build it when requested.
+This needs no oss-fuzz build changes.
+
+See GH #330
+---
+ configure.ac | 10 ++++++++++
+ examples/Makefile.am | 18 ++++++++++++------
+ 2 files changed, 22 insertions(+), 6 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 800623c1c..9aa39dabb 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -164,6 +164,7 @@ case $CFLAGS in
+ *-fsanitize=*,leak*) HAVE_ASAN=yes ;;
+ esac
+ AC_SUBST(HAVE_ASAN)
++AM_CONDITIONAL([HAVE_ASAN], [test -n "$HAVE_ASAN"])
+
+ AC_TYPE_SIZE_T
+ AC_TYPE_INT16_T
+@@ -457,6 +458,15 @@ if test "x$host_os" = "xmingw32" -a "x$build_os" != "xmingw32"; then
+ fi
+ fi
+ AM_CONDITIONAL([HAVE_WINE], [test -n "$WINE"])
++AM_CONDITIONAL([HAVE_CYGWIN], [test "x$host_os" = "xcygwin32" -o test "x$host_os" = "xcygwin64"])
++if [ -n "$HAVE_ASAN" ]
++then
++ HAVE_ASAN_OR_LINUX=1
++elif [ "x$host_os" = "xlinux-gnu" ]
++then
++ HAVE_ASAN_OR_LINUX=1
++fi
++AM_CONDITIONAL([HAVE_ASAN_OR_LINUX],[test -n "HAVE_ASAN_OR_LINUX"])
+
+ dnl Optional SWIG + python bindings
+ dnl Feature: --disable-python or --enable-python=python3.6
+diff --git a/examples/Makefile.am b/examples/Makefile.am
+index df08fe63a..b137525f3 100644
+--- a/examples/Makefile.am
++++ b/examples/Makefile.am
+@@ -24,8 +24,8 @@ LDADD = $(top_builddir)/src/libredwg.la -lm
+ if USE_WRITE
+ bin_PROGRAMS = dwgadd
+ endif
+-check_PROGRAMS = load_dwg dwg2svg2 dwgfuzz llvmfuzz_standalone
+-EXTRA_PROGRAMS = unknown bd bits llvmfuzz
++check_PROGRAMS = load_dwg dwg2svg2 dwgfuzz
++EXTRA_PROGRAMS = unknown bd bits llvmfuzz llvmfuzz_standalone
+
+ load_dwg_SOURCES = load_dwg.c
+ dwg2svg2_SOURCES = dwg2svg2.c
+@@ -40,18 +40,24 @@ bits_SOURCE = bits.c
+ bits_LDADD = $(top_builddir)/src/libredwg.la $(top_builddir)/src/bits.lo -lm
+ dwgfuzz_SOURCES = dwgfuzz.c
+ #would need HAVE_ASAN am var set
+-#dwgfuzz_CFLAGS = $(CFLAGS) $(AM_CFLAGS) -fsanitize=address,undefined -fno-omit-frame-pointer
++#dwgfuzz_CFLAGS = $(CFLAGS) $(AM_CFLAGS) -fsanitize=address,undefined -fno-omit-frame-pointer
+ llvmfuzz_SOURCES = llvmfuzz.c
+-llvmfuzz_CFLAGS = $(CFLAGS) $(AM_CFLAGS) -DHAVE_ASAN \
+- -fsanitize=fuzzer,address,undefined -fno-omit-frame-pointer
+ llvmfuzz_LDADD = $(top_builddir)/src/libredwg.la $(top_builddir)/src/bits.lo -lm
+ llvmfuzz_standalone_SOURCES = llvmfuzz.c
+-if HAVE_MINGW
++if HAVE_ASAN_OR_LINUX
++# needs CC=clang
++llvmfuzz_CFLAGS = $(CFLAGS) $(AM_CFLAGS) -DHAVE_ASAN \
++ -fsanitize=fuzzer,address,undefined -fno-omit-frame-pointer
++# cflags already includes asan
++if HAVE_ASAN
+ llvmfuzz_standalone_CFLAGS = $(CFLAGS) $(AM_CFLAGS) -DSTANDALONE
+ else
+ llvmfuzz_standalone_CFLAGS = $(CFLAGS) $(AM_CFLAGS) -DSTANDALONE -DHAVE_ASAN \
+ -fsanitize=address,undefined -fno-omit-frame-pointer
+ endif
++else
++llvmfuzz_standalone_CFLAGS = $(CFLAGS) $(AM_CFLAGS) -DSTANDALONE
++endif
+ llvmfuzz_standalone_LDADD = $(top_builddir)/src/libredwg.la $(top_builddir)/src/bits.lo -lm
+
+ all: $(check_PROGRAMS)
diff --git a/srcpkgs/libredwg/template b/srcpkgs/libredwg/template
index e7dd4fe40dd2..a6998b716b9a 100644
--- a/srcpkgs/libredwg/template
+++ b/srcpkgs/libredwg/template
@@ -1,17 +1,17 @@
# Template file for 'libredwg'
pkgname=libredwg
-version=0.12.3
+version=0.12.4
revision=1
build_style=gnu-configure
configure_args="--disable-bindings"
hostmakedepends="pkg-config python3"
-makedepends="pcre2-devel"
+makedepends="pcre2-devel libsanitizer-devel"
short_desc="Free library to handle DWG files"
maintainer="Andrew Benson <abenson+void@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://www.gnu.org/software/libredwg/"
distfiles="https://github.com/LibreDWG/libredwg/releases/download/${version}/libredwg-${version}.tar.xz"
-checksum=b31a33466ba23312119138d0ac022399841ee0f40d9bbd970410a2fc471e15ee
+checksum=918857f119c34d9bef17321b646c4ba0fbfaa93dcaced403bae1933e1d9a6517
post_install() {
rm ${DESTDIR}/usr/share/{dwgadd.example,load_dwg.py}
^ permalink raw reply [flat|nested] 5+ messages in thread