| 1 |
commit: 3d4a1abe1ccbc6d32dd6d860d0701c88bea83399 |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jul 22 19:30:47 2017 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jul 22 19:35:39 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d4a1abe |
| 7 |
|
| 8 |
net-nds/openldap: sed init script and systemd unit before install |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/625960 |
| 11 |
Package-Manager: Portage-2.3.6_p23, Repoman-2.3.3_p1 |
| 12 |
|
| 13 |
net-nds/openldap/openldap-2.4.44-r1.ebuild | 12 +++++------- |
| 14 |
net-nds/openldap/openldap-2.4.44.ebuild | 12 +++++------- |
| 15 |
net-nds/openldap/openldap-2.4.45.ebuild | 12 +++++------- |
| 16 |
3 files changed, 15 insertions(+), 21 deletions(-) |
| 17 |
|
| 18 |
diff --git a/net-nds/openldap/openldap-2.4.44-r1.ebuild b/net-nds/openldap/openldap-2.4.44-r1.ebuild |
| 19 |
index 23c66c3db53..9b5a6d372a1 100644 |
| 20 |
--- a/net-nds/openldap/openldap-2.4.44-r1.ebuild |
| 21 |
+++ b/net-nds/openldap/openldap-2.4.44-r1.ebuild |
| 22 |
@@ -716,18 +716,16 @@ multilib_src_install() { |
| 23 |
|
| 24 |
# install our own init scripts and systemd unit files |
| 25 |
einfo "Install init scripts" |
| 26 |
- newinitd "${FILESDIR}"/slapd-initd-2.4.40-r2 slapd |
| 27 |
+ sed -e "s,/usr/lib/,/usr/$(get_libdir)/," "${FILESDIR}"/slapd-initd-2.4.40-r2 > "${T}"/slapd || die |
| 28 |
+ doinitd "${T}"/slapd |
| 29 |
newconfd "${FILESDIR}"/slapd-confd-2.4.28-r1 slapd |
| 30 |
+ |
| 31 |
einfo "Install systemd service" |
| 32 |
- systemd_dounit "${FILESDIR}"/slapd.service |
| 33 |
+ sed -e "s,/usr/lib/,/usr/$(get_libdir)/," "${FILESDIR}"/slapd.service > "${T}"/slapd.service || die |
| 34 |
+ systemd_dounit "${T}"/slapd.service |
| 35 |
systemd_install_serviced "${FILESDIR}"/slapd.service.conf |
| 36 |
systemd_newtmpfilesd "${FILESDIR}"/slapd.tmpfilesd slapd.conf |
| 37 |
|
| 38 |
- if [[ $(get_libdir) != lib ]]; then |
| 39 |
- sed -e "s,/usr/lib/,/usr/$(get_libdir)/," -i \ |
| 40 |
- "${ED}"/etc/init.d/slapd \ |
| 41 |
- "${ED}"/usr/lib/systemd/system/slapd.service || die |
| 42 |
- fi |
| 43 |
# If built without SLP, we don't need to be before avahi |
| 44 |
use slp \ |
| 45 |
|| sed -i \ |
| 46 |
|
| 47 |
diff --git a/net-nds/openldap/openldap-2.4.44.ebuild b/net-nds/openldap/openldap-2.4.44.ebuild |
| 48 |
index ea8e84e9cf0..099049a509a 100644 |
| 49 |
--- a/net-nds/openldap/openldap-2.4.44.ebuild |
| 50 |
+++ b/net-nds/openldap/openldap-2.4.44.ebuild |
| 51 |
@@ -694,18 +694,16 @@ multilib_src_install() { |
| 52 |
|
| 53 |
# install our own init scripts and systemd unit files |
| 54 |
einfo "Install init scripts" |
| 55 |
- newinitd "${FILESDIR}"/slapd-initd-2.4.40-r2 slapd |
| 56 |
+ sed -e "s,/usr/lib/,/usr/$(get_libdir)/," "${FILESDIR}"/slapd-initd-2.4.40-r2 > "${T}"/slapd || die |
| 57 |
+ doinitd "${T}"/slapd |
| 58 |
newconfd "${FILESDIR}"/slapd-confd-2.4.28-r1 slapd |
| 59 |
+ |
| 60 |
einfo "Install systemd service" |
| 61 |
- systemd_dounit "${FILESDIR}"/slapd.service |
| 62 |
+ sed -e "s,/usr/lib/,/usr/$(get_libdir)/," "${FILESDIR}"/slapd.service > "${T}"/slapd.service || die |
| 63 |
+ systemd_dounit "${T}"/slapd.service |
| 64 |
systemd_install_serviced "${FILESDIR}"/slapd.service.conf |
| 65 |
systemd_newtmpfilesd "${FILESDIR}"/slapd.tmpfilesd slapd.conf |
| 66 |
|
| 67 |
- if [[ $(get_libdir) != lib ]]; then |
| 68 |
- sed -e "s,/usr/lib/,/usr/$(get_libdir)/," -i \ |
| 69 |
- "${ED}"/etc/init.d/slapd \ |
| 70 |
- "${ED}"/usr/lib/systemd/system/slapd.service || die |
| 71 |
- fi |
| 72 |
# If built without SLP, we don't need to be before avahi |
| 73 |
use slp \ |
| 74 |
|| sed -i \ |
| 75 |
|
| 76 |
diff --git a/net-nds/openldap/openldap-2.4.45.ebuild b/net-nds/openldap/openldap-2.4.45.ebuild |
| 77 |
index 0ead191e540..6d2ffdfb34d 100644 |
| 78 |
--- a/net-nds/openldap/openldap-2.4.45.ebuild |
| 79 |
+++ b/net-nds/openldap/openldap-2.4.45.ebuild |
| 80 |
@@ -748,18 +748,16 @@ multilib_src_install() { |
| 81 |
|
| 82 |
# install our own init scripts and systemd unit files |
| 83 |
einfo "Install init scripts" |
| 84 |
- newinitd "${FILESDIR}"/slapd-initd-2.4.40-r2 slapd |
| 85 |
+ sed -e "s,/usr/lib/,/usr/$(get_libdir)/," "${FILESDIR}"/slapd-initd-2.4.40-r2 > "${T}"/slapd || die |
| 86 |
+ doinitd "${T}"/slapd |
| 87 |
newconfd "${FILESDIR}"/slapd-confd-2.4.28-r1 slapd |
| 88 |
+ |
| 89 |
einfo "Install systemd service" |
| 90 |
- systemd_dounit "${FILESDIR}"/slapd.service |
| 91 |
+ sed -e "s,/usr/lib/,/usr/$(get_libdir)/," "${FILESDIR}"/slapd.service > "${T}"/slapd.service || die |
| 92 |
+ systemd_dounit "${T}"/slapd.service |
| 93 |
systemd_install_serviced "${FILESDIR}"/slapd.service.conf |
| 94 |
systemd_newtmpfilesd "${FILESDIR}"/slapd.tmpfilesd slapd.conf |
| 95 |
|
| 96 |
- if [[ $(get_libdir) != lib ]]; then |
| 97 |
- sed -e "s,/usr/lib/,/usr/$(get_libdir)/," -i \ |
| 98 |
- "${ED}"/etc/init.d/slapd \ |
| 99 |
- "${ED}"/usr/lib/systemd/system/slapd.service || die |
| 100 |
- fi |
| 101 |
# If built without SLP, we don't need to be before avahi |
| 102 |
use slp \ |
| 103 |
|| sed -i \ |
Archives