Skip to content

Commit

Permalink
dante: Update to version 1.4.3 and fix DSM7 build (#4898)
Browse files Browse the repository at this point in the history
  • Loading branch information
th0ma7 authored Oct 7, 2021
1 parent 1eb6846 commit 5a9f41a
Show file tree
Hide file tree
Showing 4 changed files with 47 additions and 8 deletions.
8 changes: 7 additions & 1 deletion cross/dante-sockd/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PKG_NAME = dante
PKG_VERS = 1.4.2
PKG_VERS = 1.4.3
PKG_EXT = tar.gz
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
PKG_DIST_SITE = https://www.inet.no/dante/files
Expand All @@ -14,4 +14,10 @@ LICENSE = BSD/CMU
GNU_CONFIGURE = 1
CONFIGURE_ARGS = --disable-client --without-libwrap --without-bsdauth --without-gssapi --without-krb5 --without-upnp --without-pam

PRE_CONFIGURE_TARGET = dante_pre_configure

include ../../mk/spksrc.cross-cc.mk

.PHONY: dante_pre_configure
dante_pre_configure:
$(RUN) autoreconf -i -f -v
6 changes: 3 additions & 3 deletions cross/dante-sockd/digests
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
dante-1.4.2.tar.gz SHA1 542bf2579b0f63670310aff230b0f5162f6e33c9
dante-1.4.2.tar.gz SHA256 4c97cff23e5c9b00ca1ec8a95ab22972813921d7fbf60fc453e3e06382fc38a7
dante-1.4.2.tar.gz MD5 77551576d3e80bfaa941055a2959da81
dante-1.4.3.tar.gz SHA1 1e264ec532774324b5508ba5f2ad226d479b4977
dante-1.4.3.tar.gz SHA256 418a065fe1a4b8ace8fbf77c2da269a98f376e7115902e76cda7e741e4846a5d
dante-1.4.3.tar.gz MD5 28ae15fb9e4f5ce7fe17307d01edc075
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
osdep.m4: Remove getaddrinfo() too low checks

dante runs AC_PREPROC_IFELSE then it fills $ERRVALFILE by running the
following command:

cat conftest.i | grep gaierrval: >>$2

As a result, $ERRVALFILE does not contain the expected values because
the expected value is not on the same line than gaierrval:

gaierrval:
# 130 "conftest.c" 3 4
-3

So drop these checks

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

diff -Nuar dante-1.4.2-orig/osdep.m4 dante-1.4.2/osdep.m4
--- osdep.m4-orig 2019-12-09 21:28:38.936003218 +0100
+++ osdep.m4 2019-12-09 21:49:48.764019371 +0100
@@ -956,13 +956,7 @@
unset UNIQUEVALS UNIQUESYMBOLS
if test -s $ERRVALFILE; then
UNIQUEVALS=`sort $ERRVALFILE | uniq | wc -l | awk '{ print $1 }'`
- if test $UNIQUEVALS -le 1; then
- AC_MSG_FAILURE([error: getaddrinfo() error value count too low])
- fi
UNIQUESYMBOLS=`cat $ERRVALFILE | wc -l | awk '{ print $1 }'`
- if test $UNIQUESYMBOLS -le 1; then
- AC_MSG_FAILURE([error: getaddrinfo() error symbol count too low])
- fi

if test $ERRNOCNT -ne $UNIQUESYMBOLS; then
AC_MSG_FAILURE([internal error: errno symbol count mismatch])
6 changes: 2 additions & 4 deletions spk/dante-sockd/Makefile
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
SPK_NAME = dante-sockd
SPK_VERS = 1.4.2
SPK_VERS = 1.4.3
SPK_REV = 1
SPK_ICON = src/dante.png

REQUIRED_DSM = 5.0

DEPENDS = cross/$(SPK_NAME)

MAINTAINER = Anonym-tsk
Expand All @@ -14,7 +12,7 @@ DESCRIPTION_FRE = Dante fournit le service socks et peut servir de firewall entr
RELOAD_UI = yes
STARTABLE = yes
DISPLAY_NAME = Dante SOCKS-server
CHANGELOG =
CHANGELOG = Update to version 1.4.3 and fix build on DSM7

HOMEPAGE = https://www.inet.no/dante/
LICENSE = BSD/CMU
Expand Down

0 comments on commit 5a9f41a

Please sign in to comment.