diff options
author | Adrian Dudau <adrian.dudau@enea.com> | 2013-12-12 13:38:32 +0100 |
---|---|---|
committer | Adrian Dudau <adrian.dudau@enea.com> | 2013-12-12 13:50:20 +0100 |
commit | e2e6f6fe07049f33cb6348780fa975162752e421 (patch) | |
tree | b1813295411235d1297a0ed642b1346b24fdfb12 /meta/recipes-connectivity/dhcp | |
download | poky-e2e6f6fe07049f33cb6348780fa975162752e421.tar.gz |
initial commit of Enea Linux 3.1
Migrated from the internal git server on the dora-enea branch
Signed-off-by: Adrian Dudau <adrian.dudau@enea.com>
Diffstat (limited to 'meta/recipes-connectivity/dhcp')
-rw-r--r-- | meta/recipes-connectivity/dhcp/dhcp.inc | 100 | ||||
-rw-r--r-- | meta/recipes-connectivity/dhcp/dhcp/dhcp-3.0.3-dhclient-dbus.patch | 86 | ||||
-rw-r--r-- | meta/recipes-connectivity/dhcp/dhcp/fix-client-path.patch | 23 | ||||
-rw-r--r-- | meta/recipes-connectivity/dhcp/dhcp/fix-external-bind.patch | 103 | ||||
-rw-r--r-- | meta/recipes-connectivity/dhcp/dhcp/fixsepbuild.patch | 90 | ||||
-rw-r--r-- | meta/recipes-connectivity/dhcp/dhcp/link-with-lcrypto.patch | 25 | ||||
-rw-r--r-- | meta/recipes-connectivity/dhcp/dhcp/site.h | 21 | ||||
-rw-r--r-- | meta/recipes-connectivity/dhcp/dhcp_4.2.5-P1.bb | 12 | ||||
-rw-r--r-- | meta/recipes-connectivity/dhcp/files/default-relay | 12 | ||||
-rw-r--r-- | meta/recipes-connectivity/dhcp/files/default-server | 7 | ||||
-rw-r--r-- | meta/recipes-connectivity/dhcp/files/dhclient.conf | 50 | ||||
-rw-r--r-- | meta/recipes-connectivity/dhcp/files/dhcpd.conf | 108 | ||||
-rw-r--r-- | meta/recipes-connectivity/dhcp/files/init-relay | 44 | ||||
-rw-r--r-- | meta/recipes-connectivity/dhcp/files/init-server | 44 |
14 files changed, 725 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/dhcp/dhcp.inc b/meta/recipes-connectivity/dhcp/dhcp.inc new file mode 100644 index 0000000000..ad82b57669 --- /dev/null +++ b/meta/recipes-connectivity/dhcp/dhcp.inc | |||
@@ -0,0 +1,100 @@ | |||
1 | SECTION = "console/network" | ||
2 | SUMMARY = "Internet Software Consortium DHCP package" | ||
3 | DESCRIPTION = "DHCP (Dynamic Host Configuration Protocol) is a protocol \ | ||
4 | which allows individual devices on an IP network to get their own \ | ||
5 | network configuration information from a server. DHCP helps make it \ | ||
6 | easier to administer devices." | ||
7 | |||
8 | HOMEPAGE = "http://www.isc.org/" | ||
9 | |||
10 | LICENSE = "ISC" | ||
11 | LIC_FILES_CHKSUM = "file://LICENSE;beginline=4;md5=bb6fd41f5895b67088ebea61ad365e74" | ||
12 | |||
13 | DEPENDS = "openssl bind" | ||
14 | |||
15 | SRC_URI = "ftp://ftp.isc.org/isc/dhcp/${PV}/dhcp-${PV}.tar.gz \ | ||
16 | file://site.h \ | ||
17 | file://init-relay file://default-relay \ | ||
18 | file://init-server file://default-server \ | ||
19 | file://dhclient.conf file://dhcpd.conf" | ||
20 | |||
21 | inherit autotools | ||
22 | |||
23 | TARGET_CFLAGS += "-D_GNU_SOURCE" | ||
24 | EXTRA_OECONF = "--with-srv-lease-file=${localstatedir}/lib/dhcp/dhcpd.leases \ | ||
25 | --with-srv6-lease-file=${localstatedir}/lib/dhcp/dhcpd6.leases \ | ||
26 | --with-cli-lease-file=${localstatedir}/lib/dhcp/dhclient.leases \ | ||
27 | --with-cli6-lease-file=${localstatedir}/lib/dhcp/dhclient6.leases \ | ||
28 | --with-libbind=${STAGING_LIBDIR}/ \ | ||
29 | " | ||
30 | |||
31 | do_compile_prepend () { | ||
32 | cp -f ${WORKDIR}/site.h ${S}/includes | ||
33 | } | ||
34 | |||
35 | do_install_append () { | ||
36 | install -d ${D}${sysconfdir}/init.d | ||
37 | install -d ${D}${sysconfdir}/default | ||
38 | install -d ${D}${sysconfdir}/dhcp | ||
39 | install -m 0755 ${WORKDIR}/init-relay ${D}${sysconfdir}/init.d/dhcp-relay | ||
40 | install -m 0644 ${WORKDIR}/default-relay ${D}${sysconfdir}/default/dhcp-relay | ||
41 | install -m 0755 ${WORKDIR}/init-server ${D}${sysconfdir}/init.d/dhcp-server | ||
42 | install -m 0644 ${WORKDIR}/default-server ${D}${sysconfdir}/default/dhcp-server | ||
43 | |||
44 | rm -f ${D}${sysconfdir}/dhclient.conf* | ||
45 | rm -f ${D}${sysconfdir}/dhcpd.conf* | ||
46 | install -m 0644 ${WORKDIR}/dhclient.conf ${D}${sysconfdir}/dhcp/dhclient.conf | ||
47 | install -m 0644 ${WORKDIR}/dhcpd.conf ${D}${sysconfdir}/dhcp/dhcpd.conf | ||
48 | |||
49 | install -d ${D}${base_sbindir}/ | ||
50 | if [ "${sbindir}" != "${base_sbindir}" ]; then | ||
51 | mv ${D}${sbindir}/dhclient ${D}${base_sbindir}/ | ||
52 | fi | ||
53 | install -m 0755 ${S}/client/scripts/linux ${D}${base_sbindir}/dhclient-script | ||
54 | } | ||
55 | |||
56 | PACKAGES += "dhcp-server dhcp-server-config dhcp-client dhcp-relay dhcp-omshell" | ||
57 | |||
58 | FILES_${PN} = "" | ||
59 | RDEPENDS_${PN}-dev = "" | ||
60 | RDEPENDS_${PN}-staticdev = "" | ||
61 | |||
62 | FILES_dhcp-server = "${sbindir}/dhcpd ${sysconfdir}/init.d/dhcp-server" | ||
63 | RRECOMMENDS_dhcp-server = "dhcp-server-config" | ||
64 | |||
65 | FILES_dhcp-server-config = "${sysconfdir}/default/dhcp-server ${sysconfdir}/dhcp/dhcpd.conf" | ||
66 | |||
67 | FILES_dhcp-relay = "${sbindir}/dhcrelay ${sysconfdir}/init.d/dhcp-relay ${sysconfdir}/default/dhcp-relay" | ||
68 | |||
69 | FILES_dhcp-client = "${base_sbindir}/dhclient ${base_sbindir}/dhclient-script ${sysconfdir}/dhcp/dhclient.conf" | ||
70 | RDEPENDS_dhcp-client = "bash" | ||
71 | |||
72 | FILES_dhcp-omshell = "${bindir}/omshell" | ||
73 | |||
74 | pkg_postinst_dhcp-server() { | ||
75 | mkdir -p $D/${localstatedir}/lib/dhcp | ||
76 | touch $D/${localstatedir}/lib/dhcp/dhcpd.leases | ||
77 | touch $D/${localstatedir}/lib/dhcp/dhcpd6.leases | ||
78 | } | ||
79 | |||
80 | pkg_postinst_dhcp-client() { | ||
81 | mkdir -p $D/${localstatedir}/lib/dhcp | ||
82 | } | ||
83 | |||
84 | pkg_postrm_dhcp-server() { | ||
85 | rm -f $D/${localstatedir}/lib/dhcp/dhcpd.leases | ||
86 | rm -f $D/${localstatedir}/lib/dhcp/dhcpd6.leases | ||
87 | |||
88 | if ! rmdir $D/${localstatedir}/lib/dhcp 2>/dev/null; then | ||
89 | echo "Not removing ${localstatedir}/lib/dhcp as it is non-empty." | ||
90 | fi | ||
91 | } | ||
92 | |||
93 | pkg_postrm_dhcp-client() { | ||
94 | rm -f $D/${localstatedir}/lib/dhcp/dhclient.leases | ||
95 | rm -f $D/${localstatedir}/lib/dhcp/dhclient6.leases | ||
96 | |||
97 | if ! rmdir $D/${localstatedir}/lib/dhcp 2>/dev/null; then | ||
98 | echo "Not removing ${localstatedir}/lib/dhcp as it is non-empty." | ||
99 | fi | ||
100 | } | ||
diff --git a/meta/recipes-connectivity/dhcp/dhcp/dhcp-3.0.3-dhclient-dbus.patch b/meta/recipes-connectivity/dhcp/dhcp/dhcp-3.0.3-dhclient-dbus.patch new file mode 100644 index 0000000000..b4a666d106 --- /dev/null +++ b/meta/recipes-connectivity/dhcp/dhcp/dhcp-3.0.3-dhclient-dbus.patch | |||
@@ -0,0 +1,86 @@ | |||
1 | Upstream-Status: Inappropriate [distribution] | ||
2 | |||
3 | --- client/scripts/bsdos | ||
4 | +++ client/scripts/bsdos | ||
5 | @@ -47,6 +47,11 @@ | ||
6 | . /etc/dhcp/dhclient-exit-hooks | ||
7 | fi | ||
8 | # probably should do something with exit status of the local script | ||
9 | + if [ x$dhc_dbus != x -a $exit_status -eq 0 ]; then | ||
10 | + dbus-send --system --dest=com.redhat.dhcp \ | ||
11 | + --type=method_call /com/redhat/dhcp/$interface com.redhat.dhcp.set \ | ||
12 | + 'string:'"`env | grep -Ev '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`" | ||
13 | + fi | ||
14 | exit $exit_status | ||
15 | } | ||
16 | |||
17 | --- client/scripts/freebsd | ||
18 | +++ client/scripts/freebsd | ||
19 | @@ -57,6 +57,11 @@ | ||
20 | . /etc/dhcp/dhclient-exit-hooks | ||
21 | fi | ||
22 | # probably should do something with exit status of the local script | ||
23 | + if [ x$dhc_dbus != x -a $exit_status -eq 0 ]; then | ||
24 | + dbus-send --system --dest=com.redhat.dhcp \ | ||
25 | + --type=method_call /com/redhat/dhcp/$interface com.redhat.dhcp.set \ | ||
26 | + 'string:'"`env | grep -Ev '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`" | ||
27 | + fi | ||
28 | exit $exit_status | ||
29 | } | ||
30 | |||
31 | --- client/scripts/linux | ||
32 | +++ client/scripts/linux | ||
33 | @@ -69,6 +69,11 @@ | ||
34 | . /etc/dhcp/dhclient-exit-hooks | ||
35 | fi | ||
36 | # probably should do something with exit status of the local script | ||
37 | + if [ x$dhc_dbus != x -a $exit_status -eq 0 ]; then | ||
38 | + dbus-send --system --dest=com.redhat.dhcp \ | ||
39 | + --type=method_call /com/redhat/dhcp/$interface com.redhat.dhcp.set \ | ||
40 | + 'string:'"`env | grep -Ev '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`" | ||
41 | + fi | ||
42 | exit $exit_status | ||
43 | } | ||
44 | |||
45 | --- client/scripts/netbsd | ||
46 | +++ client/scripts/netbsd | ||
47 | @@ -47,6 +47,11 @@ | ||
48 | . /etc/dhcp/dhclient-exit-hooks | ||
49 | fi | ||
50 | # probably should do something with exit status of the local script | ||
51 | + if [ x$dhc_dbus != x -a $exit_status -eq 0 ]; then | ||
52 | + dbus-send --system --dest=com.redhat.dhcp \ | ||
53 | + --type=method_call /com/redhat/dhcp/$interface com.redhat.dhcp.set \ | ||
54 | + 'string:'"`env | grep -Ev '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`" | ||
55 | + fi | ||
56 | exit $exit_status | ||
57 | } | ||
58 | |||
59 | --- client/scripts/openbsd | ||
60 | +++ client/scripts/openbsd | ||
61 | @@ -47,6 +47,11 @@ | ||
62 | . /etc/dhcp/dhclient-exit-hooks | ||
63 | fi | ||
64 | # probably should do something with exit status of the local script | ||
65 | + if [ x$dhc_dbus != x -a $exit_status -eq 0 ]; then | ||
66 | + dbus-send --system --dest=com.redhat.dhcp \ | ||
67 | + --type=method_call /com/redhat/dhcp/$interface com.redhat.dhcp.set \ | ||
68 | + 'string:'"`env | grep -Ev '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`" | ||
69 | + fi | ||
70 | exit $exit_status | ||
71 | } | ||
72 | |||
73 | --- client/scripts/solaris | ||
74 | +++ client/scripts/solaris | ||
75 | @@ -47,6 +47,11 @@ | ||
76 | . /etc/dhcp/dhclient-exit-hooks | ||
77 | fi | ||
78 | # probably should do something with exit status of the local script | ||
79 | + if [ x$dhc_dbus != x -a $exit_status -eq 0 ]; then | ||
80 | + dbus-send --system --dest=com.redhat.dhcp \ | ||
81 | + --type=method_call /com/redhat/dhcp/$interface com.redhat.dhcp.set \ | ||
82 | + 'string:'"`env | grep -Ev '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`" | ||
83 | + fi | ||
84 | exit $exit_status | ||
85 | } | ||
86 | |||
diff --git a/meta/recipes-connectivity/dhcp/dhcp/fix-client-path.patch b/meta/recipes-connectivity/dhcp/dhcp/fix-client-path.patch new file mode 100644 index 0000000000..97ed0d9322 --- /dev/null +++ b/meta/recipes-connectivity/dhcp/dhcp/fix-client-path.patch | |||
@@ -0,0 +1,23 @@ | |||
1 | CLIENT_PATH is the only environment when executing dhclient-script, | ||
2 | without this patch, dhclient-script won't run properly because it | ||
3 | invokes ifconfig and route | ||
4 | |||
5 | Upstream-Status: Inappropriate [configuration] | ||
6 | |||
7 | 7/28/2010 - qhe | ||
8 | |||
9 | diff -ru dhcp-4.1.1-P1.orig//client/Makefile.am dhcp-4.1.1-P1/client/Makefile.am | ||
10 | --- dhcp-4.1.1-P1.orig//client/Makefile.am 2010-07-29 13:20:05.000000000 +0800 | ||
11 | +++ dhcp-4.1.1-P1/client/Makefile.am 2010-07-29 13:28:14.000000000 +0800 | ||
12 | @@ -10,9 +10,9 @@ | ||
13 | EXTRA_DIST = $(man_MANS) | ||
14 | |||
15 | dhclient.o: dhclient.c | ||
16 | - $(COMPILE) -DCLIENT_PATH='"$(sbindir)"' \ | ||
17 | + $(COMPILE) -DCLIENT_PATH='"PATH=$(sbindir):$(base_sbindir):$(bindir):$(base_bindir)"' \ | ||
18 | -DLOCALSTATEDIR='"$(localstatedir)"' -c dhclient.c | ||
19 | |||
20 | dhc6.o: dhc6.c | ||
21 | - $(COMPILE) -DCLIENT_PATH='"$(sbindir)"' \ | ||
22 | + $(COMPILE) -DCLIENT_PATH='"PATH=$(sbindir):$(base_sbindir):$(bindir):$(base_bindir)"' \ | ||
23 | -DLOCALSTATEDIR='"$(localstatedir)"' -c dhc6.c | ||
diff --git a/meta/recipes-connectivity/dhcp/dhcp/fix-external-bind.patch b/meta/recipes-connectivity/dhcp/dhcp/fix-external-bind.patch new file mode 100644 index 0000000000..4f11655812 --- /dev/null +++ b/meta/recipes-connectivity/dhcp/dhcp/fix-external-bind.patch | |||
@@ -0,0 +1,103 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | 11/30/2010 | ||
4 | --with-libbind=PATH is available but not used by Makefile, | ||
5 | this patch is to allow building with external bind | ||
6 | |||
7 | Signed-off-by: Qing He <qing.he@intel.com> | ||
8 | |||
9 | diff --git a/Makefile.am b/Makefile.am | ||
10 | index 928d926..cd17af8 100644 | ||
11 | --- a/Makefile.am | ||
12 | +++ b/Makefile.am | ||
13 | @@ -21,7 +21,7 @@ EXTRA_DIST = RELNOTES LICENSE \ | ||
14 | util/bindvar.sh \ | ||
15 | bind/Makefile bind/bind.tar.gz bind/version.tmp | ||
16 | |||
17 | -SUBDIRS = bind includes tests common dst omapip client dhcpctl relay server | ||
18 | +SUBDIRS = includes tests common dst omapip client dhcpctl relay server | ||
19 | |||
20 | nobase_include_HEADERS = dhcpctl/dhcpctl.h | ||
21 | |||
22 | diff --git a/client/Makefile.am b/client/Makefile.am | ||
23 | index 77ed055..5a77f2d 100644 | ||
24 | --- a/client/Makefile.am | ||
25 | +++ b/client/Makefile.am | ||
26 | @@ -5,7 +5,7 @@ dhclient_SOURCES = clparse.c dhclient.c dhc6.c \ | ||
27 | scripts/netbsd scripts/nextstep scripts/openbsd \ | ||
28 | scripts/solaris scripts/openwrt | ||
29 | dhclient_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \ | ||
30 | - ../bind/lib/libdns.a ../bind/lib/libisc.a | ||
31 | + $(libbind)/libdns.a $(libbind)/libisc.a | ||
32 | man_MANS = dhclient.8 dhclient-script.8 dhclient.conf.5 dhclient.leases.5 | ||
33 | EXTRA_DIST = $(man_MANS) | ||
34 | |||
35 | diff --git a/configure.ac b/configure.ac | ||
36 | index ff832aa..60d342c 100644 | ||
37 | --- a/configure.ac | ||
38 | +++ b/configure.ac | ||
39 | @@ -500,6 +500,7 @@ no) | ||
40 | libbind="$use_libbind" | ||
41 | ;; | ||
42 | esac | ||
43 | +AC_SUBST([libbind]) | ||
44 | |||
45 | # OpenLDAP support. | ||
46 | AC_ARG_WITH(ldap, | ||
47 | diff --git a/dhcpctl/Makefile.am b/dhcpctl/Makefile.am | ||
48 | index 61049be..85aefa3 100644 | ||
49 | --- a/dhcpctl/Makefile.am | ||
50 | +++ b/dhcpctl/Makefile.am | ||
51 | @@ -6,10 +6,10 @@ EXTRA_DIST = $(man_MANS) | ||
52 | |||
53 | omshell_SOURCES = omshell.c | ||
54 | omshell_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \ | ||
55 | - ../bind/lib/libdns.a ../bind/lib/libisc.a | ||
56 | + $(libbind)/libdns.a $(libbind)/libisc.a | ||
57 | |||
58 | libdhcpctl_a_SOURCES = dhcpctl.c callback.c remote.c | ||
59 | |||
60 | cltest_SOURCES = cltest.c | ||
61 | cltest_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \ | ||
62 | - ../bind/lib/libdns.a ../bind/lib/libisc.a | ||
63 | \ No newline at end of file | ||
64 | + $(libbind)/libdns.a $(libbind)/libisc.a | ||
65 | diff --git a/omapip/Makefile.am b/omapip/Makefile.am | ||
66 | index 595950a..17f2233 100644 | ||
67 | --- a/omapip/Makefile.am | ||
68 | +++ b/omapip/Makefile.am | ||
69 | @@ -10,5 +10,5 @@ man_MANS = omapi.3 | ||
70 | EXTRA_DIST = $(man_MANS) | ||
71 | |||
72 | svtest_SOURCES = test.c | ||
73 | -svtest_LDADD = libomapi.a ../bind/lib/libdns.a ../bind/lib/libisc.a | ||
74 | +svtest_LDADD = libomapi.a $(libbind)/libdns.a $(libbind)/libisc.a | ||
75 | |||
76 | diff --git a/relay/Makefile.am b/relay/Makefile.am | ||
77 | index d8757ca..a7885da 100644 | ||
78 | --- a/relay/Makefile.am | ||
79 | +++ b/relay/Makefile.am | ||
80 | @@ -3,7 +3,7 @@ AM_CPPFLAGS = -DLOCALSTATEDIR='"@localstatedir@"' | ||
81 | sbin_PROGRAMS = dhcrelay | ||
82 | dhcrelay_SOURCES = dhcrelay.c | ||
83 | dhcrelay_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \ | ||
84 | - ../bind/lib/libdns.a ../bind/lib/libisc.a | ||
85 | + $(libbind)/libdns.a $(libbind)/libisc.a | ||
86 | man_MANS = dhcrelay.8 | ||
87 | EXTRA_DIST = $(man_MANS) | ||
88 | |||
89 | diff --git a/server/Makefile.am b/server/Makefile.am | ||
90 | index cdfaf47..d2c254b 100644 | ||
91 | --- a/server/Makefile.am | ||
92 | +++ b/server/Makefile.am | ||
93 | @@ -8,8 +8,8 @@ dhcpd_SOURCES = dhcpd.c dhcp.c bootp.c confpars.c db.c class.c failover.c \ | ||
94 | |||
95 | dhcpd_CFLAGS = $(LDAP_CFLAGS) | ||
96 | dhcpd_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \ | ||
97 | - ../dhcpctl/libdhcpctl.a ../bind/lib/libdns.a \ | ||
98 | - ../bind/lib/libisc.a | ||
99 | + ../dhcpctl/libdhcpctl.a $(libbind)/libdns.a \ | ||
100 | + $(libbind)/libisc.a | ||
101 | |||
102 | man_MANS = dhcpd.8 dhcpd.conf.5 dhcpd.leases.5 | ||
103 | EXTRA_DIST = $(man_MANS) | ||
diff --git a/meta/recipes-connectivity/dhcp/dhcp/fixsepbuild.patch b/meta/recipes-connectivity/dhcp/dhcp/fixsepbuild.patch new file mode 100644 index 0000000000..e686afd2d2 --- /dev/null +++ b/meta/recipes-connectivity/dhcp/dhcp/fixsepbuild.patch | |||
@@ -0,0 +1,90 @@ | |||
1 | Fix out of tree builds | ||
2 | |||
3 | Upstream-Status: Pending | ||
4 | |||
5 | RP 2013/03/21 | ||
6 | |||
7 | Index: dhcp-4.2.5/common/Makefile.am | ||
8 | =================================================================== | ||
9 | --- dhcp-4.2.5.orig/common/Makefile.am 2013-03-21 12:54:11.345063519 +0000 | ||
10 | +++ dhcp-4.2.5/common/Makefile.am 2013-03-21 12:54:11.805063510 +0000 | ||
11 | @@ -1,4 +1,4 @@ | ||
12 | -AM_CPPFLAGS = -I.. -DLOCALSTATEDIR='"@localstatedir@"' | ||
13 | +AM_CPPFLAGS = -I$(top_srcdir)/includes -I$(top_srcdir) -DLOCALSTATEDIR='"@localstatedir@"' | ||
14 | AM_CFLAGS = $(LDAP_CFLAGS) | ||
15 | |||
16 | noinst_LIBRARIES = libdhcp.a | ||
17 | Index: dhcp-4.2.5/dst/Makefile.am | ||
18 | =================================================================== | ||
19 | --- dhcp-4.2.5.orig/dst/Makefile.am 2013-03-21 12:54:11.345063519 +0000 | ||
20 | +++ dhcp-4.2.5/dst/Makefile.am 2013-03-21 12:54:11.805063510 +0000 | ||
21 | @@ -1,4 +1,4 @@ | ||
22 | -AM_CPPFLAGS = -DMINIRES_LIB -DHMAC_MD5 | ||
23 | +AM_CPPFLAGS = -DMINIRES_LIB -DHMAC_MD5 -I$(top_srcdir)/includes | ||
24 | |||
25 | lib_LIBRARIES = libdst.a | ||
26 | |||
27 | Index: dhcp-4.2.5/omapip/Makefile.am | ||
28 | =================================================================== | ||
29 | --- dhcp-4.2.5.orig/omapip/Makefile.am 2013-03-21 12:54:11.677063511 +0000 | ||
30 | +++ dhcp-4.2.5/omapip/Makefile.am 2013-03-21 12:54:11.809063510 +0000 | ||
31 | @@ -1,3 +1,5 @@ | ||
32 | +AM_CPPFLAGS = -I$(top_srcdir)/includes | ||
33 | + | ||
34 | lib_LIBRARIES = libomapi.a | ||
35 | noinst_PROGRAMS = svtest | ||
36 | |||
37 | Index: dhcp-4.2.5/client/Makefile.am | ||
38 | =================================================================== | ||
39 | --- dhcp-4.2.5.orig/client/Makefile.am 2013-03-21 12:54:11.677063511 +0000 | ||
40 | +++ dhcp-4.2.5/client/Makefile.am 2013-03-21 12:54:11.809063510 +0000 | ||
41 | @@ -1,3 +1,5 @@ | ||
42 | +AM_CPPFLAGS = -I$(top_srcdir)/includes | ||
43 | + | ||
44 | dist_sysconf_DATA = dhclient.conf.example | ||
45 | sbin_PROGRAMS = dhclient | ||
46 | dhclient_SOURCES = clparse.c dhclient.c dhc6.c \ | ||
47 | @@ -11,8 +13,8 @@ | ||
48 | |||
49 | dhclient.o: dhclient.c | ||
50 | $(COMPILE) -DCLIENT_PATH='"PATH=$(sbindir):/sbin:/bin:/usr/sbin:/usr/bin"' \ | ||
51 | - -DLOCALSTATEDIR='"$(localstatedir)"' -c dhclient.c | ||
52 | + -DLOCALSTATEDIR='"$(localstatedir)"' -c $(srcdir)/dhclient.c | ||
53 | |||
54 | dhc6.o: dhc6.c | ||
55 | $(COMPILE) -DCLIENT_PATH='"PATH=$(sbindir):/sbin:/bin:/usr/sbin:/usr/bin"' \ | ||
56 | - -DLOCALSTATEDIR='"$(localstatedir)"' -c dhc6.c | ||
57 | + -DLOCALSTATEDIR='"$(localstatedir)"' -c $(srcdir)/dhc6.c | ||
58 | Index: dhcp-4.2.5/dhcpctl/Makefile.am | ||
59 | =================================================================== | ||
60 | --- dhcp-4.2.5.orig/dhcpctl/Makefile.am 2013-03-21 12:54:11.677063511 +0000 | ||
61 | +++ dhcp-4.2.5/dhcpctl/Makefile.am 2013-03-21 12:54:11.809063510 +0000 | ||
62 | @@ -1,3 +1,5 @@ | ||
63 | +AM_CPPFLAGS = -I$(top_srcdir)/includes -I$(top_srcdir) | ||
64 | + | ||
65 | bin_PROGRAMS = omshell | ||
66 | lib_LIBRARIES = libdhcpctl.a | ||
67 | noinst_PROGRAMS = cltest | ||
68 | Index: dhcp-4.2.5/relay/Makefile.am | ||
69 | =================================================================== | ||
70 | --- dhcp-4.2.5.orig/relay/Makefile.am 2013-03-21 12:54:11.677063511 +0000 | ||
71 | +++ dhcp-4.2.5/relay/Makefile.am 2013-03-21 12:54:11.809063510 +0000 | ||
72 | @@ -1,4 +1,4 @@ | ||
73 | -AM_CPPFLAGS = -DLOCALSTATEDIR='"@localstatedir@"' | ||
74 | +AM_CPPFLAGS = -DLOCALSTATEDIR='"@localstatedir@"' -I$(top_srcdir)/includes | ||
75 | |||
76 | sbin_PROGRAMS = dhcrelay | ||
77 | dhcrelay_SOURCES = dhcrelay.c | ||
78 | Index: dhcp-4.2.5/server/Makefile.am | ||
79 | =================================================================== | ||
80 | --- dhcp-4.2.5.orig/server/Makefile.am 2013-03-21 12:54:11.677063511 +0000 | ||
81 | +++ dhcp-4.2.5/server/Makefile.am 2013-03-21 12:55:01.509062081 +0000 | ||
82 | @@ -4,7 +4,7 @@ | ||
83 | # production code. Sadly, we are not there yet. | ||
84 | SUBDIRS = . tests | ||
85 | |||
86 | -AM_CPPFLAGS = -I.. -DLOCALSTATEDIR='"@localstatedir@"' | ||
87 | +AM_CPPFLAGS = -I$(top_srcdir) -DLOCALSTATEDIR='"@localstatedir@"' -I$(top_srcdir)/includes | ||
88 | |||
89 | dist_sysconf_DATA = dhcpd.conf.example | ||
90 | sbin_PROGRAMS = dhcpd | ||
diff --git a/meta/recipes-connectivity/dhcp/dhcp/link-with-lcrypto.patch b/meta/recipes-connectivity/dhcp/dhcp/link-with-lcrypto.patch new file mode 100644 index 0000000000..57e10b0297 --- /dev/null +++ b/meta/recipes-connectivity/dhcp/dhcp/link-with-lcrypto.patch | |||
@@ -0,0 +1,25 @@ | |||
1 | Author: Andrei Gherzan <andrei@gherzan.ro> | ||
2 | Date: Thu Feb 2 23:59:11 2012 +0200 | ||
3 | |||
4 | From 4.2.0 final release, -lcrypto check was removed and we compile static libraries | ||
5 | from bind that are linked to libcrypto. This is why i added a patch in order to add | ||
6 | -lcrypto to LIBS. | ||
7 | |||
8 | Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> | ||
9 | Upstream-Status: Pending | ||
10 | |||
11 | Index: 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/site.h b/meta/recipes-connectivity/dhcp/dhcp/site.h new file mode 100644 index 0000000000..2289554ef3 --- /dev/null +++ b/meta/recipes-connectivity/dhcp/dhcp/site.h | |||
@@ -0,0 +1,21 @@ | |||
1 | /* | ||
2 | * define config file location in ${S}/includes/site.h | ||
3 | * still need to take care of installation path (${sysconfdir}/dhcpd.conf) | ||
4 | * | ||
5 | * 7/22/2010 - qhe | ||
6 | */ | ||
7 | |||
8 | /* Define this if you want DNS update functionality to be available. */ | ||
9 | |||
10 | #define NSUPDATE | ||
11 | |||
12 | /* Define this if you aren't debugging and you want to save memory | ||
13 | (potentially a _lot_ of memory) by allocating leases in chunks rather | ||
14 | than one at a time. */ | ||
15 | |||
16 | #define COMPACT_LEASES | ||
17 | |||
18 | |||
19 | /* local */ | ||
20 | #define _PATH_DHCPD_CONF "/etc/dhcp/dhcpd.conf" | ||
21 | #define _PATH_DHCLIENT_CONF "/etc/dhcp/dhclient.conf" | ||
diff --git a/meta/recipes-connectivity/dhcp/dhcp_4.2.5-P1.bb b/meta/recipes-connectivity/dhcp/dhcp_4.2.5-P1.bb new file mode 100644 index 0000000000..08db41be25 --- /dev/null +++ b/meta/recipes-connectivity/dhcp/dhcp_4.2.5-P1.bb | |||
@@ -0,0 +1,12 @@ | |||
1 | require dhcp.inc | ||
2 | |||
3 | PR = "r1" | ||
4 | |||
5 | SRC_URI += "file://dhcp-3.0.3-dhclient-dbus.patch;striplevel=0 \ | ||
6 | file://fix-external-bind.patch \ | ||
7 | file://link-with-lcrypto.patch \ | ||
8 | file://fixsepbuild.patch \ | ||
9 | " | ||
10 | |||
11 | SRC_URI[md5sum] = "f68e3c1f00a9af5742bc5e71d567cf93" | ||
12 | SRC_URI[sha256sum] = "59b06c9f5d775e46999b422c45b9229402c462b114ce1685617bfb2b8b028250" | ||
diff --git a/meta/recipes-connectivity/dhcp/files/default-relay b/meta/recipes-connectivity/dhcp/files/default-relay new file mode 100644 index 0000000000..59249db283 --- /dev/null +++ b/meta/recipes-connectivity/dhcp/files/default-relay | |||
@@ -0,0 +1,12 @@ | |||
1 | # Defaults for dhcp-relay initscript | ||
2 | # sourced by /etc/init.d/dhcp-relay | ||
3 | |||
4 | # What servers should the DHCP relay forward requests to? | ||
5 | # e.g: SERVERS="192.168.0.1" | ||
6 | SERVERS="" | ||
7 | |||
8 | # On what interfaces should the DHCP relay (dhrelay) serve DHCP requests? | ||
9 | INTERFACES="" | ||
10 | |||
11 | # Additional options that are passed to the DHCP relay daemon? | ||
12 | OPTIONS="" \ No newline at end of file | ||
diff --git a/meta/recipes-connectivity/dhcp/files/default-server b/meta/recipes-connectivity/dhcp/files/default-server new file mode 100644 index 0000000000..0385d16992 --- /dev/null +++ b/meta/recipes-connectivity/dhcp/files/default-server | |||
@@ -0,0 +1,7 @@ | |||
1 | # Defaults for dhcp initscript | ||
2 | # sourced by /etc/init.d/dhcp-server | ||
3 | # installed at /etc/default/dhcp-server by the maintainer scripts | ||
4 | |||
5 | # On what interfaces should the DHCP server (dhcpd) serve DHCP requests? | ||
6 | # Separate multiple interfaces with spaces, e.g. "eth0 eth1". | ||
7 | INTERFACES="" | ||
diff --git a/meta/recipes-connectivity/dhcp/files/dhclient.conf b/meta/recipes-connectivity/dhcp/files/dhclient.conf new file mode 100644 index 0000000000..0e6dcf96c2 --- /dev/null +++ b/meta/recipes-connectivity/dhcp/files/dhclient.conf | |||
@@ -0,0 +1,50 @@ | |||
1 | # Configuration file for /sbin/dhclient, which is included in Debian's | ||
2 | # dhcp3-client package. | ||
3 | # | ||
4 | # This is a sample configuration file for dhclient. See dhclient.conf's | ||
5 | # man page for more information about the syntax of this file | ||
6 | # and a more comprehensive list of the parameters understood by | ||
7 | # dhclient. | ||
8 | # | ||
9 | # Normally, if the DHCP server provides reasonable information and does | ||
10 | # not leave anything out (like the domain name, for example), then | ||
11 | # few changes must be made to this file, if any. | ||
12 | # | ||
13 | |||
14 | #send host-name "andare.fugue.com"; | ||
15 | #send dhcp-client-identifier 1:0:a0:24:ab:fb:9c; | ||
16 | #send dhcp-lease-time 3600; | ||
17 | #supersede domain-name "fugue.com home.vix.com"; | ||
18 | #prepend domain-name-servers 127.0.0.1; | ||
19 | request subnet-mask, broadcast-address, time-offset, routers, | ||
20 | domain-name, domain-name-servers, host-name, | ||
21 | netbios-name-servers, netbios-scope; | ||
22 | #require subnet-mask, domain-name-servers; | ||
23 | #timeout 60; | ||
24 | #retry 60; | ||
25 | #reboot 10; | ||
26 | #select-timeout 5; | ||
27 | #initial-interval 2; | ||
28 | #script "/etc/dhcp3/dhclient-script"; | ||
29 | #media "-link0 -link1 -link2", "link0 link1"; | ||
30 | #reject 192.33.137.209; | ||
31 | |||
32 | #alias { | ||
33 | # interface "eth0"; | ||
34 | # fixed-address 192.5.5.213; | ||
35 | # option subnet-mask 255.255.255.255; | ||
36 | #} | ||
37 | |||
38 | #lease { | ||
39 | # interface "eth0"; | ||
40 | # fixed-address 192.33.137.200; | ||
41 | # medium "link0 link1"; | ||
42 | # option host-name "andare.swiftmedia.com"; | ||
43 | # option subnet-mask 255.255.255.0; | ||
44 | # option broadcast-address 192.33.137.255; | ||
45 | # option routers 192.33.137.250; | ||
46 | # option domain-name-servers 127.0.0.1; | ||
47 | # renew 2 2000/1/12 00:00:01; | ||
48 | # rebind 2 2000/1/12 00:00:01; | ||
49 | # expire 2 2000/1/12 00:00:01; | ||
50 | #} | ||
diff --git a/meta/recipes-connectivity/dhcp/files/dhcpd.conf b/meta/recipes-connectivity/dhcp/files/dhcpd.conf new file mode 100644 index 0000000000..0001c0f00e --- /dev/null +++ b/meta/recipes-connectivity/dhcp/files/dhcpd.conf | |||
@@ -0,0 +1,108 @@ | |||
1 | # | ||
2 | # Sample configuration file for ISC dhcpd for Debian | ||
3 | # | ||
4 | # $Id: dhcpd.conf,v 1.1.1.1 2002/05/21 00:07:44 peloy Exp $ | ||
5 | # | ||
6 | |||
7 | # The ddns-updates-style parameter controls whether or not the server will | ||
8 | # attempt to do a DNS update when a lease is confirmed. We default to the | ||
9 | # behavior of the version 2 packages ('none', since DHCP v2 didn't | ||
10 | # have support for DDNS.) | ||
11 | ddns-update-style none; | ||
12 | |||
13 | # option definitions common to all supported networks... | ||
14 | option domain-name "example.org"; | ||
15 | option domain-name-servers ns1.example.org, ns2.example.org; | ||
16 | |||
17 | default-lease-time 600; | ||
18 | max-lease-time 7200; | ||
19 | |||
20 | # If this DHCP server is the official DHCP server for the local | ||
21 | # network, the authoritative directive should be uncommented. | ||
22 | #authoritative; | ||
23 | |||
24 | # Use this to send dhcp log messages to a different log file (you also | ||
25 | # have to hack syslog.conf to complete the redirection). | ||
26 | log-facility local7; | ||
27 | |||
28 | # No service will be given on this subnet, but declaring it helps the | ||
29 | # DHCP server to understand the network topology. | ||
30 | |||
31 | #subnet 10.152.187.0 netmask 255.255.255.0 { | ||
32 | #} | ||
33 | |||
34 | # This is a very basic subnet declaration. | ||
35 | |||
36 | #subnet 10.254.239.0 netmask 255.255.255.224 { | ||
37 | # range 10.254.239.10 10.254.239.20; | ||
38 | # option routers rtr-239-0-1.example.org, rtr-239-0-2.example.org; | ||
39 | #} | ||
40 | |||
41 | # This declaration allows BOOTP clients to get dynamic addresses, | ||
42 | # which we don't really recommend. | ||
43 | |||
44 | #subnet 10.254.239.32 netmask 255.255.255.224 { | ||
45 | # range dynamic-bootp 10.254.239.40 10.254.239.60; | ||
46 | # option broadcast-address 10.254.239.31; | ||
47 | # option routers rtr-239-32-1.example.org; | ||
48 | #} | ||
49 | |||
50 | # A slightly different configuration for an internal subnet. | ||
51 | #subnet 10.5.5.0 netmask 255.255.255.224 { | ||
52 | # range 10.5.5.26 10.5.5.30; | ||
53 | # option domain-name-servers ns1.internal.example.org; | ||
54 | # option domain-name "internal.example.org"; | ||
55 | # option routers 10.5.5.1; | ||
56 | # option broadcast-address 10.5.5.31; | ||
57 | # default-lease-time 600; | ||
58 | # max-lease-time 7200; | ||
59 | #} | ||
60 | |||
61 | # Hosts which require special configuration options can be listed in | ||
62 | # host statements. If no address is specified, the address will be | ||
63 | # allocated dynamically (if possible), but the host-specific information | ||
64 | # will still come from the host declaration. | ||
65 | |||
66 | #host passacaglia { | ||
67 | # hardware ethernet 0:0:c0:5d:bd:95; | ||
68 | # filename "vmunix.passacaglia"; | ||
69 | # server-name "toccata.fugue.com"; | ||
70 | #} | ||
71 | |||
72 | # Fixed IP addresses can also be specified for hosts. These addresses | ||
73 | # should not also be listed as being available for dynamic assignment. | ||
74 | # Hosts for which fixed IP addresses have been specified can boot using | ||
75 | # BOOTP or DHCP. Hosts for which no fixed address is specified can only | ||
76 | # be booted with DHCP, unless there is an address range on the subnet | ||
77 | # to which a BOOTP client is connected which has the dynamic-bootp flag | ||
78 | # set. | ||
79 | #host fantasia { | ||
80 | # hardware ethernet 08:00:07:26:c0:a5; | ||
81 | # fixed-address fantasia.fugue.com; | ||
82 | #} | ||
83 | |||
84 | # You can declare a class of clients and then do address allocation | ||
85 | # based on that. The example below shows a case where all clients | ||
86 | # in a certain class get addresses on the 10.17.224/24 subnet, and all | ||
87 | # other clients get addresses on the 10.0.29/24 subnet. | ||
88 | |||
89 | #class "foo" { | ||
90 | # match if substring (option vendor-class-identifier, 0, 4) = "SUNW"; | ||
91 | #} | ||
92 | |||
93 | #shared-network 224-29 { | ||
94 | # subnet 10.17.224.0 netmask 255.255.255.0 { | ||
95 | # option routers rtr-224.example.org; | ||
96 | # } | ||
97 | # subnet 10.0.29.0 netmask 255.255.255.0 { | ||
98 | # option routers rtr-29.example.org; | ||
99 | # } | ||
100 | # pool { | ||
101 | # allow members of "foo"; | ||
102 | # range 10.17.224.10 10.17.224.250; | ||
103 | # } | ||
104 | # pool { | ||
105 | # deny members of "foo"; | ||
106 | # range 10.0.29.10 10.0.29.230; | ||
107 | # } | ||
108 | #} | ||
diff --git a/meta/recipes-connectivity/dhcp/files/init-relay b/meta/recipes-connectivity/dhcp/files/init-relay new file mode 100644 index 0000000000..019a7e84cf --- /dev/null +++ b/meta/recipes-connectivity/dhcp/files/init-relay | |||
@@ -0,0 +1,44 @@ | |||
1 | #!/bin/sh | ||
2 | # | ||
3 | # $Id: dhcp3-relay,v 1.1 2004/04/16 15:41:08 ml Exp $ | ||
4 | # | ||
5 | |||
6 | # It is not safe to start if we don't have a default configuration... | ||
7 | if [ ! -f /etc/default/dhcp-relay ]; then | ||
8 | echo "/etc/default/dhcp-relay does not exist! - Aborting..." | ||
9 | echo "create this file to fix the problem." | ||
10 | exit 1 | ||
11 | fi | ||
12 | |||
13 | # Read init script configuration (interfaces the daemon should listen on | ||
14 | # and the DHCP server we should forward requests to.) | ||
15 | . /etc/default/dhcp-relay | ||
16 | |||
17 | # Build command line for interfaces (will be passed to dhrelay below.) | ||
18 | IFCMD="" | ||
19 | if test "$INTERFACES" != ""; then | ||
20 | for I in $INTERFACES; do | ||
21 | IFCMD=${IFCMD}"-i "${I}" " | ||
22 | done | ||
23 | fi | ||
24 | |||
25 | DHCRELAYPID=/var/run/dhcrelay.pid | ||
26 | |||
27 | case "$1" in | ||
28 | start) | ||
29 | start-stop-daemon -S -x /usr/sbin/dhcrelay -- -q $OPTIONS $IFCMD $SERVERS | ||
30 | ;; | ||
31 | stop) | ||
32 | start-stop-daemon -K -x /usr/sbin/dhcrelay | ||
33 | ;; | ||
34 | restart | force-reload) | ||
35 | $0 stop | ||
36 | sleep 2 | ||
37 | $0 start | ||
38 | ;; | ||
39 | *) | ||
40 | echo "Usage: /etc/init.d/dhcp-relay {start|stop|restart|force-reload}" | ||
41 | exit 1 | ||
42 | esac | ||
43 | |||
44 | exit 0 | ||
diff --git a/meta/recipes-connectivity/dhcp/files/init-server b/meta/recipes-connectivity/dhcp/files/init-server new file mode 100644 index 0000000000..34c20852b9 --- /dev/null +++ b/meta/recipes-connectivity/dhcp/files/init-server | |||
@@ -0,0 +1,44 @@ | |||
1 | #!/bin/sh | ||
2 | # | ||
3 | # $Id: dhcp3-server.init.d,v 1.4 2003/07/13 19:12:41 mdz Exp $ | ||
4 | # | ||
5 | |||
6 | test -f /usr/sbin/dhcpd || exit 0 | ||
7 | |||
8 | # It is not safe to start if we don't have a default configuration... | ||
9 | if [ ! -f /etc/default/dhcp-server ]; then | ||
10 | echo "/etc/default/dhcp-server does not exist! - Aborting..." | ||
11 | exit 0 | ||
12 | fi | ||
13 | |||
14 | # Read init script configuration (so far only interfaces the daemon | ||
15 | # should listen on.) | ||
16 | . /etc/default/dhcp-server | ||
17 | |||
18 | case "$1" in | ||
19 | start) | ||
20 | echo -n "Starting DHCP server: " | ||
21 | test -d /var/lib/dhcp/ || mkdir -p /var/lib/dhcp/ | ||
22 | test -f /var/lib/dhcp/dhcpd.leases || touch /var/lib/dhcp/dhcpd.leases | ||
23 | start-stop-daemon -S -x /usr/sbin/dhcpd -- -q $INTERFACES | ||
24 | echo "." | ||
25 | ;; | ||
26 | stop) | ||
27 | echo -n "Stopping DHCP server: dhcpd3" | ||
28 | start-stop-daemon -K -x /usr/sbin/dhcpd | ||
29 | echo "." | ||
30 | ;; | ||
31 | restart | force-reload) | ||
32 | $0 stop | ||
33 | sleep 2 | ||
34 | $0 start | ||
35 | if [ "$?" != "0" ]; then | ||
36 | exit 1 | ||
37 | fi | ||
38 | ;; | ||
39 | *) | ||
40 | echo "Usage: /etc/init.d/dhcp-server {start|stop|restart|force-reload}" | ||
41 | exit 1 | ||
42 | esac | ||
43 | |||
44 | exit 0 | ||