Revision: 7608
http://sourceforge.net/p/ipcop/svn/7608
Author: owes
Date: 2014-06-23 05:40:19 +0000 (Mon, 23 Jun 2014)
Log Message:
-----------
Update dhcpcd to 6.4.0
Modified Paths:
--------------
ipcop/trunk/lfs/dhcpcd
ipcop/trunk/updates/2.1.6/ROOTFILES.i486-2.1.6
ipcop/trunk/updates/2.1.6/information.xml
Removed Paths:
-------------
ipcop/trunk/src/patches/dhcpcd-6.3.2_O_CLOEXEC.patch
Modified: ipcop/trunk/lfs/dhcpcd
===================================================================
--- ipcop/trunk/lfs/dhcpcd 2014-06-23 05:20:51 UTC (rev 7607)
+++ ipcop/trunk/lfs/dhcpcd 2014-06-23 05:40:19 UTC (rev 7608)
@@ -33,7 +33,7 @@
include Config
PKG_NAME = dhcpcd
-VER = 6.3.2
+VER = 6.4.0
HOST_ARCH = all
OTHER_SRC = yes
@@ -53,7 +53,7 @@
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = bb7d8e8533161fbe0eee3b8830fdbdf4
+$(DL_FILE)_MD5 = 3a6f5952fd1bcf0eefb9c7c087acbfc9
install : $(TARGET)
@@ -83,7 +83,6 @@
$(TARGET) : $(firstword $(MAKEFILE_LIST)) $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(THISAPP)_O_CLOEXEC.patch
cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc
--dbdir=/var/run
cd $(DIR_APP) && make
Deleted: ipcop/trunk/src/patches/dhcpcd-6.3.2_O_CLOEXEC.patch
===================================================================
--- ipcop/trunk/src/patches/dhcpcd-6.3.2_O_CLOEXEC.patch 2014-06-23
05:20:51 UTC (rev 7607)
+++ ipcop/trunk/src/patches/dhcpcd-6.3.2_O_CLOEXEC.patch 2014-06-23
05:40:19 UTC (rev 7608)
@@ -1,59 +0,0 @@
-
-Suggested by upstream to fix compiling trouble with glibc 2.11.
-
-==================================================================
---- a/dhcpcd.c
-+++ b/dhcpcd.c
-@@ -36,10 +36,11 @@
- #include <sys/types.h>
- #include <sys/uio.h>
-
- #include <ctype.h>
- #include <errno.h>
-+#include <fcntl.h>
- #include <getopt.h>
- #include <limits.h>
- #include <paths.h>
- #include <signal.h>
- #include <stdio.h>
-@@ -1369,13 +1370,15 @@
- if (mkdir(RUNDIR, 0755) == -1 && errno != EEXIST)
- syslog(LOG_ERR, "mkdir `%s': %m", RUNDIR);
- if (mkdir(DBDIR, 0755) == -1 && errno != EEXIST)
- syslog(LOG_ERR, "mkdir `%s': %m", DBDIR);
-
-- ctx.pid_fd = open(pidfile,
-- O_WRONLY | O_CREAT | O_CLOEXEC | O_NONBLOCK,
-- 0664);
-+ opt = O_WRONLY | O_CREAT | O_NONBLOCK;
-+#ifdef O_CLOEXEC
-+ opt |= O_CLOEXEC;
-+#endif
-+ ctx.pid_fd = open(pidfile, opt, 0664);
- if (ctx.pid_fd == -1)
- syslog(LOG_ERR, "open `%s': %m", pidfile);
- else {
- /* Lock the file so that only one instance of dhcpcd
- * runs on an interface */
-@@ -1383,10 +1386,20 @@
- syslog(LOG_ERR, "flock `%s': %m", pidfile);
- close(ctx.pid_fd);
- ctx.pid_fd = -1;
- goto exit_failure;
- }
-+#ifndef O_CLOEXEC
-+ if (fcntl(ctx.pid_fd, F_GETFD, &opt) == -1 ||
-+ fcntl(ctx.pid_fd, F_SETFD, opt | FD_CLOEXEC) == -1)
-+ {
-+ syslog(LOG_ERR, "fcntl: %m");
-+ close(ctx.pid_fd);
-+ ctx.pid_fd = -1;
-+ goto exit_failure;
-+ }
-+#endif
- write_pid(ctx.pid_fd, getpid());
- }
- }
-
-
-
Modified: ipcop/trunk/updates/2.1.6/ROOTFILES.i486-2.1.6
===================================================================
--- ipcop/trunk/updates/2.1.6/ROOTFILES.i486-2.1.6 2014-06-23 05:20:51 UTC
(rev 7607)
+++ ipcop/trunk/updates/2.1.6/ROOTFILES.i486-2.1.6 2014-06-23 05:40:19 UTC
(rev 7608)
@@ -65,6 +65,9 @@
/usr/lib/libisccfg.so.90.1.0
/usr/lib/liblwres.so.90.0.7
##
+## dhcpcd-6.4.0
+/usr/sbin/dhcpcd
+##
## dnsmasq-2.71
/usr/sbin/dnsmasq
##
Modified: ipcop/trunk/updates/2.1.6/information.xml
===================================================================
--- ipcop/trunk/updates/2.1.6/information.xml 2014-06-23 05:20:51 UTC (rev
7607)
+++ ipcop/trunk/updates/2.1.6/information.xml 2014-06-23 05:40:19 UTC (rev
7608)
@@ -7,7 +7,7 @@
<description>Language updates.<br />
Patch openssl for CVE-2010-5298.<br />
Upgrade linux kernel to 3.4-3 (3.4.94).<br />
- Upgrade bind to 9.9.5-P1, dnsmasq to 2.71, e2fsprogs to 1.42.10, fcron
to 3.1.3,
+ Upgrade bind to 9.9.5-P1, dhcpcd to 6.4.0, dnsmasq to 2.71, e2fsprogs
to 1.42.10, fcron to 3.1.3,
grep to 2.20, iproute2 to 3.15.0, e1000e network driver to 3.1.0,
mdadm to 3.3.1,
openssl to 1.0.1h, openvpn to 2.3.4, rsyslog to 7.6.3, squid to 3.4.5,
syslinux to 6.02,
util-linux to 2.24.2.
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
HPCC Systems Open Source Big Data Platform from LexisNexis Risk Solutions
Find What Matters Most in Your Big Data with HPCC Systems
Open Source. Fast. Scalable. Simple. Ideal for Dirty Data.
Leverages Graph Analysis for Fast Processing & Easy Data Exploration
http://p.sf.net/sfu/hpccsystems
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
