diff options
Diffstat (limited to 'source/n/dnsmasq')
| -rwxr-xr-x | source/n/dnsmasq/dnsmasq.SlackBuild | 21 | ||||
| -rw-r--r-- | source/n/dnsmasq/dnsmasq.libidn2.diff | 13 | ||||
| -rw-r--r-- | source/n/dnsmasq/slack-desc | 10 |
3 files changed, 34 insertions, 10 deletions
diff --git a/source/n/dnsmasq/dnsmasq.SlackBuild b/source/n/dnsmasq/dnsmasq.SlackBuild index 7003af142..3ad8ca389 100755 --- a/source/n/dnsmasq/dnsmasq.SlackBuild +++ b/source/n/dnsmasq/dnsmasq.SlackBuild @@ -1,6 +1,6 @@ -#!/bin/sh +#!/bin/bash -# Copyright 2008, 2009, 2010, 2015 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2015, 2017, 2018 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,9 +20,11 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +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:-1} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:-" -j7 "} @@ -36,7 +38,14 @@ if [ -z "$ARCH" ]; then esac fi -CWD=$(pwd) +# If the variable PRINT_PACKAGE_NAME is set, then this script will report what +# the name of the created package would be, and then exit. This information +# could be useful to other scripts. +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" + exit 0 +fi + TMP=${TMP:-/tmp} PKG=$TMP/package-dnsmasq @@ -55,7 +64,9 @@ find . \ zcat $CWD/dnsmasq.leasedir.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1 -# Default CFLAGS are "-W -Wall -O2" - that's good enough. +# Use libidn2: +zcat $CWD/dnsmasq.libidn2.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1 + make $NUMJOBS all-i18n PREFIX=/usr MANDIR=/usr/man || exit 1 make install-i18n PREFIX=/usr DESTDIR=$PKG MANDIR=/usr/man || exit 1 chmod 0755 $PKG/usr/sbin/dnsmasq diff --git a/source/n/dnsmasq/dnsmasq.libidn2.diff b/source/n/dnsmasq/dnsmasq.libidn2.diff new file mode 100644 index 000000000..d99e556bc --- /dev/null +++ b/source/n/dnsmasq/dnsmasq.libidn2.diff @@ -0,0 +1,13 @@ +--- ./Makefile.orig 2017-05-22 16:58:46.000000000 -0500 ++++ ./Makefile 2017-07-07 13:28:14.124402827 -0500 +@@ -24,8 +24,8 @@ + LOCALEDIR = $(PREFIX)/share/locale + BUILDDIR = $(SRC) + DESTDIR = +-CFLAGS = -Wall -W -O2 +-LDFLAGS = ++CFLAGS = -Wall -W -O2 -DHAVE_LIBIDN2 ++LDFLAGS = -lidn2 + COPTS = + RPM_OPT_FLAGS = + LIBS = diff --git a/source/n/dnsmasq/slack-desc b/source/n/dnsmasq/slack-desc index 0a0c5770f..be34433f5 100644 --- a/source/n/dnsmasq/slack-desc +++ b/source/n/dnsmasq/slack-desc @@ -1,19 +1,19 @@ # HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line +# The "handy ruler" below makes it easier to edit a package description. Line # up the first '|' above the ':' following the base package name, and the '|' on -# the right side marks the last column you can put a character in. You must make -# exactly 11 lines for the formatting to be correct. It's also customary to +# the right side marks the last column you can put a character in. You must make +# exactly 11 lines for the formatting to be correct. It's also customary to # leave one space after the ':'. |-----handy-ruler------------------------------------------------------| dnsmasq: dnsmasq (small DNS and DHCP server) dnsmasq: dnsmasq: Dnsmasq is a lightweight, easy to configure DNS forwarder and DHCP -dnsmasq: server. It is designed to provide DNS (and optionally DHCP) to a +dnsmasq: server. It is designed to provide DNS (and optionally DHCP) to a dnsmasq: small network, and can serve the names of local machines which are not dnsmasq: in the global DNS. dnsmasq: dnsmasq: Dnsmasq was written by Simon Kelley. dnsmasq: -dnsmasq: +dnsmasq: Homepage: http://www.thekelleys.org.uk/dnsmasq/ dnsmasq: |