diff options
| author | Patrick J Volkerding <volkerdi@slackware.com> | 2020-04-12 20:02:28 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2020-04-13 08:59:51 +0200 |
| commit | 8efda2a1ab784668bf5046915f7e4ae0f48ad8b2 (patch) | |
| tree | 88d69d63f16ffe8a1429aa8637416cf535d51966 /source/n/dnsmasq | |
| parent | 4907ec15b89c8c3f8d54fc3c9c0122a6ffb5d09d (diff) | |
| download | current-8efda2a1ab784668bf5046915f7e4ae0f48ad8b2.tar.gz | |
Sun Apr 12 20:02:28 UTC 202020200412200228
ap/man-pages-5.06-noarch-1.txz: Upgraded.
l/libyaml-0.2.3-x86_64-1.txz: Upgraded.
n/dnsmasq-2.81-x86_64-1.txz: Upgraded.
x/libinput-1.15.5-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/n/dnsmasq')
| -rwxr-xr-x | source/n/dnsmasq/dnsmasq.SlackBuild | 5 | ||||
| -rw-r--r-- | source/n/dnsmasq/dnsmasq.nettle35.diff | 20 |
2 files changed, 1 insertions, 24 deletions
diff --git a/source/n/dnsmasq/dnsmasq.SlackBuild b/source/n/dnsmasq/dnsmasq.SlackBuild index e34d3920..29a79927 100755 --- a/source/n/dnsmasq/dnsmasq.SlackBuild +++ b/source/n/dnsmasq/dnsmasq.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=dnsmasq VERSION=${VERSION:-$(echo dnsmasq-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-4} +BUILD=${BUILD:-1} EXTRA_BUILD_OPTS=${EXTRA_BUILD_OPTS:-"-DHAVE_DNSSEC -DHAVE_DBUS -DHAVE_LIBIDN2 -DHAVE_CONNTRACK"} @@ -72,9 +72,6 @@ zcat $CWD/dnsmasq.libidn2.diff.gz | patch -p1 --verbose --backup --suffix=.orig # Fix build with Linux 5.4.x: zcat $CWD/dnsmasq-2.80-SIOCGSTAMP.patch.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1 -# Fix build with nettle-3.5: -zcat $CWD/dnsmasq.nettle35.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1 - make $NUMJOBS all-i18n PREFIX=/usr MANDIR=/usr/man COPTS="$EXTRA_BUILD_OPTS" || exit 1 make install-i18n PREFIX=/usr DESTDIR=$PKG MANDIR=/usr/man COPTS="$EXTRA_BUILD_OPTS" || exit 1 chmod 0755 $PKG/usr/sbin/dnsmasq diff --git a/source/n/dnsmasq/dnsmasq.nettle35.diff b/source/n/dnsmasq/dnsmasq.nettle35.diff deleted file mode 100644 index f90b1a49..00000000 --- a/source/n/dnsmasq/dnsmasq.nettle35.diff +++ /dev/null @@ -1,20 +0,0 @@ ---- ./src/crypto.c.orig 2018-10-18 13:21:55.000000000 -0500 -+++ ./src/crypto.c 2020-02-22 13:04:53.071018567 -0600 -@@ -294,7 +294,7 @@ - if (!(key_256 = whine_malloc(sizeof(struct ecc_point)))) - return 0; - -- nettle_ecc_point_init(key_256, &nettle_secp_256r1); -+ nettle_ecc_point_init(key_256, nettle_get_secp_256r1()); - } - - key = key_256; -@@ -307,7 +307,7 @@ - if (!(key_384 = whine_malloc(sizeof(struct ecc_point)))) - return 0; - -- nettle_ecc_point_init(key_384, &nettle_secp_384r1); -+ nettle_ecc_point_init(key_384, nettle_get_secp_384r1()); - } - - key = key_384; |