Revision: 6770
http://ipcop.svn.sourceforge.net/ipcop/?rev=6770&view=rev
Author: gespinasse
Date: 2012-08-19 15:58:53 +0000 (Sun, 19 Aug 2012)
Log Message:
-----------
Upgrade dnsmasq to 2.63
Fix a minor version display glitch with a sed
Modified Paths:
--------------
ipcop/trunk/lfs/dnsmasq
ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0
ipcop/trunk/updates/2.1.0/information.xml
Modified: ipcop/trunk/lfs/dnsmasq
===================================================================
--- ipcop/trunk/lfs/dnsmasq 2012-08-19 09:11:03 UTC (rev 6769)
+++ ipcop/trunk/lfs/dnsmasq 2012-08-19 15:58:53 UTC (rev 6770)
@@ -33,12 +33,12 @@
include Config
PKG_NAME = dnsmasq
-VER = 2.62
+VER = 2.63
HOST_ARCH = all
OTHER_SRC = yes
THISAPP = $(PKG_NAME)-$(VER)
-DL_FILE = $(THISAPP).tar.lzma
+DL_FILE = $(THISAPP).tar.xz
DL_FROM = http://www.thekelleys.org.uk/dnsmasq
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
@@ -51,7 +51,7 @@
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = c2fb7af20a649a33ff92cbfeb3a752d6
+$(DL_FILE)_MD5 = 46b2b2dceddab5553b9211b5cbc9d73e
install : $(TARGET)
@@ -80,10 +80,12 @@
$(TARGET) : $(firstword $(MAKEFILE_LIST)) $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
- @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP)/src && sed -i \
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xf $(DIR_DL)/$(DL_FILE)
+ # fix rc6 version display, remove after 2.63
+ cd $(DIR_APP) && sed -i 's/2\.63rc6/2.63/' ./VERSION
+ cd $(DIR_APP) && sed -i \
-e 's/^#define CHUSER .*$$/#define CHUSER "dnsmasq"/' \
- -e 's/^#define CHGRP .*$$/#define CHGRP "dnsmasq"/' config.h
+ -e 's/^#define CHGRP .*$$/#define CHGRP "dnsmasq"/' src/config.h
cd $(DIR_APP) && make COPTS=-DNO_IPV6
cd $(DIR_APP) && make PREFIX=/usr install
Modified: ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0
===================================================================
--- ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0 2012-08-19 09:11:03 UTC
(rev 6769)
+++ ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0 2012-08-19 15:58:53 UTC
(rev 6770)
@@ -189,7 +189,7 @@
## dhcpcd-5.5.6
/usr/sbin/dhcpcd
##
-## dnsmasq-2.62
+## dnsmasq-2.63
/usr/sbin/dnsmasq
##
## e2fsprogs-1.42.5
Modified: ipcop/trunk/updates/2.1.0/information.xml
===================================================================
--- ipcop/trunk/updates/2.1.0/information.xml 2012-08-19 09:11:03 UTC (rev
6769)
+++ ipcop/trunk/updates/2.1.0/information.xml 2012-08-19 15:58:53 UTC (rev
6770)
@@ -8,7 +8,7 @@
Add URL filter, xz-5.0.4<br />
Language updates.<br />
Upgrade acpid to 2.0.16, arping to 2.12, bash to 4.2.36, bind to
9.8.3-P2, conntrack-tools to 1.2.2, coreutils to 8.17,
- dhcpcd to 5.5.6, dnsmasq to 2.62,
+ dhcpcd to 5.5.6, dnsmasq to 2.63,
e2fsprogs to 1.42.5, ethtool to 3.2, expat to 2.1.0, freetype to
2.4.10, fontconfig to 2.9, gawk to 4.0.1, glib to 2.30.3,
gmp to 5.0.5, gnupg to 1.4.12, grep to 2.13, gzip to 1.5,
iproute2 to 3.5.1, iptables to 1.4.15, iptstate to 2.2.5, iw to
3.6 hdparm to 9.39, kernel to 3.0.41, krb5 to 1.10.3,
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
