mirror of
http://thekelleys.org.uk/git/dnsmasq.git
synced 2026-11-03 13:38:32 +00:00
Compare commits
3
Commits
v2.90test2
...
v2.90test3
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
db07664f2a | ||
|
|
1205fc3541 | ||
|
|
3a8ebcac77 |
No files matched your search
@@ -29,6 +29,7 @@ LDFLAGS =
|
||||
COPTS =
|
||||
RPM_OPT_FLAGS =
|
||||
LIBS =
|
||||
LUA = lua
|
||||
|
||||
#################################################################
|
||||
|
||||
@@ -60,8 +61,8 @@ idn2_cflags = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LIBIDN2 $(PKG_CONFI
|
||||
idn2_libs = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LIBIDN2 $(PKG_CONFIG) --libs libidn2`
|
||||
ct_cflags = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_CONNTRACK $(PKG_CONFIG) --cflags libnetfilter_conntrack`
|
||||
ct_libs = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_CONNTRACK $(PKG_CONFIG) --libs libnetfilter_conntrack`
|
||||
lua_cflags = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LUASCRIPT $(PKG_CONFIG) --cflags lua5.4`
|
||||
lua_libs = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LUASCRIPT $(PKG_CONFIG) --libs lua5.4`
|
||||
lua_cflags = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LUASCRIPT $(PKG_CONFIG) --cflags $(LUA)`
|
||||
lua_libs = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LUASCRIPT $(PKG_CONFIG) --libs $(LUA)`
|
||||
nettle_cflags = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_DNSSEC $(PKG_CONFIG) --cflags 'nettle hogweed' \
|
||||
HAVE_CRYPTOHASH $(PKG_CONFIG) --cflags nettle \
|
||||
HAVE_NETTLEHASH $(PKG_CONFIG) --cflags nettle`
|
||||
|
||||
Vendored
+4
-2
@@ -1,7 +1,9 @@
|
||||
dnsmasq (2.90-1) experimental; urgency=medium
|
||||
dnsmasq (2.90~test3-1) experimental; urgency=medium
|
||||
|
||||
[ Simon Kelley ]
|
||||
* New upstream. (closes: #1033165)
|
||||
* Move hard-coding of Lua version from the upstream Makefile
|
||||
to d/rules.
|
||||
[ Sven Geuer ]
|
||||
* Introduce autokpgtests per d/tests/* (closes: #1034135).
|
||||
* Switch to dpkg-source 3.0 (quilt) format (closes: #1007041).
|
||||
@@ -78,7 +80,7 @@ dnsmasq (2.90-1) experimental; urgency=medium
|
||||
* Introduce d/u/metadata.
|
||||
* Fix lintian issue duplicate-short-description.
|
||||
* Fix lintian issue capitalization-error-in-description.
|
||||
* Bump LUA version to 5.4 (closes: #1050750).
|
||||
* Bump Lua version to 5.4 (closes: #1050750).
|
||||
Modified files:
|
||||
- d/control
|
||||
- d/t/functions.d/log.patterns
|
||||
|
||||
Vendored
+1
-1
@@ -87,7 +87,7 @@ override_dh_auto_install:
|
||||
BUILDDIR=debian/auto-build/dnsmasq-base-lua \
|
||||
DESTDIR=$(CURDIR)/debian/dnsmasq-base-lua \
|
||||
PREFIX=$(PREFIX) CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \
|
||||
COPTS="$(COPTS) -DHAVE_LUASCRIPT"
|
||||
LUA=lua5.4 COPTS="$(COPTS) -DHAVE_LUASCRIPT"
|
||||
dh_auto_build -p dnsmasq-utils -D contrib/lease-tools
|
||||
|
||||
override_dh_auto_clean:
|
||||
|
||||
Reference in new issue
Block a user