summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/dhcp
diff options
context:
space:
mode:
authorAndrei Gherzan <andrei@gherzan.ro>2012-02-07 19:52:33 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-02-23 23:59:35 (GMT)
commitadbe09435abf291a163825a4b49582c200be83aa (patch)
treed53acf294c4831ba22788c3393a35f9f66c77ad3 /meta/recipes-connectivity/dhcp
parenta470400cf8455d9f6f16905bfae59a3511ae5d4c (diff)
downloadpoky-adbe09435abf291a163825a4b49582c200be83aa.tar.gz
dhcp: Update to 4.2.3-P2
1. Update to 4.2.3-P2 2. From 4.2.0 final release, -lcrypto check was removed and we compile static libraries from bind that are linked to libcrypto. This is why i added a patch in order to add -lcrypto to LIBS. 3. Add openssl in DEPENDS as we need libcrypto from this package 4. Drop installing /var/lib/dhcp/ as it is handled in pkg_postinst (From OE-Core rev: 1cd882c47865a501d5401bad44e1c7f460ce2699) Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/dhcp')
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp-4.2.3-P2/dhcp-3.0.3-dhclient-dbus.patch (renamed from meta/recipes-connectivity/dhcp/dhcp-4.2.0/dhcp-3.0.3-dhclient-dbus.patch)0
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp-4.2.3-P2/fix-client-path.patch (renamed from meta/recipes-connectivity/dhcp/dhcp-4.2.0/fix-client-path.patch)0
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp-4.2.3-P2/fix-external-bind.patch (renamed from meta/recipes-connectivity/dhcp/dhcp-4.2.0/fix-external-bind.patch)0
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp-4.2.3-P2/fixincludes.patch (renamed from meta/recipes-connectivity/dhcp/dhcp-4.2.0/fixincludes.patch)0
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp-4.2.3-P2/link-with-lcrypto.patch25
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp-4.2.3-P2/noattrmode.patch (renamed from meta/recipes-connectivity/dhcp/dhcp-4.2.0/noattrmode.patch)0
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp-4.2.3-P2/site.h (renamed from meta/recipes-connectivity/dhcp/dhcp-4.2.0/site.h)0
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp.inc6
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp_4.2.0.bb12
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp_4.2.3-P2.bb12
10 files changed, 39 insertions, 16 deletions
diff --git a/meta/recipes-connectivity/dhcp/dhcp-4.2.0/dhcp-3.0.3-dhclient-dbus.patch b/meta/recipes-connectivity/dhcp/dhcp-4.2.3-P2/dhcp-3.0.3-dhclient-dbus.patch
index b4a666d..b4a666d 100644
--- a/meta/recipes-connectivity/dhcp/dhcp-4.2.0/dhcp-3.0.3-dhclient-dbus.patch
+++ b/meta/recipes-connectivity/dhcp/dhcp-4.2.3-P2/dhcp-3.0.3-dhclient-dbus.patch
diff --git a/meta/recipes-connectivity/dhcp/dhcp-4.2.0/fix-client-path.patch b/meta/recipes-connectivity/dhcp/dhcp-4.2.3-P2/fix-client-path.patch
index 97ed0d9..97ed0d9 100644
--- a/meta/recipes-connectivity/dhcp/dhcp-4.2.0/fix-client-path.patch
+++ b/meta/recipes-connectivity/dhcp/dhcp-4.2.3-P2/fix-client-path.patch
diff --git a/meta/recipes-connectivity/dhcp/dhcp-4.2.0/fix-external-bind.patch b/meta/recipes-connectivity/dhcp/dhcp-4.2.3-P2/fix-external-bind.patch
index 4f11655..4f11655 100644
--- a/meta/recipes-connectivity/dhcp/dhcp-4.2.0/fix-external-bind.patch
+++ b/meta/recipes-connectivity/dhcp/dhcp-4.2.3-P2/fix-external-bind.patch
diff --git a/meta/recipes-connectivity/dhcp/dhcp-4.2.0/fixincludes.patch b/meta/recipes-connectivity/dhcp/dhcp-4.2.3-P2/fixincludes.patch
index e33c9dd..e33c9dd 100644
--- a/meta/recipes-connectivity/dhcp/dhcp-4.2.0/fixincludes.patch
+++ b/meta/recipes-connectivity/dhcp/dhcp-4.2.3-P2/fixincludes.patch
diff --git a/meta/recipes-connectivity/dhcp/dhcp-4.2.3-P2/link-with-lcrypto.patch b/meta/recipes-connectivity/dhcp/dhcp-4.2.3-P2/link-with-lcrypto.patch
new file mode 100644
index 0000000..57e10b0
--- /dev/null
+++ b/meta/recipes-connectivity/dhcp/dhcp-4.2.3-P2/link-with-lcrypto.patch
@@ -0,0 +1,25 @@
1Author: Andrei Gherzan <andrei@gherzan.ro>
2Date: Thu Feb 2 23:59:11 2012 +0200
3
4From 4.2.0 final release, -lcrypto check was removed and we compile static libraries
5from bind that are linked to libcrypto. This is why i added a patch in order to add
6-lcrypto to LIBS.
7
8Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
9Upstream-Status: Pending
10
11Index: dhcp-4.2.3-P2-r0/dhcp-4.2.3-P2/configure.ac
12===================================================================
13--- dhcp-4.2.3-P2.orig/configure.ac 2012-02-02 18:04:20.843023196 +0200
14+++ dhcp-4.2.3-P2/configure.ac 2012-02-02 17:58:16.000000000 +0200
15@@ -456,6 +456,10 @@
16 # Look for optional headers.
17 AC_CHECK_HEADERS(sys/socket.h net/if_dl.h net/if6.h regex.h)
18
19+# find an MD5 library
20+AC_SEARCH_LIBS(MD5_Init, [crypto])
21+AC_SEARCH_LIBS(MD5Init, [crypto])
22+
23 # Solaris needs some libraries for functions
24 AC_SEARCH_LIBS(socket, [socket])
25 AC_SEARCH_LIBS(inet_ntoa, [nsl])
diff --git a/meta/recipes-connectivity/dhcp/dhcp-4.2.0/noattrmode.patch b/meta/recipes-connectivity/dhcp/dhcp-4.2.3-P2/noattrmode.patch
index 5c635e8..5c635e8 100644
--- a/meta/recipes-connectivity/dhcp/dhcp-4.2.0/noattrmode.patch
+++ b/meta/recipes-connectivity/dhcp/dhcp-4.2.3-P2/noattrmode.patch
diff --git a/meta/recipes-connectivity/dhcp/dhcp-4.2.0/site.h b/meta/recipes-connectivity/dhcp/dhcp-4.2.3-P2/site.h
index 2289554..2289554 100644
--- a/meta/recipes-connectivity/dhcp/dhcp-4.2.0/site.h
+++ b/meta/recipes-connectivity/dhcp/dhcp-4.2.3-P2/site.h
diff --git a/meta/recipes-connectivity/dhcp/dhcp.inc b/meta/recipes-connectivity/dhcp/dhcp.inc
index f66dfba..8ead016 100644
--- a/meta/recipes-connectivity/dhcp/dhcp.inc
+++ b/meta/recipes-connectivity/dhcp/dhcp.inc
@@ -10,9 +10,9 @@ HOMEPAGE = "http://www.isc.org/"
10LICENSE = "ISC" 10LICENSE = "ISC"
11LIC_FILES_CHKSUM = "file://LICENSE;beginline=4;md5=bb6fd41f5895b67088ebea61ad365e74" 11LIC_FILES_CHKSUM = "file://LICENSE;beginline=4;md5=bb6fd41f5895b67088ebea61ad365e74"
12 12
13DEPENDS = "bind" 13DEPENDS = "openssl bind"
14 14
15SRC_URI = "ftp://ftp.isc.org/isc/dhcp/dhcp-${PV}.tar.gz \ 15SRC_URI = "ftp://ftp.isc.org/isc/dhcp/${PV}/dhcp-${PV}.tar.gz \
16 file://site.h \ 16 file://site.h \
17 file://init-relay file://default-relay \ 17 file://init-relay file://default-relay \
18 file://init-server file://default-server \ 18 file://init-server file://default-server \
@@ -51,8 +51,6 @@ do_install_append () {
51 mv ${D}${sbindir}/dhclient ${D}${base_sbindir}/ 51 mv ${D}${sbindir}/dhclient ${D}${base_sbindir}/
52 fi 52 fi
53 install -m 0755 ${S}/client/scripts/linux ${D}${base_sbindir}/dhclient-script 53 install -m 0755 ${S}/client/scripts/linux ${D}${base_sbindir}/dhclient-script
54
55 install -d ${D}${localstatedir}/lib/dhcp/
56} 54}
57 55
58PACKAGES += "dhcp-server dhcp-server-config dhcp-client dhcp-relay dhcp-omshell" 56PACKAGES += "dhcp-server dhcp-server-config dhcp-client dhcp-relay dhcp-omshell"
diff --git a/meta/recipes-connectivity/dhcp/dhcp_4.2.0.bb b/meta/recipes-connectivity/dhcp/dhcp_4.2.0.bb
deleted file mode 100644
index 3b1c0e2..0000000
--- a/meta/recipes-connectivity/dhcp/dhcp_4.2.0.bb
+++ /dev/null
@@ -1,12 +0,0 @@
1require dhcp.inc
2
3PR = "r7"
4
5SRC_URI += "file://fixincludes.patch \
6 file://dhcp-3.0.3-dhclient-dbus.patch;striplevel=0 \
7 file://fix-client-path.patch \
8 file://fix-external-bind.patch \
9 "
10
11SRC_URI[md5sum] = "83abd7c4f9c24d8dd024ca5a71380c0a"
12SRC_URI[sha256sum] = "6260d43423e4c406ba63cd7199502a395e952b13c80a955026c4b82a4e9d4943"
diff --git a/meta/recipes-connectivity/dhcp/dhcp_4.2.3-P2.bb b/meta/recipes-connectivity/dhcp/dhcp_4.2.3-P2.bb
new file mode 100644
index 0000000..24b50ba
--- /dev/null
+++ b/meta/recipes-connectivity/dhcp/dhcp_4.2.3-P2.bb
@@ -0,0 +1,12 @@
1require dhcp.inc
2
3PR = "r0"
4
5SRC_URI += "file://fixincludes.patch \
6 file://dhcp-3.0.3-dhclient-dbus.patch;striplevel=0 \
7 file://fix-external-bind.patch \
8 file://link-with-lcrypto.patch \
9 "
10
11SRC_URI[md5sum] = "14f57fd580d01633d0fad4809007a801"
12SRC_URI[sha256sum] = "5cf7ae2cad9c4ca0103748b2476ec8ea78484e408f8fe597e4e0a4afb051b469"