summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorLucio Andrés Illanes Albornoz <lucio@lucioillanes.de>2019-10-20 20:33:28 +0000
committerLucio Andrés Illanes Albornoz <lucio@lucioillanes.de>2019-10-20 20:55:24 +0000
commit0f705dfe46a02d288468fb34556063be73b7134e (patch)
tree581fa37fa5f526eca24887f8fa7d92c1cc2d6c3f
parent6dbfcb96699b0d93fb749cf8cb3d8da21acc13ca (diff)
downloadmidipix_build-0f705dfe46a02d288468fb34556063be73b7134e.tar.bz2
midipix_build-0f705dfe46a02d288468fb34556063be73b7134e.tar.xz
vars/build.vars:libressl: updated to v3.0.2 (via Redfoxmoon.)
vars/build.vars:native_packages_etc: adds libredwg v0.9 (via Redfoxmoon.) patches/libredwg-0.9.local.patch: via Redfoxmoon. patches/libressl-{2.9.1,3.0.2}.local.patch: via Redfoxmoon.
-rw-r--r--patches/libredwg-0.9.local.patch30
-rw-r--r--patches/libressl-3.0.2.local.patch (renamed from patches/libressl-2.9.1.local.patch)0
-rw-r--r--vars/build.vars10
3 files changed, 37 insertions, 3 deletions
diff --git a/patches/libredwg-0.9.local.patch b/patches/libredwg-0.9.local.patch
new file mode 100644
index 00000000..1c3f85c9
--- /dev/null
+++ b/patches/libredwg-0.9.local.patch
@@ -0,0 +1,30 @@
+diff -ru libredwg-0.9.orig/src/spec.h libredwg-0.9/src/spec.h
+--- libredwg-0.9.orig/src/spec.h 2019-09-30 11:03:41.000000000 +0200
++++ libredwg-0.9/src/spec.h 2019-10-20 12:19:02.446065755 +0200
+@@ -358,7 +358,7 @@
+ for (rcount1 = 0; rcount1 < (BITCODE_BL)times; rcount1++)
+ // checked with constant times
+ # define REPEAT_N(times, name, type) \
+- if (dat->version >= R_2000 && (BITCODE_BL)times > 0x1000) \
++ if (dat->version >= R_2000 && (BITCODE_BL)times > 0x7ff) \
+ { \
+ LOG_ERROR ("Invalid %s." #name " rcount1 %ld", SAFEDXFNAME, \
+ (long)times); \
+@@ -369,7 +369,7 @@
+
+ // checked with var. times
+ # define _REPEAT(times, name, type, idx) \
+- if (dat->version >= R_2000 && (BITCODE_BL)_obj->times > 0x1000) \
++ if (dat->version >= R_2000 && (BITCODE_BL)_obj->times > 0x7ff) \
+ { \
+ LOG_ERROR ("Invalid %s." #name " rcount" #idx " %ld", SAFEDXFNAME, \
+ (long)_obj->times); \
+@@ -410,7 +410,7 @@
+ #ifndef _REPEAT_NF
+ // checked
+ # define _REPEAT_NF(times, name, type, idx) \
+- if (dat->version >= R_2000 && times > 0x1000) \
++ if (dat->version >= R_2000 && times > 0x7ff) \
+ { \
+ LOG_ERROR ("Invalid %s." #name " rcount" #idx " %ld", SAFEDXFNAME, \
+ (long)times); \
diff --git a/patches/libressl-2.9.1.local.patch b/patches/libressl-3.0.2.local.patch
index 531104b1..531104b1 100644
--- a/patches/libressl-2.9.1.local.patch
+++ b/patches/libressl-3.0.2.local.patch
diff --git a/vars/build.vars b/vars/build.vars
index 0252b959..815fa5c2 100644
--- a/vars/build.vars
+++ b/vars/build.vars
@@ -750,8 +750,8 @@ NATIVE_PACKAGES_DEPS_PYTHON="${PREFIX}/bin/python2";
: ${PKG_LIBDMTX_SHA256SUM:=686bcfb44e50b96345aa53f41e285f2118a2cf87a333b69b74165a2e7ddca492};
: ${PKG_LIBDMTX_VERSION:=0.7.4};
: ${PKG_LIBDMTX_URL:=https://midipix.org/mirror/libdmtx/libdmtx-${PKG_LIBDMTX_VERSION}.tar.gz};
-: ${PKG_LIBRESSL_SHA256SUM:=39e4dd856694dc10d564201e4549c46d2431601a2b10f3422507e24ccc8f62f8};
-: ${PKG_LIBRESSL_VERSION:=2.9.1};
+: ${PKG_LIBRESSL_SHA256SUM:=df7b172bf79b957dd27ef36dcaa1fb162562c0e8999e194aa8c1a3df2f15398e};
+: ${PKG_LIBRESSL_VERSION:=3.0.2};
: ${PKG_LIBRESSL_URL:=http://ftp.eu.openbsd.org/pub/OpenBSD/LibreSSL/libressl-${PKG_LIBRESSL_VERSION}.tar.gz};
: ${PKG_LIBRESSL_CFLAGS_CONFIGURE_EXTRA:=-D__MIDIPIX};
: ${PKG_LIBRESSL_CONFIGURE_ARGS_EXTRA:=--disable-asm --enable-nc};
@@ -1520,7 +1520,7 @@ bison chicken cparser diffutils flex lunix m4 make mandoc nasm patch patchutils
# Packages list native_packages_etc
NATIVE_PACKAGES_ETC_PACKAGES="
ca_certificates cron dante debianutils emacs fetchmail ffmpeg gdb gnuchess ghostscript hastyhex hexcurse htop icecast isync infounzip
-infozip jamvm classpath john less mlogin mc mintty nano ncdu p7zip procps_ng qemu qpdf rdesktop rw rxvt_unicode st
+infozip jamvm classpath john less libredwg mlogin mc mintty nano ncdu p7zip procps_ng qemu qpdf rdesktop rw rxvt_unicode st
tmux tzdb vim yabasic xcowsay xeyes xorriso xterm xwd";
: ${PKG_CA_CERTIFICATES_URLS_GIT:="ca-certificates=https://github.com/Redfoxmoon3/ca-certificates@master"};
: ${PKG_CA_CERTIFICATES_IN_TREE:=1};
@@ -1631,6 +1631,10 @@ fi;
: ${PKG_LESS_SHA256SUM:=503f91ab0af4846f34f0444ab71c4b286123f0044a4964f1ae781486c617f2e2};
: ${PKG_LESS_VERSION:=530};
: ${PKG_LESS_URL:=http://www.greenwoodsoftware.com/less/less-${PKG_LESS_VERSION}.tar.gz};
+: ${PKG_LIBREDWG_SHA256SUM:=954f74753860315eb313a3bbb83bf7e5ad03e84bd10408cc629ff2e4e4b3fd46};
+: ${PKG_LIBREDWG_VERSION:=0.9};
+: ${PKG_LIBREDWG_URL:=https://ftp.gnu.org/gnu/libredwg/libredwg-${PKG_LIBREDWG_VERSION}.tar.xz};
+: ${PKG_LIBREDWG_CONFIGURE_ARGS_EXTRA:="--disable-python"};
: ${PKG_MLOGIN_URLS_GIT:="mlogin=https://github.com/Redfoxmoon3/mlogin.git@master"};
: ${PKG_MLOGIN_BUILD_DIR:=mlogin};
: ${PKG_MLOGIN_CFLAGS_BUILD_EXTRA:="-DINSECURE -std=c99"};