diff options
author | Andrei Gherzan <andrei@gherzan.ro> | 2012-02-07 21:52:33 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-02-23 23:59:15 +0000 |
commit | 1cd882c47865a501d5401bad44e1c7f460ce2699 (patch) | |
tree | 2fd92df30ac4854711bf108b4e764301c25b8f53 /meta/recipes-connectivity/dhcp | |
parent | ba175bdfe85d701298d28e5190e55207420a24e8 (diff) | |
download | openembedded-core-1cd882c47865a501d5401bad44e1c7f460ce2699.tar.gz openembedded-core-1cd882c47865a501d5401bad44e1c7f460ce2699.tar.bz2 openembedded-core-1cd882c47865a501d5401bad44e1c7f460ce2699.tar.xz openembedded-core-1cd882c47865a501d5401bad44e1c7f460ce2699.zip |
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
Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
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.patch | 25 | ||||
-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.inc | 6 | ||||
-rw-r--r-- | meta/recipes-connectivity/dhcp/dhcp_4.2.0.bb | 12 | ||||
-rw-r--r-- | meta/recipes-connectivity/dhcp/dhcp_4.2.3-P2.bb | 12 |
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 b4a666d10..b4a666d10 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 97ed0d932..97ed0d932 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 4f1165581..4f1165581 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 e33c9dd73..e33c9dd73 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 000000000..57e10b029 --- /dev/null +++ b/meta/recipes-connectivity/dhcp/dhcp-4.2.3-P2/link-with-lcrypto.patch @@ -0,0 +1,25 @@ +Author: Andrei Gherzan <andrei@gherzan.ro> +Date: Thu Feb 2 23:59:11 2012 +0200 + +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. + +Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> +Upstream-Status: Pending + +Index: dhcp-4.2.3-P2-r0/dhcp-4.2.3-P2/configure.ac +=================================================================== +--- dhcp-4.2.3-P2.orig/configure.ac 2012-02-02 18:04:20.843023196 +0200 ++++ dhcp-4.2.3-P2/configure.ac 2012-02-02 17:58:16.000000000 +0200 +@@ -456,6 +456,10 @@ + # Look for optional headers. + AC_CHECK_HEADERS(sys/socket.h net/if_dl.h net/if6.h regex.h) + ++# find an MD5 library ++AC_SEARCH_LIBS(MD5_Init, [crypto]) ++AC_SEARCH_LIBS(MD5Init, [crypto]) ++ + # Solaris needs some libraries for functions + AC_SEARCH_LIBS(socket, [socket]) + 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 5c635e8dc..5c635e8dc 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 2289554ef..2289554ef 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 f66dfba96..8ead01690 100644 --- a/meta/recipes-connectivity/dhcp/dhcp.inc +++ b/meta/recipes-connectivity/dhcp/dhcp.inc @@ -10,9 +10,9 @@ HOMEPAGE = "http://www.isc.org/" LICENSE = "ISC" LIC_FILES_CHKSUM = "file://LICENSE;beginline=4;md5=bb6fd41f5895b67088ebea61ad365e74" -DEPENDS = "bind" +DEPENDS = "openssl bind" -SRC_URI = "ftp://ftp.isc.org/isc/dhcp/dhcp-${PV}.tar.gz \ +SRC_URI = "ftp://ftp.isc.org/isc/dhcp/${PV}/dhcp-${PV}.tar.gz \ file://site.h \ file://init-relay file://default-relay \ file://init-server file://default-server \ @@ -51,8 +51,6 @@ do_install_append () { mv ${D}${sbindir}/dhclient ${D}${base_sbindir}/ fi install -m 0755 ${S}/client/scripts/linux ${D}${base_sbindir}/dhclient-script - - install -d ${D}${localstatedir}/lib/dhcp/ } PACKAGES += "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 3b1c0e2dd..000000000 --- a/meta/recipes-connectivity/dhcp/dhcp_4.2.0.bb +++ /dev/null @@ -1,12 +0,0 @@ -require dhcp.inc - -PR = "r7" - -SRC_URI += "file://fixincludes.patch \ - file://dhcp-3.0.3-dhclient-dbus.patch;striplevel=0 \ - file://fix-client-path.patch \ - file://fix-external-bind.patch \ - " - -SRC_URI[md5sum] = "83abd7c4f9c24d8dd024ca5a71380c0a" -SRC_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 000000000..24b50ba2a --- /dev/null +++ b/meta/recipes-connectivity/dhcp/dhcp_4.2.3-P2.bb @@ -0,0 +1,12 @@ +require dhcp.inc + +PR = "r0" + +SRC_URI += "file://fixincludes.patch \ + file://dhcp-3.0.3-dhclient-dbus.patch;striplevel=0 \ + file://fix-external-bind.patch \ + file://link-with-lcrypto.patch \ + " + +SRC_URI[md5sum] = "14f57fd580d01633d0fad4809007a801" +SRC_URI[sha256sum] = "5cf7ae2cad9c4ca0103748b2476ec8ea78484e408f8fe597e4e0a4afb051b469" |