Revision: 7486
http://sourceforge.net/p/ipcop/svn/7486
Author: owes
Date: 2014-04-17 20:34:24 +0000 (Thu, 17 Apr 2014)
Log Message:
-----------
Update dhcpcd to 6.3.2
Modified Paths:
--------------
ipcop/trunk/lfs/dhcpcd
ipcop/trunk/updates/2.1.5/ROOTFILES.i486-2.1.5
ipcop/trunk/updates/2.1.5/information.xml
Added Paths:
-----------
ipcop/trunk/src/patches/dhcpcd-6.3.2_O_CLOEXEC.patch
Modified: ipcop/trunk/lfs/dhcpcd
===================================================================
--- ipcop/trunk/lfs/dhcpcd 2014-04-17 20:30:54 UTC (rev 7485)
+++ ipcop/trunk/lfs/dhcpcd 2014-04-17 20:34:24 UTC (rev 7486)
@@ -33,7 +33,7 @@
include Config
PKG_NAME = dhcpcd
-VER = 6.2.1
+VER = 6.3.2
HOST_ARCH = all
OTHER_SRC = yes
@@ -53,7 +53,7 @@
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 214483a069b5e8b3b96371755eaa1b18
+$(DL_FILE)_MD5 = bb7d8e8533161fbe0eee3b8830fdbdf4
install : $(TARGET)
@@ -83,6 +83,7 @@
$(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
Added: ipcop/trunk/src/patches/dhcpcd-6.3.2_O_CLOEXEC.patch
===================================================================
--- ipcop/trunk/src/patches/dhcpcd-6.3.2_O_CLOEXEC.patch
(rev 0)
+++ ipcop/trunk/src/patches/dhcpcd-6.3.2_O_CLOEXEC.patch 2014-04-17
20:34:24 UTC (rev 7486)
@@ -0,0 +1,59 @@
+
+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.5/ROOTFILES.i486-2.1.5
===================================================================
--- ipcop/trunk/updates/2.1.5/ROOTFILES.i486-2.1.5 2014-04-17 20:30:54 UTC
(rev 7485)
+++ ipcop/trunk/updates/2.1.5/ROOTFILES.i486-2.1.5 2014-04-17 20:34:24 UTC
(rev 7486)
@@ -73,6 +73,9 @@
/usr/sbin/conntrack
/usr/sbin/nfct
##
+## dhcpcd-6.3.2
+/usr/sbin/dhcpcd
+##
## dnsmasq-2.69
/usr/sbin/dnsmasq
##
Modified: ipcop/trunk/updates/2.1.5/information.xml
===================================================================
--- ipcop/trunk/updates/2.1.5/information.xml 2014-04-17 20:30:54 UTC (rev
7485)
+++ ipcop/trunk/updates/2.1.5/information.xml 2014-04-17 20:34:24 UTC (rev
7486)
@@ -6,7 +6,7 @@
<isoimages>yes</isoimages>
<description>Language updates.<br />
Add CA certificates bundle.<br />
- Upgrade apache to 2.2.27, conntrack-tools to 1.4.2, dnsmasq to 2.69,
iproute2 to 3.14.0,
+ Upgrade apache to 2.2.27, conntrack-tools to 1.4.2, dhcpcd to 6.3.2,
dnsmasq to 2.69, iproute2 to 3.14.0,
e1000e network driver to 3.0.4.1, igb network driver to 5.2.5, linux
kernel to 3.4.87,
openswan to 2.6.41, openvpn to 2.3.3, ppp to 2.4.6, pptp to 1.8.0,
rrdtool to 1.4.8,
sqlite to 3.8.4.3, usb-modeswitch to 2.1.1, usb-modeswitch-data to
20140327.
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Learn Graph Databases - Download FREE O'Reilly Book
"Graph Databases" is the definitive new guide to graph databases and their
applications. Written by three acclaimed leaders in the field,
this first edition is now available. Download your free book today!
http://p.sf.net/sfu/NeoTech
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
