haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-09 05:10:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

openldap, bump version, make 2.6* default, disect/fix 2.4* (#9260)

Browse Source
This commit is contained in:
Schrijvers Luc
2023-08-23 10:39:10 +00:00
committed by GitHub
parent 8bc2ba730c
commit 709d91594b
2 changed files with 20 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
net-nds/openldap/openldap2.6-2.6.4.recipe → net-nds/openldap/openldap-2.6.6.recipe
View File

@@ -9,8 +9,7 @@ HOMEPAGE="https://www.openldap.org/"
LICENSE="OpenLDAP Public License"
REVISION="1"
SOURCE_URI="ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-$portVersion.tgz"
CHECKSUM_SHA256="d51704e50178430c06cf3d8aa174da66badf559747a47d920bb54b2d4aa40991"
SOURCE_DIR="openldap-$portVersion"
CHECKSUM_SHA256="082e998cf542984d43634442dbe11da860759e510907152ea579bdc42fe39ea0"
ARCHITECTURES="all !x86_gcc2"
SECONDARY_ARCHITECTURES="x86"
@@ -32,7 +31,7 @@ USER_SETTINGS_FILES="
"
PROVIDES="
openldap2.6$secondaryArchSuffix = $portVersion
openldap$secondaryArchSuffix = $portVersion
lib:liblber$secondaryArchSuffix = $libVersionCompat
lib:libldap$secondaryArchSuffix = $libVersionCompat
"
@@ -41,9 +40,12 @@ REQUIRES="
lib:libcrypto$secondaryArchSuffix
lib:libssl$secondaryArchSuffix
"
REPLACES="
openldap2.6$secondaryArchSuffix
"
PROVIDES_tools="
openldap2.6${secondaryArchSuffix}_tools = $portVersion
openldap${secondaryArchSuffix}_tools = $portVersion
cmd:ldapadd$commandSuffix
cmd:ldapcompare$commandSuffix
cmd:ldapdelete$commandSuffix
@@ -57,25 +59,19 @@ PROVIDES_tools="
cmd:ldapwhoami$commandSuffix
"
REQUIRES_tools="
openldap2.6$secondaryArchSuffix == $portVersion base
openldap$secondaryArchSuffix == $portVersion base
haiku$secondaryArchSuffix
lib:libcrypto$secondaryArchSuffix
lib:libssl$secondaryArchSuffix
"
CONFLICTS_tools="
openldap
"
PROVIDES_devel="
openldap2.6${secondaryArchSuffix}_devel = $portVersion
openldap${secondaryArchSuffix}_devel = $portVersion
devel:liblber$secondaryArchSuffix = $libVersionCompat
devel:libldap$secondaryArchSuffix = $libVersionCompat
"
REQUIRES_devel="
openldap2.6$secondaryArchSuffix == $portVersion base
"
CONFLICTS_devel="
openldap${secondaryArchSuffix}_devel
openldap$secondaryArchSuffix == $portVersion base
"
BUILD_REQUIRES="
@@ -94,7 +90,7 @@ BUILD_PREREQUIRES="
cmd:soelim
"
defineDebugInfoPackage openldap2.6$secondaryArchSuffix \
defineDebugInfoPackage openldap$secondaryArchSuffix \
"$libDir"/liblber.so.$libVersion \
"$libDir"/libldap.so.$libVersion

53
net-nds/openldap/openldap-2.4.48.recipe → net-nds/openldap/openldap2.4-2.4.48.recipe
View File

@@ -10,6 +10,7 @@ LICENSE="OpenLDAP Public License"
REVISION="2"
SOURCE_URI="ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-$portVersion.tgz"
CHECKSUM_SHA256="d9523ffcab5cd14b709fcf3cb4d04e8bc76bb8970113255f372bc74954c6074d"
SOURCE_DIR="openldap-$portVersion"
ARCHITECTURES="all"
SECONDARY_ARCHITECTURES="x86_gcc2 x86"
@@ -24,48 +25,17 @@ USER_SETTINGS_FILES="
"
PROVIDES="
openldap$secondaryArchSuffix = $portVersion
lib:liblber$secondaryArchSuffix = $libVersionCompat
openldap2.4$secondaryArchSuffix = $portVersion
lib:liblber_$portVers$secondaryArchSuffix = $libVersionCompat
lib:libldap$secondaryArchSuffix = $libVersionCompat
lib:libldap_$portVers$secondaryArchSuffix = $libVersionCompat
lib:libldap_r$secondaryArchSuffix = $libVersionCompat
lib:libldap_r_$portVers$secondaryArchSuffix = $libVersionCompat
"
if [ -z "$secondaryArchSuffix" ]; then
PROVIDES="$PROVIDES
cmd:ldapadd
cmd:ldapcompare
cmd:ldapdelete
cmd:ldapexop
cmd:ldapmodify
cmd:ldapmodrdn
cmd:ldappasswd
cmd:ldapsearch
cmd:ldapurl
cmd:ldapwhoami
"
fi
REQUIRES="
haiku$secondaryArchSuffix
lib:libcrypto$secondaryArchSuffix
lib:libssl$secondaryArchSuffix
"
PROVIDES_devel="
openldap${secondaryArchSuffix}_devel = $portVersion
devel:liblber$secondaryArchSuffix = $libVersionCompat
devel:liblber_$portVers$secondaryArchSuffix = $libVersionCompat
devel:libldap$secondaryArchSuffix = $libVersionCompat
devel:libldap_$portVers$secondaryArchSuffix = $libVersionCompat
devel:libldap_r$secondaryArchSuffix = $libVersionCompat
devel:libldap_r_$portVers$secondaryArchSuffix = $libVersionCompat
"
REQUIRES_devel="
openldap$secondaryArchSuffix == $portVersion base
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
devel:libcrypto$secondaryArchSuffix
@@ -81,7 +51,7 @@ BUILD_PREREQUIRES="
cmd:soelim
"
defineDebugInfoPackage openldap$secondaryArchSuffix \
defineDebugInfoPackage openldap2.4$secondaryArchSuffix \
"$libDir"/liblber-$portVers.so.$libVersion \
"$libDir"/libldap-$portVers.so.$libVersion \
"$libDir"/libldap_r-$portVers.so.$libVersion
@@ -97,12 +67,15 @@ PATCH()
BUILD()
{
# TODO: openldap uses it's own variation of autotools
mv Makefile.in Makefile.am
touch AUTHORS ChangeLog NEWS
libtoolize --force --copy --install
aclocal
autoconf
runConfigure ./configure --enable-slapd=no --with-tls=openssl
automake --add-missing
runConfigure ./configure --enable-slapd=no --with-tls=openssl --disable-static
make $jobArgs depend
make $jobArgs
make
}
INSTALL()
@@ -122,14 +95,8 @@ INSTALL()
mkdir -p $dataDir/openldap
mv $settingsDir/openldap/ldap.conf.default $dataDir/openldap/
if [ -z "$secondaryArchSuffix" ]; then
# On primary architectures: move man3 to devel package
packageEntries devel $developDir $documentationDir/man/man3
else
# On secondary architectures: delete binDir and documentationDir
rm -rf $binDir $documentationDir
packageEntries devel $developDir
fi
# Cleanup, only provide these in the openldap packages
rm -rf $binDir $developDir $documentationDir
}
TEST()