diff options
Diffstat (limited to 'meta-networking/recipes-support')
-rw-r--r-- | meta-networking/recipes-support/nis/files/libdl.patch | 12 | ||||
-rw-r--r-- | meta-networking/recipes-support/nis/files/no-selinux.patch | 16 | ||||
-rw-r--r-- | meta-networking/recipes-support/nis/nis.inc | 2 | ||||
-rw-r--r-- | meta-networking/recipes-support/nis/yp-tools_2.14.bb (renamed from meta-networking/recipes-support/nis/yp-tools_2.12.bb) | 23 | ||||
-rw-r--r-- | meta-networking/recipes-support/nis/ypbind-mt_1.38.bb (renamed from meta-networking/recipes-support/nis/ypbind-mt_1.36.bb) | 37 |
5 files changed, 33 insertions, 57 deletions
diff --git a/meta-networking/recipes-support/nis/files/libdl.patch b/meta-networking/recipes-support/nis/files/libdl.patch deleted file mode 100644 index 605af319f..000000000 --- a/meta-networking/recipes-support/nis/files/libdl.patch +++ /dev/null | |||
@@ -1,12 +0,0 @@ | |||
1 | --- pwdutils-2.6/configure.in.orig 2005-04-19 20:22:36.603052192 -0700 | ||
2 | +++ pwdutils-2.6/configure.in 2005-04-19 21:09:45.308023672 -0700 | ||
3 | @@ -178,6 +178,9 @@ | ||
4 | AC_CHECK_LIB(ldap, main, LDAP_LIBS="-lldap $LDAP_LIBS" found_ldap_lib=yes,,$LDAP_LIBS) | ||
5 | fi | ||
6 | |||
7 | + dnl this always needs dl | ||
8 | + AC_CHECK_LIB(dl, dlopen, LDAP_LIBS="$LDAP_LIBS -ldl") | ||
9 | + | ||
10 | if test -z "$found_ldap_lib" -a \( $with_ldap_lib = auto -o $with_ldap_lib = netscape5 \); then | ||
11 | AC_CHECK_LIB(ldap50, main, LDAP_LIBS="-lldap50 -lssldap50 -lssl3 -lnss3 -lnspr4 -lprldap50 -lplc4 -lplds4" found_ldap_lib=yes need_pthread=true,, -lpthread) | ||
12 | fi | ||
diff --git a/meta-networking/recipes-support/nis/files/no-selinux.patch b/meta-networking/recipes-support/nis/files/no-selinux.patch deleted file mode 100644 index 71da3e393..000000000 --- a/meta-networking/recipes-support/nis/files/no-selinux.patch +++ /dev/null | |||
@@ -1,16 +0,0 @@ | |||
1 | --- pwdutils-2.6/lib/copy_xattr.c.orig 2005-04-16 17:15:52.916660880 -0700 | ||
2 | +++ pwdutils-2.6/lib/copy_xattr.c 2005-04-16 17:18:10.345768480 -0700 | ||
3 | @@ -127,8 +127,11 @@ | ||
4 | |||
5 | if (lsetxattr (to, name, value, size, 0) != 0) | ||
6 | { | ||
7 | - if (strcmp (name, "security.selinux") == 0 && | ||
8 | - is_selinux_enabled() == 0) | ||
9 | + if (strcmp (name, "security.selinux") == 0 | ||
10 | +#if defined(WITH_SELINUX) | ||
11 | + && is_selinux_enabled() == 0 | ||
12 | +#endif | ||
13 | + ) | ||
14 | fprintf (stderr, | ||
15 | _("SELinux not enabled, ignore attribute %s for `%s'.\n"), | ||
16 | name, to); | ||
diff --git a/meta-networking/recipes-support/nis/nis.inc b/meta-networking/recipes-support/nis/nis.inc index 075d2756d..eaff94961 100644 --- a/meta-networking/recipes-support/nis/nis.inc +++ b/meta-networking/recipes-support/nis/nis.inc | |||
@@ -7,7 +7,7 @@ DESCRIPTION = "NIS Server and Tools" | |||
7 | HOMEPAGE = "http://www.linux-nis.org/nis/" | 7 | HOMEPAGE = "http://www.linux-nis.org/nis/" |
8 | SECTION = "console/network" | 8 | SECTION = "console/network" |
9 | LICENSE = "GPL-2.0" | 9 | LICENSE = "GPL-2.0" |
10 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" | 10 | LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" |
11 | 11 | ||
12 | inherit autotools gettext pkgconfig | 12 | inherit autotools gettext pkgconfig |
13 | 13 | ||
diff --git a/meta-networking/recipes-support/nis/yp-tools_2.12.bb b/meta-networking/recipes-support/nis/yp-tools_2.14.bb index 001784550..8c6837bac 100644 --- a/meta-networking/recipes-support/nis/yp-tools_2.12.bb +++ b/meta-networking/recipes-support/nis/yp-tools_2.14.bb | |||
@@ -1,29 +1,32 @@ | |||
1 | # This package builds tools to manage NIS | 1 | # This package builds tools to manage NIS |
2 | # The source package is utils/net/NIS/yp-tools | 2 | # The source package is utils/net/NIS/yp-tools |
3 | # | 3 | # |
4 | PR = "r3" | 4 | require nis.inc |
5 | DESCRIPTION="\ | 5 | |
6 | SUMMARY = "NIS client programs" | ||
7 | DESCRIPTION = " \ | ||
6 | Network Information Service tools. \ | 8 | Network Information Service tools. \ |
7 | This package contains ypcat, ypmatch, ypset, \ | 9 | This package contains ypcat, ypmatch, ypset, \ |
8 | ypwhich, yppasswd, domainname, nisdomainname \ | 10 | ypwhich, yppasswd, domainname, nisdomainname \ |
9 | and ypdomainname." | 11 | and ypdomainname. \ |
12 | \ | ||
13 | This is the final IPv4-only version of yp-tools. \ | ||
14 | " | ||
10 | 15 | ||
11 | require nis.inc | ||
12 | SRC_URI = "http://www.linux-nis.org/download/yp-tools/${BP}.tar.bz2 \ | 16 | SRC_URI = "http://www.linux-nis.org/download/yp-tools/${BP}.tar.bz2 \ |
13 | file://domainname.service \ | 17 | file://domainname.service \ |
14 | " | 18 | " |
15 | 19 | SRC_URI[md5sum] = "ba1f121c17e3ad65368be173b977cd13" | |
16 | SRC_URI[md5sum] = "ce1e06d86caa285fa8cd76fdf103f51e" | 20 | SRC_URI[sha256sum] = "d01f70fadc643a55107a0edc47c6be99d0306bcc4f66df56f65e74238b0124c9" |
17 | SRC_URI[sha256sum] = "6ae8321666eea7837da343eea90ea30273fb74943ad111d5a4befd2afb252063" | ||
18 | |||
19 | CACHED_CONFIGUREVARS += "ac_cv_prog_STRIP=/bin/true" | ||
20 | 21 | ||
21 | inherit systemd | 22 | inherit systemd |
23 | SYSTEMD_SERVICE_${PN} = "domainname.service" | ||
22 | 24 | ||
23 | RPROVIDES_${PN} += "${PN}-systemd" | 25 | RPROVIDES_${PN} += "${PN}-systemd" |
24 | RREPLACES_${PN} += "${PN}-systemd" | 26 | RREPLACES_${PN} += "${PN}-systemd" |
25 | RCONFLICTS_${PN} += "${PN}-systemd" | 27 | RCONFLICTS_${PN} += "${PN}-systemd" |
26 | SYSTEMD_SERVICE_${PN} = "domainname.service" | 28 | |
29 | CACHED_CONFIGUREVARS += "ac_cv_prog_STRIP=/bin/true" | ||
27 | 30 | ||
28 | do_install_append() { | 31 | do_install_append() { |
29 | install -d ${D}${systemd_unitdir}/system | 32 | install -d ${D}${systemd_unitdir}/system |
diff --git a/meta-networking/recipes-support/nis/ypbind-mt_1.36.bb b/meta-networking/recipes-support/nis/ypbind-mt_1.38.bb index 35ef16a89..f7e6b43d9 100644 --- a/meta-networking/recipes-support/nis/ypbind-mt_1.36.bb +++ b/meta-networking/recipes-support/nis/ypbind-mt_1.38.bb | |||
@@ -1,8 +1,9 @@ | |||
1 | # This package builds the NIS ypbind daemon | 1 | # This package builds the NIS ypbind daemon |
2 | # The source package is utils/net/NIS/ypbind-mt | 2 | # The source package is utils/net/NIS/ypbind-mt |
3 | # | 3 | # |
4 | PR = "r3" | 4 | require nis.inc |
5 | DESCRIPTION="\ | 5 | |
6 | DESCRIPTION = " \ | ||
6 | Multithreaded NIS bind service (ypbind-mt). \ | 7 | Multithreaded NIS bind service (ypbind-mt). \ |
7 | ypbind-mt is a complete new implementation of a NIS \ | 8 | ypbind-mt is a complete new implementation of a NIS \ |
8 | binding daemon for Linux. It has the following \ | 9 | binding daemon for Linux. It has the following \ |
@@ -11,23 +12,28 @@ Uses threads for better response. Supports multiple \ | |||
11 | domain bindings. Supports /var/yp/binding/* file \ | 12 | domain bindings. Supports /var/yp/binding/* file \ |
12 | for Linux libc 4/5 and glibc 2.x. Supports a list \ | 13 | for Linux libc 4/5 and glibc 2.x. Supports a list \ |
13 | of known secure NIS server (/etc/yp.conf) Binds to \ | 14 | of known secure NIS server (/etc/yp.conf) Binds to \ |
14 | the server which answered as first." | 15 | the server which answered as first. \ |
15 | HOMEPAGE="http://www.linux-nis.org/nis/ypbind-mt/index.html" | 16 | \ |
16 | 17 | This is the final IPv4-only version of ypbind-mt. \ | |
17 | require nis.inc | 18 | " |
18 | 19 | HOMEPAGE = "http://www.linux-nis.org/nis/ypbind-mt/index.html" | |
19 | LIC_FILES_CHKSUM = "file://COPYING;md5=082c9a0886c7c3db1bc862b5b62ffe08" | 20 | DEPENDS = "yp-tools" |
21 | # ypbind-mt now provides all the functionality of ypbind | ||
22 | # and is used in place of it. | ||
23 | PROVIDES += "ypbind" | ||
20 | 24 | ||
21 | SRC_URI = "http://www.linux-nis.org/download/ypbind-mt/${BP}.tar.bz2 \ | 25 | SRC_URI = "http://www.linux-nis.org/download/ypbind-mt/${BP}.tar.bz2 \ |
22 | file://ypbind-yocto.init \ | 26 | file://ypbind-yocto.init \ |
23 | file://ypbind.service \ | 27 | file://ypbind.service \ |
24 | " | 28 | " |
25 | SRC_URI[md5sum] = "135834db97d78ff6d79fdee2810b4056" | 29 | SRC_URI[md5sum] = "094088c0e282fa7f3b3dd6cc51d0a4e1" |
26 | SRC_URI[sha256sum] = "0eff76c1849f4b38ea1a60280d8397c4240369c641fe5402ce57edf1a90958c7" | 30 | SRC_URI[sha256sum] = "1930ce19f6ccfe10400f3497b31867f71690d2bcd3f5b575199fa915559b7746" |
27 | 31 | ||
28 | # ypbind-mt now provides all the functionality of ypbind | 32 | inherit systemd update-rc.d |
29 | # and is used in place of it. | 33 | |
30 | PROVIDES += "ypbind" | 34 | SYSTEMD_SERVICE_${PN} = "ypbind.service" |
35 | INITSCRIPT_NAME = "ypbind" | ||
36 | INITSCRIPT_PARAMS = "start 44 3 5 . stop 70 0 1 2 6 ." | ||
31 | 37 | ||
32 | CACHED_CONFIGUREVARS = "ac_cv_prog_STRIP=/bin/true" | 38 | CACHED_CONFIGUREVARS = "ac_cv_prog_STRIP=/bin/true" |
33 | 39 | ||
@@ -37,16 +43,11 @@ do_install_append () { | |||
37 | 43 | ||
38 | install -m 0755 ${WORKDIR}/ypbind-yocto.init ${D}${sysconfdir}/init.d/ypbind | 44 | install -m 0755 ${WORKDIR}/ypbind-yocto.init ${D}${sysconfdir}/init.d/ypbind |
39 | 45 | ||
40 | # TODO, use update-rc.d | ||
41 | ln -s ../init.d/ypbind ${D}${sysconfdir}/rcS.d/S44ypbind | ||
42 | |||
43 | install -d ${D}${systemd_unitdir}/system | 46 | install -d ${D}${systemd_unitdir}/system |
44 | install -m 0644 ${WORKDIR}/ypbind.service ${D}${systemd_unitdir}/system | 47 | install -m 0644 ${WORKDIR}/ypbind.service ${D}${systemd_unitdir}/system |
45 | } | 48 | } |
46 | 49 | ||
47 | inherit systemd | ||
48 | 50 | ||
49 | RPROVIDES_${PN} += "${PN}-systemd" | 51 | RPROVIDES_${PN} += "${PN}-systemd" |
50 | RREPLACES_${PN} += "${PN}-systemd" | 52 | RREPLACES_${PN} += "${PN}-systemd" |
51 | RCONFLICTS_${PN} += "${PN}-systemd" | 53 | RCONFLICTS_${PN} += "${PN}-systemd" |
52 | SYSTEMD_SERVICE_${PN} = "ypbind.service" | ||