gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-08-24 18:58:08 -07:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/anomaly256/389-ds-base'

Browse Source 
https://github.com/gentoo/gentoo/pull/950
l be ignored, and an empty message aborts
This commit is contained in:
Ian Delaney
2016-03-01 12:28:51 +08:00
parent c56f3a735a ac490c25de
commit 010d05b514
6 changed files with 11 additions and 369 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
net-nds/389-ds-base/389-ds-base-1.3.4.7-r2.ebuild → net-nds/389-ds-base/389-ds-base-1.3.4.8.ebuild
View File

@@ -5,22 +5,22 @@
EAPI=5
WANT_AUTOMAKE="1.9"
MY_P=${P/_alpha/.a}
MY_P=${MY_P/_rc/.rc}
inherit user eutils multilib flag-o-matic autotools
DESCRIPTION="389 Directory Server (core librares and daemons )"
HOMEPAGE="http://port389.org/"
SRC_URI="http://directory.fedoraproject.org/sources/${MY_P}.tar.bz2"
SRC_URI="http://directory.fedoraproject.org/sources/${P}.tar.bz2"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="autobind auto-dn-suffix debug doc +pam-passthru +dna +ldapi +bitwise +presence kerberos selinux"
# Pinned to db:4.8 as it is the current stable, can change to a later db version < 6 when they stabilize.
# The --with-db-inc line in econf will need to be updated as well when changing db version.
COMMON_DEPEND="
sys-libs/db:5.3
sys-libs/db:4.8
>=dev-libs/cyrus-sasl-2.1.19
>=net-analyzer/net-snmp-5.1.2
>=dev-libs/icu-3.4:=
@@ -46,8 +46,6 @@ RDEPEND="${COMMON_DEPEND}
virtual/perl-Time-Local
virtual/perl-MIME-Base64"
S="${WORKDIR}/${MY_P}"
pkg_setup() {
enewgroup dirsrv
enewuser dirsrv -1 -1 -1 dirsrv
@@ -55,10 +53,7 @@ pkg_setup() {
src_prepare() {
#0001-Ticket-47840-add-configure-option-to-disable-instanc.patch
epatch "${FILESDIR}/${P}-no-instance-script.patch"
#0001-Ticket-48448-dirsrv-start-stop-fail-in-certain-shell.patch
epatch "${FILESDIR}/${P}-shell-corrections.patch"
epatch "${FILESDIR}/389-ds-base-1.3.4-no-instance-script.patch"
# as per 389 documentation, when 64bit, export USE_64
use amd64 && export USE_64=1
@@ -71,11 +66,9 @@ src_prepare() {
}
src_configure() {
local myconf=""
use auto-dn-suffix && myconf="${myconf} --enable-auto-dn-suffix"
# for 1.3.5.X, will add --enable-gcc-security
# for 1.3.5.X, will add --enable-gcc-security.
# auto-dn-suffix currently throws warning in configure script,
# see https://fedorahosted.org/389/ticket/48710
econf \
$(use_enable debug) \
$(use_enable pam-passthru) \
@@ -86,17 +79,14 @@ src_configure() {
$(use_enable presence) \
$(use_with kerberos) \
$(use_enable debug) \
$(use_enable auto-dn-suffix) \
--enable-maintainer-mode \
--enable-autobind \
--with-fhs \
--with-openldap \
--with-db-inc=/usr/include/${CHOST}/db5.3/ \
--sbindir=/usr/sbin \
--bindir=/usr/bin \
$myconf
--with-db-inc=/usr/include/db4.8
# This relies on bug https://fedorahosted.org/389/ticket/48447
#--without-initddir \
}
src_compile() {

2
net-nds/389-ds-base/Manifest
View File

@@ -1 +1 @@
DIST 389-ds-base-1.3.4.7.tar.bz2 3397520 SHA256 08dae55ed0732e8d316bb65910c74ee913fc215c3436299239e362a3670e76e6 SHA512 02159ce8e9d1e5797d6d6952202b430429bf750179279348430333f7a4b557e305a2041a1e4e7ffe652d34825c9678d3fbf8a3eaea401f257bd922034dbce875 WHIRLPOOL 97af90f6b3f01a2a11e236f1141d1851016711f69b618f2e3122715e8575541040aa09c03f66f7a20cca9e2136bb2d3612c8fcec16b616f981dba39c4f449453
DIST 389-ds-base-1.3.4.8.tar.bz2 3396105 SHA256 a00468afcfa50de375f921a827a04dd53b6a11b632982bb0db98cafca509e701 SHA512 ac85223cb38d4cebb3ff61b23e3c0312b0cd30a0c6bf0d9644842c6ecfbc9379ea4a639c80b3e78a13a67f273342fec78e9ecf4672cc72e289d72d74c2fa0d8f WHIRLPOOL 4c7645be5b70c108ef437aaf6d50293a99fa6a552c859f649904c6974c8830e5bf96286a0f998c5d187c1f66f3e0922bbe1e756889e6b0a33e8d9db56f0aa005

28
net-nds/389-ds-base/files/389-ds-base-1.2.11-fix-mozldap.patch
View File

@@ -1,28 +0,0 @@
commit f5bd0ed47523b39aedb6bcc1f9c0754371159a77
Author: Rich Megginson <rmeggins at redhat.com>
Date: Fri Sep 14 09:20:18 2012 -0600
Ticket #461 - fix build problem with mozldap c sdk
https://fedorahosted.org/389/ticket/461
Reviewed by: rmeggins
Fixed by: cgrzemba
Branch: master
Fix Description: mozldap does not define LDAP_MOD_OP so define it
Platforms tested: RHEL6 x86_64
Flag Day: no
Doc impact: no
diff --git a/ldap/servers/slapd/pw.c b/ldap/servers/slapd/pw.c
index bfd48b1..4736e82 100644
--- a/ldap/servers/slapd/pw.c
+++ b/ldap/servers/slapd/pw.c
@@ -61,6 +61,9 @@
#if defined( _WIN32 )
#undef LDAPDebug
#endif /* _WIN32 */
+#if defined( USE_MOZLDAP )
+#define LDAP_MOD_OP (0x0007)
+#endif /* USE_MOZLDAP */
#include "slap.h"

0
net-nds/389-ds-base/files/389-ds-base-1.3.4.7-no-instance-script.patch → net-nds/389-ds-base/files/389-ds-base-1.3.4-no-instance-script.patch
View File

242
net-nds/389-ds-base/files/389-ds-base-1.3.4.7-shell-corrections.patch
View File

@@ -1,242 +0,0 @@
From 340cdd3c9648c4b35ef95cc0498413b763e71859 Mon Sep 17 00:00:00 2001
From: William Brown <firstyear@redhat.com>
Date: Sun, 31 Jan 2016 14:27:13 +1000
Subject: [PATCH] Ticket 48448 - dirsrv start-stop fail in certain shell
environments.
Bug Description: Dirsrv fails to start and stop with certain shell environments
. This is due to the usage of the pattern
cd $SERVERBIN_DIR
./ns-slapd ...
Fix Description: Change all invocations of commands to use explicit paths:
$SERVERBIN_DIR/ns-slapd
https://fedorahosted.org/389/ticket/48448
Author: wibrown
Review by: ???
---
ldap/admin/src/scripts/start-dirsrv.in | 2 +-
ldap/admin/src/scripts/template-bak2db.in | 3 +--
ldap/admin/src/scripts/template-db2bak.in | 5 ++---
ldap/admin/src/scripts/template-db2index.in | 5 ++---
ldap/admin/src/scripts/template-db2ldif.in | 3 +--
ldap/admin/src/scripts/template-dbverify.in | 5 ++---
ldap/admin/src/scripts/template-dn2rdn.in | 5 ++---
ldap/admin/src/scripts/template-ldif2db.in | 3 +--
ldap/admin/src/scripts/template-ldif2ldap.in | 5 ++---
ldap/admin/src/scripts/template-monitor.in | 5 ++---
ldap/admin/src/scripts/template-restoreconfig.in | 5 ++---
ldap/admin/src/scripts/template-saveconfig.in | 5 ++---
ldap/admin/src/scripts/template-suffix2instance.in | 5 ++---
ldap/admin/src/scripts/template-upgradedb.in | 3 +--
ldap/admin/src/scripts/template-upgradednformat.in | 5 ++---
ldap/admin/src/scripts/template-vlvindex.in | 3 +--
16 files changed, 26 insertions(+), 41 deletions(-)
diff --git a/ldap/admin/src/scripts/start-dirsrv.in b/ldap/admin/src/scripts/start-dirsrv.in
index 458f0e8..513addb 100755
--- a/ldap/admin/src/scripts/start-dirsrv.in
+++ b/ldap/admin/src/scripts/start-dirsrv.in
@@ -70,7 +70,7 @@ start_instance() {
return 1
fi
else
- cd $SERVERBIN_DIR; ./ns-slapd -D $CONFIG_DIR -i $PIDFILE -w $STARTPIDFILE "$@"
+ $SERVERBIN_DIR/ns-slapd -D $CONFIG_DIR -i $PIDFILE -w $STARTPIDFILE "$@"
if [ $? -ne 0 ]; then
return 1
fi
diff --git a/ldap/admin/src/scripts/template-bak2db.in b/ldap/admin/src/scripts/template-bak2db.in
index 1725aba..01a12fa 100755
--- a/ldap/admin/src/scripts/template-bak2db.in
+++ b/ldap/admin/src/scripts/template-bak2db.in
@@ -1,5 +1,4 @@
#!/bin/sh
-cd {{SERVERBIN-DIR}}
-./bak2db "$@" -Z {{SERV-ID}}
+{{SERVERBIN-DIR}}/bak2db "$@" -Z {{SERV-ID}}
exit $?
diff --git a/ldap/admin/src/scripts/template-db2bak.in b/ldap/admin/src/scripts/template-db2bak.in
index 50fd5ed..70a4a2b 100755
--- a/ldap/admin/src/scripts/template-db2bak.in
+++ b/ldap/admin/src/scripts/template-db2bak.in
@@ -1,5 +1,4 @@
#!/bin/sh
-cd {{SERVERBIN-DIR}}
-./db2bak "$@" -Z {{SERV-ID}}
-exit $?
\ No newline at end of file
+{{SERVERBIN-DIR}}/db2bak "$@" -Z {{SERV-ID}}
+exit $?
diff --git a/ldap/admin/src/scripts/template-db2index.in b/ldap/admin/src/scripts/template-db2index.in
index a7a633d..9c7c5ec 100755
--- a/ldap/admin/src/scripts/template-db2index.in
+++ b/ldap/admin/src/scripts/template-db2index.in
@@ -1,5 +1,4 @@
#!/bin/sh
-cd {{SERVERBIN-DIR}}
-./db2index "$@" -Z {{SERV-ID}}
-exit $?
\ No newline at end of file
+{{SERVERBIN-DIR}}/db2index "$@" -Z {{SERV-ID}}
+exit $?
diff --git a/ldap/admin/src/scripts/template-db2ldif.in b/ldap/admin/src/scripts/template-db2ldif.in
index b85ffdc..3881911 100755
--- a/ldap/admin/src/scripts/template-db2ldif.in
+++ b/ldap/admin/src/scripts/template-db2ldif.in
@@ -1,6 +1,5 @@
#!/bin/sh
cwd=`pwd`
-cd {{SERVERBIN-DIR}}
-./db2ldif "$@" -Z {{SERV-ID}} -c $cwd
+{{SERVERBIN-DIR}}/db2ldif "$@" -Z {{SERV-ID}} -c $cwd
exit $?
diff --git a/ldap/admin/src/scripts/template-dbverify.in b/ldap/admin/src/scripts/template-dbverify.in
index 71e3e4e..abcc58e 100755
--- a/ldap/admin/src/scripts/template-dbverify.in
+++ b/ldap/admin/src/scripts/template-dbverify.in
@@ -1,5 +1,4 @@
#!/bin/sh
-cd {{SERVERBIN-DIR}}
-./dbverify "$@" -Z {{SERV-ID}}
-exit $?
\ No newline at end of file
+{{SERVERBIN-DIR}}/dbverify "$@" -Z {{SERV-ID}}
+exit $?
diff --git a/ldap/admin/src/scripts/template-dn2rdn.in b/ldap/admin/src/scripts/template-dn2rdn.in
index b3d8e82..9ecae08 100755
--- a/ldap/admin/src/scripts/template-dn2rdn.in
+++ b/ldap/admin/src/scripts/template-dn2rdn.in
@@ -1,5 +1,4 @@
#!/bin/sh
-cd {{SERVERBIN-DIR}}
-./dn2rdn "$@" -Z {{SERV-ID}}
-exit $?
\ No newline at end of file
+{{SERVERBIN-DIR}}/dn2rdn "$@" -Z {{SERV-ID}}
+exit $?
diff --git a/ldap/admin/src/scripts/template-ldif2db.in b/ldap/admin/src/scripts/template-ldif2db.in
index f3fa58e..f38fce3 100755
--- a/ldap/admin/src/scripts/template-ldif2db.in
+++ b/ldap/admin/src/scripts/template-ldif2db.in
@@ -1,5 +1,4 @@
#!/bin/sh
-cd {{SERVERBIN-DIR}}
-./ldif2db "$@" -Z {{SERV-ID}}
+{{SERVERBIN-DIR}}/ldif2db "$@" -Z {{SERV-ID}}
exit $?
diff --git a/ldap/admin/src/scripts/template-ldif2ldap.in b/ldap/admin/src/scripts/template-ldif2ldap.in
index 806ddcc..c785742 100755
--- a/ldap/admin/src/scripts/template-ldif2ldap.in
+++ b/ldap/admin/src/scripts/template-ldif2ldap.in
@@ -1,5 +1,4 @@
#!/bin/sh
-cd {{SERVERBIN-DIR}}
-./ldif2ldap "$@" -Z {{SERV-ID}}
-exit $?
\ No newline at end of file
+{{SERVERBIN-DIR}}/ldif2ldap "$@" -Z {{SERV-ID}}
+exit $?
diff --git a/ldap/admin/src/scripts/template-monitor.in b/ldap/admin/src/scripts/template-monitor.in
index 2f93337..c89bb8a 100755
--- a/ldap/admin/src/scripts/template-monitor.in
+++ b/ldap/admin/src/scripts/template-monitor.in
@@ -1,5 +1,4 @@
#!/bin/sh
-cd {{SERVERBIN-DIR}}
-./monitor "$@" -Z {{SERV-ID}}
-exit $?
\ No newline at end of file
+{{SERVERBIN-DIR}}/monitor "$@" -Z {{SERV-ID}}
+exit $?
diff --git a/ldap/admin/src/scripts/template-restoreconfig.in b/ldap/admin/src/scripts/template-restoreconfig.in
index f4b2d06..5109561 100755
--- a/ldap/admin/src/scripts/template-restoreconfig.in
+++ b/ldap/admin/src/scripts/template-restoreconfig.in
@@ -1,5 +1,4 @@
#!/bin/sh
-cd {{SERVERBIN-DIR}}
-./restoreconfig "$@" -Z {{SERV-ID}}
-exit $?
\ No newline at end of file
+{{SERVERBIN-DIR}}/restoreconfig "$@" -Z {{SERV-ID}}
+exit $?
diff --git a/ldap/admin/src/scripts/template-saveconfig.in b/ldap/admin/src/scripts/template-saveconfig.in
index c77cce1..7784e83 100755
--- a/ldap/admin/src/scripts/template-saveconfig.in
+++ b/ldap/admin/src/scripts/template-saveconfig.in
@@ -1,5 +1,4 @@
#!/bin/sh
-cd {{SERVERBIN-DIR}}
-./saveconfig "$@" -Z {{SERV-ID}}
-exit $?
\ No newline at end of file
+{{SERVERBIN-DIR}}/saveconfig "$@" -Z {{SERV-ID}}
+exit $?
diff --git a/ldap/admin/src/scripts/template-suffix2instance.in b/ldap/admin/src/scripts/template-suffix2instance.in
index 03bcba8..e29408d 100755
--- a/ldap/admin/src/scripts/template-suffix2instance.in
+++ b/ldap/admin/src/scripts/template-suffix2instance.in
@@ -1,5 +1,4 @@
#!/bin/sh
-cd {{SERVERBIN-DIR}}
-./suffix2instance "$@" -Z {{SERV-ID}}
-exit $?
\ No newline at end of file
+{{SERVERBIN-DIR}}/suffix2instance "$@" -Z {{SERV-ID}}
+exit $?
diff --git a/ldap/admin/src/scripts/template-upgradedb.in b/ldap/admin/src/scripts/template-upgradedb.in
index ce879bb..ae28ac2 100755
--- a/ldap/admin/src/scripts/template-upgradedb.in
+++ b/ldap/admin/src/scripts/template-upgradedb.in
@@ -1,5 +1,4 @@
#!/bin/sh
-cd {{SERVERBIN-DIR}}
-./upgradedb "$@" -Z {{SERV-ID}}
+{{SERVERBIN-DIR}}/upgradedb "$@" -Z {{SERV-ID}}
exit $?
diff --git a/ldap/admin/src/scripts/template-upgradednformat.in b/ldap/admin/src/scripts/template-upgradednformat.in
index 5fd8ef9..74c18e8 100755
--- a/ldap/admin/src/scripts/template-upgradednformat.in
+++ b/ldap/admin/src/scripts/template-upgradednformat.in
@@ -1,5 +1,4 @@
#!/bin/sh
-cd {{SERVERBIN-DIR}}
-./upgradednformat "$@" -Z {{SERV-ID}}
-exit $?
\ No newline at end of file
+{{SERVERBIN-DIR}}/upgradednformat "$@" -Z {{SERV-ID}}
+exit $?
diff --git a/ldap/admin/src/scripts/template-vlvindex.in b/ldap/admin/src/scripts/template-vlvindex.in
index 0249696..a7ffb40 100755
--- a/ldap/admin/src/scripts/template-vlvindex.in
+++ b/ldap/admin/src/scripts/template-vlvindex.in
@@ -1,5 +1,4 @@
#!/bin/sh
-cd {{SERVERBIN-DIR}}
-./vlvindex "$@" -Z {{SERV-ID}}
+{{SERVERBIN-DIR}}/vlvindex "$@" -Z {{SERV-ID}}
exit $?
--
2.5.0

78
net-nds/389-ds-base/files/389-ds.initd
View File

@@ -1,78 +0,0 @@
#!/sbin/runscript
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
DIRSRV_EXEC="/usr/sbin/ns-slapd"
PID_DIRECTORY="/var/run/dirsrv"
DIRSRV_CONF_DIR="/etc/dirsrv"
DS_INSTANCES=${DIRSRV_CONF_DIR}/slapd-*
F389DS_INSTANCES=""
depend() {
need net logger
use dns
provide dirsvr ldap
}
checkconfig() {
if [ -z "${DS_INSTANCES}" ]; then
eerror "389 Directory Server has not been configured."
eend 1
return 1
fi
}
start() {
checkconfig || return 1
for instance in ${DS_INSTANCES}; do
instance=$(basename ${instance})
# skip .removed instances, bug #338133
if [ "${instance%%.removed}" != "${instance}" ]; then
continue
fi
ebegin "Starting 389 Directory Server: instance ${instance}"
start-stop-daemon --start --quiet -m \
--pidfile ${PID_DIRECTORY}/${instance}.startpid \
--exec ${DIRSRV_EXEC} -- -D ${DIRSRV_CONF_DIR}/${instance} \
-i ${PID_DIRECTORY}/${instance}.pid \
-w ${PID_DIRECTORY}/${instance}.startpid
sts=${?}
eend ${sts}
if [ "${sts}" != "0" ]; then
return 1
fi
done
}
stop() {
checkconfig || return 1
for instance in ${DS_INSTANCES}; do
instance=$(basename ${instance})
ebegin "Stopping 389 Directory Server: instance ${instance}"
start-stop-daemon --stop --quiet \
--pidfile ${PID_DIRECTORY}/${instance}.pid \
--exec ${DIRSRV_EXEC}
eend ${?}
done
}
status() {
for instance in ${DS_INSTANCES}; do
instance=$(basename ${instance})
if [ -e ${PID_DIRECTORY}/${instance}.pid ]; then
pid=$(cat ${PID_DIRECTORY}/${instance}.pid)
if [ $(echo "$pid" | grep -c $pid) -ge 1 ]; then
einfo "389 Directory Server: instance ${instance} (pid $pid) running."
else
ewarn "389 Directory Server: instance ${instance} (pid $pid) NOT running."
fi
else
eerror "389 Directory Server: instance ${instance} is NOT running."
fi
done
}