* [Buildroot] svn commit: trunk/buildroot/package/dnsmasq
@ 2007-07-23 8:47 ulf at uclibc.org
0 siblings, 0 replies; 15+ messages in thread
From: ulf at uclibc.org @ 2007-07-23 8:47 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2007-07-23 01:47:32 -0700 (Mon, 23 Jul 2007)
New Revision: 19206
Log:
Bump version of dnsmasq, with new patches
Added:
trunk/buildroot/package/dnsmasq/dnsmasq2-100-include-correct-prctl-header.patch
Modified:
trunk/buildroot/package/dnsmasq/dnsmasq.mk
Changeset:
Modified: trunk/buildroot/package/dnsmasq/dnsmasq.mk
===================================================================
--- trunk/buildroot/package/dnsmasq/dnsmasq.mk 2007-07-23 08:35:06 UTC (rev 19205)
+++ trunk/buildroot/package/dnsmasq/dnsmasq.mk 2007-07-23 08:47:32 UTC (rev 19206)
@@ -6,7 +6,7 @@
DNSMASQ_SITE=http://thekelleys.org.uk/dnsmasq
ifeq ($(filter $(TARGETS),dnsmasq1),)
-DNSMASQ_UPVER=2.22
+DNSMASQ_UPVER=2.39
DNSMASQ_VERSION=dnsmasq2
else
DNSMASQ_UPVER=1.18
@@ -34,6 +34,8 @@
$(MAKE) BINDIR=/usr/sbin MANDIR=/usr/man \
DESTDIR=$(TARGET_DIR) -C $(DNSMASQ_DIR) install
$(STRIP) $(TARGET_DIR)/$(DNSMASQ_TARGET_BINARY)
+ mkdir -p $(TARGET_DIR)/var/lib/misc
+ ln -sf /tmp/dnsmasq.leases $(TARGET_DIR)/var/lib/misc/dnsmasq.leases
rm -rf $(TARGET_DIR)/usr/man
dnsmasq: uclibc $(TARGET_DIR)/$(DNSMASQ_TARGET_BINARY)
Added: trunk/buildroot/package/dnsmasq/dnsmasq2-100-include-correct-prctl-header.patch
===================================================================
--- trunk/buildroot/package/dnsmasq/dnsmasq2-100-include-correct-prctl-header.patch (rev 0)
+++ trunk/buildroot/package/dnsmasq/dnsmasq2-100-include-correct-prctl-header.patch 2007-07-23 08:47:32 UTC (rev 19206)
@@ -0,0 +1,12 @@
+diff -upr dnsmasq-2.39/src/dnsmasq.h dnsmasq-2.39-orig/src/dnsmasq.h
+--- dnsmasq-2.39/src/dnsmasq.h 2007-04-20 12:53:38.000000000 +0200
++++ dnsmasq-2.39-orig/src/dnsmasq.h 2007-06-12 11:12:19.000000000 +0200
+@@ -79,7 +79,7 @@
+ /* There doesn't seem to be a universally-available
+ userpace header for this. */
+ extern int capset(cap_user_header_t header, cap_user_data_t data);
+-#include <sys/prctl.h>
++#include <linux/prctl.h>
+ #endif
+
+ /* Min buffer size: we check after adding each record, so there must be
^ permalink raw reply [flat|nested] 15+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/dnsmasq
@ 2007-07-23 8:54 ulf at uclibc.org
0 siblings, 0 replies; 15+ messages in thread
From: ulf at uclibc.org @ 2007-07-23 8:54 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2007-07-23 01:54:47 -0700 (Mon, 23 Jul 2007)
New Revision: 19207
Log:
Remove unneeded patch from new dnsmasq version
Removed:
trunk/buildroot/package/dnsmasq/dnsmasq2-100-config.patch
Changeset:
Deleted: trunk/buildroot/package/dnsmasq/dnsmasq2-100-config.patch
===================================================================
--- trunk/buildroot/package/dnsmasq/dnsmasq2-100-config.patch 2007-07-23 08:47:32 UTC (rev 19206)
+++ trunk/buildroot/package/dnsmasq/dnsmasq2-100-config.patch 2007-07-23 08:54:47 UTC (rev 19207)
@@ -1,49 +0,0 @@
-diff -ur dnsmasq-2.15.orig/src/config.h dnsmasq-2.15/src/config.h
---- dnsmasq-2.15.orig/src/config.h 2004-10-08 11:41:34.757371880 -0400
-+++ dnsmasq-2.15/src/config.h 2004-10-08 11:43:49.074952504 -0400
-@@ -78,6 +78,11 @@
- /* We assume that systems which don't have IPv6
- headers don't have ntop and pton either */
-
-+#if defined(__UCLIBC__) && !defined(__UCLIBC_HAS_IPV6__)
-+# undef NO_IPV6
-+# define NO_IPV6
-+#endif
-+
- #if defined(INET6_ADDRSTRLEN) && defined(IPV6_V6ONLY) && !defined(NO_IPV6)
- # define HAVE_IPV6
- # define ADDRSTRLEN INET6_ADDRSTRLEN
-@@ -194,7 +199,7 @@
- /* platform dependent options. */
-
- /* Must preceed __linux__ since uClinux defines __linux__ too. */
--#if defined(__uClinux__) || defined(__UCLIBC__)
-+#if defined(__uClinux__)
- #undef HAVE_LINUX_IPV6_PROC
- #define HAVE_GETOPT_LONG
- #undef HAVE_ARC4RANDOM
-@@ -208,6 +213,24 @@
- # define NO_FORK
- #endif
-
-+#elif defined(__linux__) && defined(__UCLIBC__)
-+# define HAVE_LINUX_IPV6_PROC
-+# if defined(__UCLIBC_HAS_GNU_GETOPT__) || \
-+ ((__UCLIBC_MAJOR__==0) && (__UCLIBC_MINOR__==9) && (__UCLIBC_SUBLEVEL__<21))
-+# define HAVE_GETOPT_LONG
-+# else
-+# undef HAVE_GETOPT_LONG
-+# endif
-+#undef HAVE_ARC4RANDOM
-+#define HAVE_RANDOM
-+#define HAVE_DEV_URANDOM
-+#define HAVE_DEV_RANDOM
-+#undef HAVE_SOCKADDR_SA_LEN
-+#undef HAVE_PSELECT
-+#if !defined(__ARCH_HAS_MMU__)
-+# define NO_FORK
-+#endif
-+
- /* libc5 - must precede __linux__ too */
- /* Note to build a libc5 binary on a modern Debian system:
- install the packages altgcc libc5 and libc5-altdev
^ permalink raw reply [flat|nested] 15+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/dnsmasq
@ 2007-08-20 9:25 ulf at uclibc.org
0 siblings, 0 replies; 15+ messages in thread
From: ulf at uclibc.org @ 2007-08-20 9:25 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2007-08-20 02:25:47 -0700 (Mon, 20 Aug 2007)
New Revision: 19589
Log:
Cleanup dnsmasq
Modified:
trunk/buildroot/package/dnsmasq/dnsmasq.mk
Changeset:
Modified: trunk/buildroot/package/dnsmasq/dnsmasq.mk
===================================================================
--- trunk/buildroot/package/dnsmasq/dnsmasq.mk 2007-08-20 07:24:10 UTC (rev 19588)
+++ trunk/buildroot/package/dnsmasq/dnsmasq.mk 2007-08-20 09:25:47 UTC (rev 19589)
@@ -24,19 +24,20 @@
$(ZCAT) $(DL_DIR)/$(DNSMASQ_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
toolchain/patch-kernel.sh $(DNSMASQ_DIR) package/dnsmasq/ \
$(DNSMASQ_VERSION)\*.patch
- touch $(DNSMASQ_DIR)/.source
+ touch $@
$(DNSMASQ_DIR)/src/$(DNSMASQ_BINARY): $(DNSMASQ_DIR)/.source
$(MAKE) CC=$(TARGET_CC) CFLAGS="$(TARGET_CFLAGS)" \
- BINDIR=/usr/sbin MANDIR=/usr/man -C $(DNSMASQ_DIR)
+ PREFIX=/usr -C $(DNSMASQ_DIR)
$(TARGET_DIR)/$(DNSMASQ_TARGET_BINARY): $(DNSMASQ_DIR)/src/$(DNSMASQ_BINARY)
- $(MAKE) BINDIR=/usr/sbin MANDIR=/usr/man \
- DESTDIR=$(TARGET_DIR) -C $(DNSMASQ_DIR) install
+ $(MAKE) DESTDIR=$(TARGET_DIR) PREFIX=/usr -C $(DNSMASQ_DIR) install
$(STRIP) $(TARGET_DIR)/$(DNSMASQ_TARGET_BINARY)
mkdir -p $(TARGET_DIR)/var/lib/misc
+ # Isn't this vulverable to symlink attacks?
ln -sf /tmp/dnsmasq.leases $(TARGET_DIR)/var/lib/misc/dnsmasq.leases
- rm -rf $(TARGET_DIR)/usr/man
+ # Another questionable wipe out :(
+ #rm -rf $(TARGET_DIR)/usr/share/man
dnsmasq: uclibc $(TARGET_DIR)/$(DNSMASQ_TARGET_BINARY)
@@ -45,7 +46,9 @@
dnsmasq-source: $(DL_DIR)/$(DNSMASQ_SOURCE)
dnsmasq-clean:
- #$(MAKE) prefix=$(TARGET_DIR)/usr -C $(DNSMASQ_DIR) uninstall
+ rm -f $(addprefix $(TARGET_DIR)/,var/lib/misc/dnsmasq.leases \
+ usr/share/man/man?/dnsmasq.* \
+ $(DNSMASQ_TARGET_BINARY))
-$(MAKE) -C $(DNSMASQ_DIR) clean
dnsmasq-dirclean:
^ permalink raw reply [flat|nested] 15+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/dnsmasq
@ 2007-09-10 9:04 jacmet at uclibc.org
0 siblings, 0 replies; 15+ messages in thread
From: jacmet at uclibc.org @ 2007-09-10 9:04 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2007-09-10 02:04:03 -0700 (Mon, 10 Sep 2007)
New Revision: 19809
Log:
Use BR2_INET_IPV6 and BR2_HAVE_MANPAGES options.
Use := instead of =
Modified:
trunk/buildroot/package/dnsmasq/dnsmasq.mk
Changeset:
Modified: trunk/buildroot/package/dnsmasq/dnsmasq.mk
===================================================================
--- trunk/buildroot/package/dnsmasq/dnsmasq.mk 2007-09-10 07:38:03 UTC (rev 19808)
+++ trunk/buildroot/package/dnsmasq/dnsmasq.mk 2007-09-10 09:04:03 UTC (rev 19809)
@@ -4,19 +4,25 @@
#
#############################################################
-DNSMASQ_SITE=http://thekelleys.org.uk/dnsmasq
+DNSMASQ_SITE:=http://thekelleys.org.uk/dnsmasq
ifeq ($(filter $(TARGETS),dnsmasq1),)
-DNSMASQ_UPVER=2.39
-DNSMASQ_VERSION=dnsmasq2
+DNSMASQ_UPVER:=2.39
+DNSMASQ_VERSION:=dnsmasq2
else
-DNSMASQ_UPVER=1.18
-DNSMASQ_VERSION=dnsmasq1
+DNSMASQ_UPVER:=1.18
+DNSMASQ_VERSION:=dnsmasq1
endif
-DNSMASQ_SOURCE=dnsmasq-$(DNSMASQ_UPVER).tar.gz
-DNSMASQ_DIR=$(BUILD_DIR)/dnsmasq-$(DNSMASQ_UPVER)
-DNSMASQ_BINARY=dnsmasq
-DNSMASQ_TARGET_BINARY=usr/sbin/dnsmasq
+DNSMASQ_SOURCE:=dnsmasq-$(DNSMASQ_UPVER).tar.gz
+DNSMASQ_DIR:=$(BUILD_DIR)/dnsmasq-$(DNSMASQ_UPVER)
+DNSMASQ_BINARY:=dnsmasq
+DNSMASQ_TARGET_BINARY:=usr/sbin/dnsmasq
+ifneq ($(BR2_INET_IPV6),y)
+DNSMASQ_COPTS:=-DNO_IPV6
+else
+DNSMASQ_COPTS:=
+endif
+
$(DL_DIR)/$(DNSMASQ_SOURCE):
$(WGET) -P $(DL_DIR) $(DNSMASQ_SITE)/$(DNSMASQ_SOURCE)
@@ -28,7 +34,7 @@
$(DNSMASQ_DIR)/src/$(DNSMASQ_BINARY): $(DNSMASQ_DIR)/.source
$(MAKE) CC=$(TARGET_CC) CFLAGS="$(TARGET_CFLAGS)" \
- PREFIX=/usr -C $(DNSMASQ_DIR)
+ COPTS=$(DNSMASQ_COPTS) PREFIX=/usr -C $(DNSMASQ_DIR)
$(TARGET_DIR)/$(DNSMASQ_TARGET_BINARY): $(DNSMASQ_DIR)/src/$(DNSMASQ_BINARY)
$(MAKE) DESTDIR=$(TARGET_DIR) PREFIX=/usr -C $(DNSMASQ_DIR) install
@@ -36,8 +42,9 @@
mkdir -p $(TARGET_DIR)/var/lib/misc
# Isn't this vulverable to symlink attacks?
ln -sf /tmp/dnsmasq.leases $(TARGET_DIR)/var/lib/misc/dnsmasq.leases
- # Another questionable wipe out :(
- #rm -rf $(TARGET_DIR)/usr/share/man
+ifneq ($(BR2_HAVE_MANPAGES),y)
+ rm -rf $(TARGET_DIR)/usr/share/man
+endif
dnsmasq: uclibc $(TARGET_DIR)/$(DNSMASQ_TARGET_BINARY)
^ permalink raw reply [flat|nested] 15+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/dnsmasq
@ 2007-09-10 9:05 jacmet at uclibc.org
0 siblings, 0 replies; 15+ messages in thread
From: jacmet at uclibc.org @ 2007-09-10 9:05 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2007-09-10 02:05:58 -0700 (Mon, 10 Sep 2007)
New Revision: 19810
Log:
Bump version
Modified:
trunk/buildroot/package/dnsmasq/dnsmasq.mk
Changeset:
Modified: trunk/buildroot/package/dnsmasq/dnsmasq.mk
===================================================================
--- trunk/buildroot/package/dnsmasq/dnsmasq.mk 2007-09-10 09:04:03 UTC (rev 19809)
+++ trunk/buildroot/package/dnsmasq/dnsmasq.mk 2007-09-10 09:05:58 UTC (rev 19810)
@@ -6,7 +6,7 @@
DNSMASQ_SITE:=http://thekelleys.org.uk/dnsmasq
ifeq ($(filter $(TARGETS),dnsmasq1),)
-DNSMASQ_UPVER:=2.39
+DNSMASQ_UPVER:=2.40
DNSMASQ_VERSION:=dnsmasq2
else
DNSMASQ_UPVER:=1.18
^ permalink raw reply [flat|nested] 15+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/dnsmasq
@ 2008-03-02 14:36 jacmet at uclibc.org
0 siblings, 0 replies; 15+ messages in thread
From: jacmet at uclibc.org @ 2008-03-02 14:36 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-03-02 06:36:35 -0800 (Sun, 02 Mar 2008)
New Revision: 21151
Log:
dnsmasq: remove dnsmasq1 support
Remove ancient dnsmasq1 support, which couldn't even be selected in
menuconfig.
Removed:
trunk/buildroot/package/dnsmasq/dnsmasq1-100-bugfix.patch
Modified:
trunk/buildroot/package/dnsmasq/dnsmasq.mk
Changeset:
Modified: trunk/buildroot/package/dnsmasq/dnsmasq.mk
===================================================================
--- trunk/buildroot/package/dnsmasq/dnsmasq.mk 2008-03-02 14:33:26 UTC (rev 21150)
+++ trunk/buildroot/package/dnsmasq/dnsmasq.mk 2008-03-02 14:36:35 UTC (rev 21151)
@@ -5,13 +5,7 @@
#############################################################
DNSMASQ_SITE:=http://thekelleys.org.uk/dnsmasq
-ifeq ($(filter $(TARGETS),dnsmasq1),)
DNSMASQ_UPVER:=2.40
-DNSMASQ_VERSION:=dnsmasq2
-else
-DNSMASQ_UPVER:=1.18
-DNSMASQ_VERSION:=dnsmasq1
-endif
DNSMASQ_SOURCE:=dnsmasq-$(DNSMASQ_UPVER).tar.gz
DNSMASQ_DIR:=$(BUILD_DIR)/dnsmasq-$(DNSMASQ_UPVER)
DNSMASQ_BINARY:=dnsmasq
@@ -28,8 +22,7 @@
$(DNSMASQ_DIR)/.source: $(DL_DIR)/$(DNSMASQ_SOURCE)
$(ZCAT) $(DL_DIR)/$(DNSMASQ_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- toolchain/patch-kernel.sh $(DNSMASQ_DIR) package/dnsmasq/ \
- $(DNSMASQ_VERSION)\*.patch
+ toolchain/patch-kernel.sh $(DNSMASQ_DIR) package/dnsmasq/ \*.patch
touch $@
$(DNSMASQ_DIR)/src/$(DNSMASQ_BINARY): $(DNSMASQ_DIR)/.source
@@ -40,7 +33,7 @@
$(MAKE) DESTDIR=$(TARGET_DIR) PREFIX=/usr -C $(DNSMASQ_DIR) install
$(STRIPCMD) $(TARGET_DIR)/$(DNSMASQ_TARGET_BINARY)
mkdir -p $(TARGET_DIR)/var/lib/misc
- # Isn't this vulverable to symlink attacks?
+ # Isn't this vulnerable to symlink attacks?
ln -sf /tmp/dnsmasq.leases $(TARGET_DIR)/var/lib/misc/dnsmasq.leases
ifneq ($(BR2_HAVE_MANPAGES),y)
rm -rf $(TARGET_DIR)/usr/share/man
Deleted: trunk/buildroot/package/dnsmasq/dnsmasq1-100-bugfix.patch
===================================================================
--- trunk/buildroot/package/dnsmasq/dnsmasq1-100-bugfix.patch 2008-03-02 14:33:26 UTC (rev 21150)
+++ trunk/buildroot/package/dnsmasq/dnsmasq1-100-bugfix.patch 2008-03-02 14:36:35 UTC (rev 21151)
@@ -1,25 +0,0 @@
---- dnsmasq-1.18/config.h.dist 2004-03-01 22:25:12.000000000 -0600
-+++ dnsmasq-1.18/config.h 2004-03-01 22:26:50.000000000 -0600
-@@ -126,7 +126,9 @@
-
- /* Must preceed __linux__ since uClinux defines __linux__ too. */
- #if defined(__uClinux__) || defined(__UCLIBC__)
-+#ifndef __UCLIBC_HAS_IPV6__
- #undef HAVE_LINUX_IPV6_PROC
-+#endif
- #define HAVE_GETOPT_LONG
- #undef HAVE_ARC4RANDOM
- #define HAVE_RANDOM
-diff -x CVS -urN dnsmasq-1.18/option.c dnsmasq.old/option.c
---- dnsmasq-1.18/option.c 2003-11-05 08:22:18.000000000 -0600
-+++ dnsmasq.old/option.c 2004-01-05 23:40:11.000000000 -0600
-@@ -578,8 +578,8 @@
- #ifdef HAVE_IPV6
- else if (tmp->source_addr.sa.sa_family == AF_INET6)
- tmp->source_addr.in6.sin6_port = htons(*query_port);
-- }
- #endif
-+ }
- }
-
- if (*if_addrs)
^ permalink raw reply [flat|nested] 15+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/dnsmasq
@ 2008-03-02 14:36 jacmet at uclibc.org
0 siblings, 0 replies; 15+ messages in thread
From: jacmet at uclibc.org @ 2008-03-02 14:36 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-03-02 06:36:40 -0800 (Sun, 02 Mar 2008)
New Revision: 21152
Log:
dnsmasq: make tftp support optional
Modified:
trunk/buildroot/package/dnsmasq/Config.in
trunk/buildroot/package/dnsmasq/dnsmasq.mk
Changeset:
Modified: trunk/buildroot/package/dnsmasq/Config.in
===================================================================
--- trunk/buildroot/package/dnsmasq/Config.in 2008-03-02 14:36:35 UTC (rev 21151)
+++ trunk/buildroot/package/dnsmasq/Config.in 2008-03-02 14:36:40 UTC (rev 21152)
@@ -6,3 +6,11 @@
coupled DNS and DHCP service to a LAN.
http://www.thekelleys.org.uk/dnsmasq/
+
+config BR2_PACKAGE_DNSMASQ_TFTP
+ bool "tftp support"
+ default y
+ depends on BR2_PACKAGE_DNSMASQ
+ help
+ Enable TFTP support in dnsmasq.
+
Modified: trunk/buildroot/package/dnsmasq/dnsmasq.mk
===================================================================
--- trunk/buildroot/package/dnsmasq/dnsmasq.mk 2008-03-02 14:36:35 UTC (rev 21151)
+++ trunk/buildroot/package/dnsmasq/dnsmasq.mk 2008-03-02 14:36:40 UTC (rev 21152)
@@ -11,12 +11,16 @@
DNSMASQ_BINARY:=dnsmasq
DNSMASQ_TARGET_BINARY:=usr/sbin/dnsmasq
+DNSMASQ_COPTS:=
+
ifneq ($(BR2_INET_IPV6),y)
-DNSMASQ_COPTS:=-DNO_IPV6
-else
-DNSMASQ_COPTS:=
+DNSMASQ_COPTS+=-DNO_IPV6
endif
+ifneq ($(BR2_PACKAGE_DNSMASQ_TFTP),y)
+DNSMASQ_COPTS+=-DNO_TFTP
+endif
+
$(DL_DIR)/$(DNSMASQ_SOURCE):
$(WGET) -P $(DL_DIR) $(DNSMASQ_SITE)/$(DNSMASQ_SOURCE)
@@ -27,7 +31,7 @@
$(DNSMASQ_DIR)/src/$(DNSMASQ_BINARY): $(DNSMASQ_DIR)/.source
$(MAKE) CC=$(TARGET_CC) CFLAGS="$(TARGET_CFLAGS)" \
- COPTS=$(DNSMASQ_COPTS) PREFIX=/usr -C $(DNSMASQ_DIR)
+ COPTS='$(DNSMASQ_COPTS)' PREFIX=/usr -C $(DNSMASQ_DIR)
$(TARGET_DIR)/$(DNSMASQ_TARGET_BINARY): $(DNSMASQ_DIR)/src/$(DNSMASQ_BINARY)
$(MAKE) DESTDIR=$(TARGET_DIR) PREFIX=/usr -C $(DNSMASQ_DIR) install
@@ -41,8 +45,6 @@
dnsmasq: uclibc $(TARGET_DIR)/$(DNSMASQ_TARGET_BINARY)
-dnsmasq1: uclibc $(TARGET_DIR)/$(DNSMASQ_TARGET_BINARY)
-
dnsmasq-source: $(DL_DIR)/$(DNSMASQ_SOURCE)
dnsmasq-clean:
^ permalink raw reply [flat|nested] 15+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/dnsmasq
@ 2008-03-02 14:36 jacmet at uclibc.org
0 siblings, 0 replies; 15+ messages in thread
From: jacmet at uclibc.org @ 2008-03-02 14:36 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-03-02 06:36:43 -0800 (Sun, 02 Mar 2008)
New Revision: 21153
Log:
dnsmasq: Enable dbus support if available
Modified:
trunk/buildroot/package/dnsmasq/dnsmasq.mk
Changeset:
Modified: trunk/buildroot/package/dnsmasq/dnsmasq.mk
===================================================================
--- trunk/buildroot/package/dnsmasq/dnsmasq.mk 2008-03-02 14:36:40 UTC (rev 21152)
+++ trunk/buildroot/package/dnsmasq/dnsmasq.mk 2008-03-02 14:36:43 UTC (rev 21153)
@@ -21,6 +21,12 @@
DNSMASQ_COPTS+=-DNO_TFTP
endif
+ifeq ($(strip $(BR2_PACKAGE_DBUS)),y)
+DNSMASQ_DBUS:=$(TARGET_DIR)/usr/bin/dbus-daemon
+else
+DNSMASQ_DBUS:=
+endif
+
$(DL_DIR)/$(DNSMASQ_SOURCE):
$(WGET) -P $(DL_DIR) $(DNSMASQ_SITE)/$(DNSMASQ_SOURCE)
@@ -29,7 +35,14 @@
toolchain/patch-kernel.sh $(DNSMASQ_DIR) package/dnsmasq/ \*.patch
touch $@
-$(DNSMASQ_DIR)/src/$(DNSMASQ_BINARY): $(DNSMASQ_DIR)/.source
+$(DNSMASQ_DIR)/src/$(DNSMASQ_BINARY): $(DNSMASQ_DIR)/.source $(DNSMASQ_DBUS)
+ifeq ($(strip $(BR2_PACKAGE_DBUS)),y)
+ $(SED) 's^.*#define HAVE_DBUS.*^#define HAVE_DBUS^' \
+ $(DNSMASQ_DIR)/src/config.h
+else
+ $(SED) 's^.*#define HAVE_DBUS.*^/* #define HAVE_DBUS */^' \
+ $(DNSMASQ_DIR)/src/config.h
+endif
$(MAKE) CC=$(TARGET_CC) CFLAGS="$(TARGET_CFLAGS)" \
COPTS='$(DNSMASQ_COPTS)' PREFIX=/usr -C $(DNSMASQ_DIR)
^ permalink raw reply [flat|nested] 15+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/dnsmasq
@ 2008-03-02 14:36 jacmet at uclibc.org
0 siblings, 0 replies; 15+ messages in thread
From: jacmet at uclibc.org @ 2008-03-02 14:36 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-03-02 06:36:46 -0800 (Sun, 02 Mar 2008)
New Revision: 21154
Log:
dnsmasq: bump version
Removed:
trunk/buildroot/package/dnsmasq/dnsmasq2-100-include-correct-prctl-header.patch
Modified:
trunk/buildroot/package/dnsmasq/dnsmasq.mk
Changeset:
Modified: trunk/buildroot/package/dnsmasq/dnsmasq.mk
===================================================================
--- trunk/buildroot/package/dnsmasq/dnsmasq.mk 2008-03-02 14:36:43 UTC (rev 21153)
+++ trunk/buildroot/package/dnsmasq/dnsmasq.mk 2008-03-02 14:36:46 UTC (rev 21154)
@@ -5,7 +5,7 @@
#############################################################
DNSMASQ_SITE:=http://thekelleys.org.uk/dnsmasq
-DNSMASQ_UPVER:=2.40
+DNSMASQ_UPVER:=2.41
DNSMASQ_SOURCE:=dnsmasq-$(DNSMASQ_UPVER).tar.gz
DNSMASQ_DIR:=$(BUILD_DIR)/dnsmasq-$(DNSMASQ_UPVER)
DNSMASQ_BINARY:=dnsmasq
Deleted: trunk/buildroot/package/dnsmasq/dnsmasq2-100-include-correct-prctl-header.patch
===================================================================
--- trunk/buildroot/package/dnsmasq/dnsmasq2-100-include-correct-prctl-header.patch 2008-03-02 14:36:43 UTC (rev 21153)
+++ trunk/buildroot/package/dnsmasq/dnsmasq2-100-include-correct-prctl-header.patch 2008-03-02 14:36:46 UTC (rev 21154)
@@ -1,12 +0,0 @@
-diff -upr dnsmasq-2.39/src/dnsmasq.h dnsmasq-2.39-orig/src/dnsmasq.h
---- dnsmasq-2.39/src/dnsmasq.h 2007-04-20 12:53:38.000000000 +0200
-+++ dnsmasq-2.39-orig/src/dnsmasq.h 2007-06-12 11:12:19.000000000 +0200
-@@ -79,7 +79,7 @@
- /* There doesn't seem to be a universally-available
- userpace header for this. */
- extern int capset(cap_user_header_t header, cap_user_data_t data);
--#include <sys/prctl.h>
-+#include <linux/prctl.h>
- #endif
-
- /* Min buffer size: we check after adding each record, so there must be
^ permalink raw reply [flat|nested] 15+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/dnsmasq
@ 2008-06-15 20:44 jacmet at uclibc.org
0 siblings, 0 replies; 15+ messages in thread
From: jacmet at uclibc.org @ 2008-06-15 20:44 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-06-15 13:44:15 -0700 (Sun, 15 Jun 2008)
New Revision: 22361
Log:
dnsmasq: touch target after make
Modified:
trunk/buildroot/package/dnsmasq/dnsmasq.mk
Changeset:
Modified: trunk/buildroot/package/dnsmasq/dnsmasq.mk
===================================================================
--- trunk/buildroot/package/dnsmasq/dnsmasq.mk 2008-06-15 20:44:10 UTC (rev 22360)
+++ trunk/buildroot/package/dnsmasq/dnsmasq.mk 2008-06-15 20:44:15 UTC (rev 22361)
@@ -45,6 +45,7 @@
endif
$(MAKE) CC=$(TARGET_CC) CFLAGS="$(TARGET_CFLAGS)" \
COPTS='$(DNSMASQ_COPTS)' PREFIX=/usr -C $(DNSMASQ_DIR)
+ touch -c $@
$(TARGET_DIR)/$(DNSMASQ_TARGET_BINARY): $(DNSMASQ_DIR)/src/$(DNSMASQ_BINARY)
$(MAKE) DESTDIR=$(TARGET_DIR) PREFIX=/usr -C $(DNSMASQ_DIR) install
@@ -55,6 +56,7 @@
ifneq ($(BR2_HAVE_MANPAGES),y)
rm -rf $(TARGET_DIR)/usr/share/man
endif
+ touch -c $@
dnsmasq: uclibc $(TARGET_DIR)/$(DNSMASQ_TARGET_BINARY)
^ permalink raw reply [flat|nested] 15+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/dnsmasq
@ 2008-06-18 13:12 jacmet at uclibc.org
2008-06-18 13:21 ` Bernhard Fischer
0 siblings, 1 reply; 15+ messages in thread
From: jacmet at uclibc.org @ 2008-06-18 13:12 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-06-18 06:12:00 -0700 (Wed, 18 Jun 2008)
New Revision: 22413
Log:
dnsmasq: use awk instead of nawk
Modified:
trunk/buildroot/package/dnsmasq/dnsmasq.mk
Changeset:
Modified: trunk/buildroot/package/dnsmasq/dnsmasq.mk
===================================================================
--- trunk/buildroot/package/dnsmasq/dnsmasq.mk 2008-06-18 13:11:52 UTC (rev 22412)
+++ trunk/buildroot/package/dnsmasq/dnsmasq.mk 2008-06-18 13:12:00 UTC (rev 22413)
@@ -43,7 +43,7 @@
$(SED) 's^.*#define HAVE_DBUS.*^/* #define HAVE_DBUS */^' \
$(DNSMASQ_DIR)/src/config.h
endif
- $(MAKE) CC=$(TARGET_CC) CFLAGS="$(TARGET_CFLAGS)" \
+ $(MAKE) CC=$(TARGET_CC) CFLAGS="$(TARGET_CFLAGS)" AWK=awk \
COPTS='$(DNSMASQ_COPTS)' PREFIX=/usr -C $(DNSMASQ_DIR)
touch -c $@
^ permalink raw reply [flat|nested] 15+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/dnsmasq
2008-06-18 13:12 jacmet at uclibc.org
@ 2008-06-18 13:21 ` Bernhard Fischer
0 siblings, 0 replies; 15+ messages in thread
From: Bernhard Fischer @ 2008-06-18 13:21 UTC (permalink / raw)
To: buildroot
On Wed, Jun 18, 2008 at 06:12:01AM -0700, jacmet at uclibc.org wrote:
>Author: jacmet
>Date: 2008-06-18 06:12:00 -0700 (Wed, 18 Jun 2008)
>New Revision: 22413
>
>Log:
>dnsmasq: use awk instead of nawk
ok my box didn't come with awk so i installed gawk (which is awk
compatible) in /opt/mystuff/bin/gawk.
/opt/mystuff is not in my PATH and build via
$ SED=/opt/mystuff/bin/sed AWK=/opt/mystuff/bin/gawk make
>Modified:
> trunk/buildroot/package/dnsmasq/dnsmasq.mk
>
>
>Changeset:
>Modified: trunk/buildroot/package/dnsmasq/dnsmasq.mk
>===================================================================
>--- trunk/buildroot/package/dnsmasq/dnsmasq.mk 2008-06-18 13:11:52 UTC (rev 22412)
>+++ trunk/buildroot/package/dnsmasq/dnsmasq.mk 2008-06-18 13:12:00 UTC (rev 22413)
>@@ -43,7 +43,7 @@
> $(SED) 's^.*#define HAVE_DBUS.*^/* #define HAVE_DBUS */^' \
> $(DNSMASQ_DIR)/src/config.h
> endif
>- $(MAKE) CC=$(TARGET_CC) CFLAGS="$(TARGET_CFLAGS)" \
>+ $(MAKE) CC=$(TARGET_CC) CFLAGS="$(TARGET_CFLAGS)" AWK=awk \
> COPTS='$(DNSMASQ_COPTS)' PREFIX=/usr -C $(DNSMASQ_DIR)
> touch -c $@
>
^ permalink raw reply [flat|nested] 15+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/dnsmasq
@ 2008-08-08 18:15 jacmet at uclibc.org
0 siblings, 0 replies; 15+ messages in thread
From: jacmet at uclibc.org @ 2008-08-08 18:15 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-08-08 11:15:29 -0700 (Fri, 08 Aug 2008)
New Revision: 23071
Log:
dnsmasq: bump version
fixes dns spoofing vulnerability.
Modified:
trunk/buildroot/package/dnsmasq/dnsmasq.mk
Changeset:
Modified: trunk/buildroot/package/dnsmasq/dnsmasq.mk
===================================================================
--- trunk/buildroot/package/dnsmasq/dnsmasq.mk 2008-08-08 07:28:16 UTC (rev 23070)
+++ trunk/buildroot/package/dnsmasq/dnsmasq.mk 2008-08-08 18:15:29 UTC (rev 23071)
@@ -5,7 +5,7 @@
#############################################################
DNSMASQ_SITE:=http://thekelleys.org.uk/dnsmasq
-DNSMASQ_UPVER:=2.41
+DNSMASQ_UPVER:=2.45
DNSMASQ_SOURCE:=dnsmasq-$(DNSMASQ_UPVER).tar.gz
DNSMASQ_DIR:=$(BUILD_DIR)/dnsmasq-$(DNSMASQ_UPVER)
DNSMASQ_BINARY:=dnsmasq
@@ -21,6 +21,10 @@
DNSMASQ_COPTS+=-DNO_TFTP
endif
+ifneq ($(BR2_LARGEFILE),y)
+DNSMASQ_COPTS+=-DNO_LARGEFILE
+endif
+
ifeq ($(strip $(BR2_PACKAGE_DBUS)),y)
DNSMASQ_DBUS:=$(TARGET_DIR)/usr/bin/dbus-daemon
else
^ permalink raw reply [flat|nested] 15+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/dnsmasq
@ 2008-12-01 9:08 jacmet at uclibc.org
0 siblings, 0 replies; 15+ messages in thread
From: jacmet at uclibc.org @ 2008-12-01 9:08 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-12-01 01:08:01 -0800 (Mon, 01 Dec 2008)
New Revision: 24199
Log:
dnsmasq: bump version
Modified:
trunk/buildroot/package/dnsmasq/dnsmasq.mk
Changeset:
Modified: trunk/buildroot/package/dnsmasq/dnsmasq.mk
===================================================================
--- trunk/buildroot/package/dnsmasq/dnsmasq.mk 2008-12-01 09:07:58 UTC (rev 24198)
+++ trunk/buildroot/package/dnsmasq/dnsmasq.mk 2008-12-01 09:08:01 UTC (rev 24199)
@@ -5,7 +5,7 @@
#############################################################
DNSMASQ_SITE:=http://thekelleys.org.uk/dnsmasq
-DNSMASQ_UPVER:=2.45
+DNSMASQ_UPVER:=2.46
DNSMASQ_SOURCE:=dnsmasq-$(DNSMASQ_UPVER).tar.gz
DNSMASQ_DIR:=$(BUILD_DIR)/dnsmasq-$(DNSMASQ_UPVER)
DNSMASQ_BINARY:=dnsmasq
^ permalink raw reply [flat|nested] 15+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/dnsmasq
@ 2009-02-12 13:39 jacmet at uclibc.org
0 siblings, 0 replies; 15+ messages in thread
From: jacmet at uclibc.org @ 2009-02-12 13:39 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2009-02-12 13:39:33 +0000 (Thu, 12 Feb 2009)
New Revision: 25307
Log:
dnsmasq: bump version
closes #97.
Modified:
trunk/buildroot/package/dnsmasq/dnsmasq.mk
Changeset:
Modified: trunk/buildroot/package/dnsmasq/dnsmasq.mk
===================================================================
--- trunk/buildroot/package/dnsmasq/dnsmasq.mk 2009-02-12 12:17:12 UTC (rev 25306)
+++ trunk/buildroot/package/dnsmasq/dnsmasq.mk 2009-02-12 13:39:33 UTC (rev 25307)
@@ -5,7 +5,7 @@
#############################################################
DNSMASQ_SITE:=http://thekelleys.org.uk/dnsmasq
-DNSMASQ_UPVER:=2.46
+DNSMASQ_UPVER:=2.47
DNSMASQ_SOURCE:=dnsmasq-$(DNSMASQ_UPVER).tar.gz
DNSMASQ_DIR:=$(BUILD_DIR)/dnsmasq-$(DNSMASQ_UPVER)
DNSMASQ_BINARY:=dnsmasq
^ permalink raw reply [flat|nested] 15+ messages in thread
end of thread, other threads:[~2009-02-12 13:39 UTC | newest]
Thread overview: 15+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-08-08 18:15 [Buildroot] svn commit: trunk/buildroot/package/dnsmasq jacmet at uclibc.org
-- strict thread matches above, loose matches on Subject: below --
2009-02-12 13:39 jacmet at uclibc.org
2008-12-01 9:08 jacmet at uclibc.org
2008-06-18 13:12 jacmet at uclibc.org
2008-06-18 13:21 ` Bernhard Fischer
2008-06-15 20:44 jacmet at uclibc.org
2008-03-02 14:36 jacmet at uclibc.org
2008-03-02 14:36 jacmet at uclibc.org
2008-03-02 14:36 jacmet at uclibc.org
2008-03-02 14:36 jacmet at uclibc.org
2007-09-10 9:05 jacmet at uclibc.org
2007-09-10 9:04 jacmet at uclibc.org
2007-08-20 9:25 ulf at uclibc.org
2007-07-23 8:54 ulf at uclibc.org
2007-07-23 8:47 ulf at uclibc.org
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox