Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Arjan Bouter (7e73fb86d37fd4ca5ba4da00a2a4ee49dc627e81)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Arjan Bouter <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Arjan Bouter (7e73fb86d37fd4ca5ba4da00a2a4ee49dc627e81)
  • Date: Thu, 19 May 2011 07:22:46 -0500

GIT changes to master grimoire by Arjan Bouter <abouter AT sourcemage.org>:

dev/null |binary
net/dnsmasq/BUILD | 8 ++++++--
net/dnsmasq/CONFIGURE | 16 ++++++++++++++++
net/dnsmasq/DEPENDS | 2 +-
net/dnsmasq/DETAILS | 2 +-
net/dnsmasq/HISTORY | 5 +++++
net/dnsmasq/PRE_BUILD | 6 ------
net/dnsmasq/dnsmasq-2.52.tar.gz.sig | 0
net/dnsmasq/dnsmasq-2.57.tar.gz.sig |binary
9 files changed, 29 insertions(+), 10 deletions(-)

New commits:
commit 7e73fb86d37fd4ca5ba4da00a2a4ee49dc627e81
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

dnsmasq: version 2.57, moved dbus options from PRE_BUILD to BUILD, added
CONFIGURE with options for scripts, idn, tftp and dhcp support

diff --git a/net/dnsmasq/BUILD b/net/dnsmasq/BUILD
index 6f28cd3..d32fe58 100755
--- a/net/dnsmasq/BUILD
+++ b/net/dnsmasq/BUILD
@@ -1,5 +1,9 @@
+COPTS="$COPTS $DNSMASQ_IDN $DNSMASQ_RTC $DNSMASQ_TFTP $DNSMASQ_DHCP
$DNSMASQ_SCRIPT"
+if is_depends_enabled $SPELL dbus; then
+ COPTS="$COPTS -DHAVE_DBUS"
+fi &&
if is_depends_enabled $SPELL gettext; then
- make AWK=gawk PREFIX=/usr CFLAGS="$CFLAGS" all-i18n
+ make AWK=gawk PREFIX=/usr CFLAGS="$CFLAGS $COPTS" all-i18n
else
- make AWK=gawk PREFIX=/usr CFLAGS="$CFLAGS"
+ make AWK=gawk PREFIX=/usr CFLAGS="$CFLAGS $COPTS"
fi
diff --git a/net/dnsmasq/CONFIGURE b/net/dnsmasq/CONFIGURE
new file mode 100755
index 0000000..6f3ca1f
--- /dev/null
+++ b/net/dnsmasq/CONFIGURE
@@ -0,0 +1,16 @@
+config_query_option DNSMASQ_IDN "Enable International Domain Name support?" \
+ y "-DHAVE_IDN" "-DNO_IDN" &&
+
+message "Dnsmasq can use uptime instead of RTC for timing, enable this when"
&&
+message "your RTC is broken or if your leasefiles are on a flash filesystem"
&&
+config_query_option DNSMASQ_RTC "Use uptime instead of RTC for timing?" \
+ n "-DHAVE_BROKEN_RTC" "" &&
+
+config_query_option DNSMASQ_TFTP "Enable the built-in TFTP server?" \
+ y "-DHAVE_TFTP" "-DNO_TFTP" &&
+
+config_query_option DNSMASQ_DHCP "Enable the built-in DHCP server?" \
+ y "-DHAVE_DHCP" "-DNO_DHCP" &&
+
+config_query_option DNSMASQ_SCRIPT "Enable script actions on lease changes?"
\
+ y "-DHAVE_SCRIPT" "-DNO_SCRIPT"
diff --git a/net/dnsmasq/DEPENDS b/net/dnsmasq/DEPENDS
index a7314ad..9f4e537 100755
--- a/net/dnsmasq/DEPENDS
+++ b/net/dnsmasq/DEPENDS
@@ -3,5 +3,5 @@ optional_depends gettext \
"for i18n support" &&

optional_depends dbus \
- "--enable-dbus" "--disable-dbus" \
+ "" "" \
"for experimental DBus configuration support"
diff --git a/net/dnsmasq/DETAILS b/net/dnsmasq/DETAILS
index 224e48c..7fd16b7 100755
--- a/net/dnsmasq/DETAILS
+++ b/net/dnsmasq/DETAILS
@@ -1,5 +1,5 @@
SPELL=dnsmasq
- VERSION=2.52
+ VERSION=2.57
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.thekelleys.org.uk/dnsmasq/$SOURCE
diff --git a/net/dnsmasq/HISTORY b/net/dnsmasq/HISTORY
index 12e2caa..2fa7c11 100644
--- a/net/dnsmasq/HISTORY
+++ b/net/dnsmasq/HISTORY
@@ -1,3 +1,8 @@
+2011-05-19 Arjan Bouter <abouter AT sourcemage.org>
+ * DETAILS: version 2.57
+ * DEPENDS: --enable-dbus had no use, changed to optional -DHAVE_DBUS
in BUILD
+ * CONFIGURE, BUILD: handle dbus and other build options
+
2010-03-11 Sukneet Basuta <sukneet AT sourcemage.org>
* DETAILS: updated spell to 2.52

diff --git a/net/dnsmasq/PRE_BUILD b/net/dnsmasq/PRE_BUILD
deleted file mode 100755
index bc65a36..0000000
--- a/net/dnsmasq/PRE_BUILD
+++ /dev/null
@@ -1,6 +0,0 @@
-default_pre_build &&
-
-if list_find "$OPTS" "--enable-dbus"; then
- sedit 's:.*#define HAVE_DBUS.*:#define HAVE_DBUS:' \
- $SOURCE_DIRECTORY/src/config.h
-fi
diff --git a/net/dnsmasq/dnsmasq-2.52.tar.gz.sig
b/net/dnsmasq/dnsmasq-2.52.tar.gz.sig
deleted file mode 100644
index 60ead6c..0000000
Binary files a/net/dnsmasq/dnsmasq-2.52.tar.gz.sig and /dev/null differ
diff --git a/net/dnsmasq/dnsmasq-2.57.tar.gz.sig
b/net/dnsmasq/dnsmasq-2.57.tar.gz.sig
new file mode 100644
index 0000000..f02926e
Binary files /dev/null and b/net/dnsmasq/dnsmasq-2.57.tar.gz.sig differ



  • [SM-Commit] GIT changes to master grimoire by Arjan Bouter (7e73fb86d37fd4ca5ba4da00a2a4ee49dc627e81), Arjan Bouter, 05/19/2011

Archive powered by MHonArc 2.6.24.

Top of Page