From e33fcca048c0ebb72902711c8561e11205e48545 Mon Sep 17 00:00:00 2001 From: Mario Fetka Date: Wed, 1 Oct 2014 15:50:37 +0200 Subject: [PATCH] redisgest --- net-nds/netiq-ndscommon/Manifest | 2 +- .../netiq-ndscommon-8.8.8.1.ebuild | 2 +- net-nds/netiq-ndsserv/Manifest | 9 +- net-nds/netiq-ndsserv/files/ndsd88.confd | 2 +- net-nds/netiq-ndsserv/files/nldap88.initd | 139 ------------------ .../netiq-ndsserv-8.8.8.1.ebuild | 4 +- 6 files changed, 12 insertions(+), 146 deletions(-) delete mode 100755 net-nds/netiq-ndsserv/files/nldap88.initd diff --git a/net-nds/netiq-ndscommon/Manifest b/net-nds/netiq-ndscommon/Manifest index 19c9c133..00d72825 100644 --- a/net-nds/netiq-ndscommon/Manifest +++ b/net-nds/netiq-ndscommon/Manifest @@ -1,4 +1,4 @@ DIST eDirectory_88SP8_Linux_x86_64.tar.gz 115981881 SHA256 69946393b9f6cd82593eb943a62bc6773688239de1b12388765ea2b60f0431c9 SHA512 e8030463f4404aeb33e9b4b85f4da91275ff8beebf480cb8a267e6340a7209f10aef2f060b0c24f7fb18ba457fd3211b6c71748b281888ca46919d1df227b627 WHIRLPOOL 603ef881ba4a7c84d1e670b5a39205a54f56daacd8253d09017209b204f15fc06397e764e4d7a2aac69e3c88c13bf3ef5882d4837382fc6e6d2c2e4caa797449 -EBUILD netiq-ndscommon-8.8.8.1.ebuild 2115 SHA256 37ba1ac4c6c779c532aaff79449564b32b1f237a823c1b369d8b8e14649e584b SHA512 f7166e47a248d21c94a4bbddd480fd29c4e8207ab01dafe5a3675e0039c74c2244f78baefe379388aed81f5f0e8a4def132feabaa80df1141328bcaf21ad53e0 WHIRLPOOL 5b61798d334bf6168b78799421d0bc8be9253c927475cdf666151648b1363ffc0c3776ea4f8c04328fd6e689c20ffb6566584bf18922220fd0215f701f7bce32 +EBUILD netiq-ndscommon-8.8.8.1.ebuild 1929 SHA256 80ca9dcf53c33702fe6edb9899653a3da4b7feaf166598383f4432535d043829 SHA512 92ccb2963c637907ae4b8dd7e32322ca01fd47f5c373e61cb1e354fec35c917afbe83765a704b18b66a891d94c0d859b790a4358ce22838097cddb8ff6cb6a5e WHIRLPOOL 4ede9bb42d013322b10549a75b0432c47c5c1fc8f0cf8efe244c05a24fc3b56a47e3685283f72e0949d947e5f802b3e0c005349108940d64953f240c1480e778 MISC ChangeLog 3307 SHA256 cf161b5efec858e5cdd4650365de88cf845ffe98a66b886cc80bcfddad1ff89e SHA512 d1f2886b16a10d9a1d8ead20d6a167481e58ad153c6a0fafc5d392bf197f61a9e34797c48616ed2d3946343f89ce85e4529c393ede5074078dd77d7ba41a5dac WHIRLPOOL 5fdf095a0811a505659e4dba82cfbe239aa8f09f7a9d2c0730020e7dd37ef5efe661a9de18943ace864d4ee01b452493f715d9355a42b3e595d25680efe5e691 MISC metadata.xml 226 SHA256 a9d3f7df2362a9a7ddcbe05c5d97d726eeb4bab135b21643508149a08bf6a2b2 SHA512 5912920d8f6e9ee5126fb0aaa5717a562feb009cc59b759c6a6eaa909900b19e95e51e3aa7f32fdf2e77073b19878830b97947148e3adeff3b49e7555cfe29e9 WHIRLPOOL c07e2ddb648893f1e9c422e07b0b73a6d0f7e1c9501200b6fcc9d25fe68c3b05fe4f3523e6844067eeca6969973a44004e1ba8a6fa725591a1916648bd2d4834 diff --git a/net-nds/netiq-ndscommon/netiq-ndscommon-8.8.8.1.ebuild b/net-nds/netiq-ndscommon/netiq-ndscommon-8.8.8.1.ebuild index 23cca280..61ff1371 100644 --- a/net-nds/netiq-ndscommon/netiq-ndscommon-8.8.8.1.ebuild +++ b/net-nds/netiq-ndscommon/netiq-ndscommon-8.8.8.1.ebuild @@ -14,7 +14,7 @@ inherit novell eutils rpm java-utils-2 versionator MY_PVV=$(replace_version_separator 3 '-') MY_PV="${MY_PVV/_p/_}" -DESCRIPTION="Common Install DESCRIPTION="Common Install DESCRIPTION="Common Install DESCRIPTION="This package contains the common man pages of NetIQ eDirectory" Configuration for NDS components" Configuration for NDS components" Configuration for NDS components" +DESCRIPTION="This package contains the common man pages of NetIQ eDirectory" HOMEPAGE="http://www.netiq.com/" SRC_URI="http://${NOVELL_ACCOUNT_USERNAME}:${NOVELL_ACCOUNT_PASSWORD}@cdn.novell.com/prot/${NOVELL_BUILDID}/${NOVELL_FILE}" diff --git a/net-nds/netiq-ndsserv/Manifest b/net-nds/netiq-ndsserv/Manifest index 9561df56..ec6c9d9f 100644 --- a/net-nds/netiq-ndsserv/Manifest +++ b/net-nds/netiq-ndsserv/Manifest @@ -1,8 +1,11 @@ -AUX ndsd88.confd 73 SHA256 154130939103d63e338312eaadd965df5ff66c737c2c54c5713d4e0a3536c761 SHA512 43542858fff98fe5d750bd95c7a85d332dcb10bf0bdf19f4883eb41e2855f704156e9c2a8208e7152ef823a83c7dbbb4097c9a404ff5065239e72de22cf70189 WHIRLPOOL 2d0b4ab93978c98aff93bebb404c2b6bfadf2a781f0a0ba4ea38df635203d7e9e381a949604a6c35a374adc1bae2806b7bd23b60755e3ed6fe8a0b14ce2bc131 +AUX ndsd88.confd 68 SHA256 692e648a0656dd763b2bc97e081102e2947579eaabf9cdfa1fcf724d3d8a711e SHA512 47a4198527609f854502c1694394741cf2778f1ad56c006a19ec0dda23bf66beda9d10a7739a9d5482ca0e4459c4631e8bfbd3873d0503e48e589b8fff3057a7 WHIRLPOOL 95beb3b25cc105962e3d3fa56f7b88888c71bb0f2f10b36787b72919136877f85d3f36431c1b05d365e0753e8b34db004e4b7287b3e370c2706465ee10fd39f3 AUX ndsd88.initd 985 SHA256 63305fd9d81baa2f0c921e9d6d54e835434bda13bb827b9a4e2c693034d072b0 SHA512 e176b98236de862a3673bf95c765d9a8e2c524c9ef6e84cb8a3996beca2a1c6811a70fc97a3e49061f6f938ded82ef13601ccff80aa28e3a176fc89ce9b71aa8 WHIRLPOOL 9845d7eb58c3806fe58b72ad71f505394476a12fc3e5296f807f2b27e01945f0a9da7ea1f4db2485ebc3a0f351952a8f12dd79fd820f143d92342df3221d3e7b +AUX ndsd88.service 230 SHA256 01ab451e3e1d232025f9e354a129eb5b26c70e9f1210185a342dc98b1d4da0b6 SHA512 66d9e0d1d4279d8ac92e73cbeee19cb80e695e586c39e0741d986ed553d1c3b401d445772bd8aeebb086ba951c578a2e15e17624ee4f7fc9d99820b2ab8e133c WHIRLPOOL e605033991adfae41b66a73b53c919533da8f19becb5e8ae1280fca7133078a8d12c564c9cdcfdb9734583a4eae61095386945d75fbd672b6c104ac7ba62cb95 +AUX new/ndsd 12096 SHA256 ef01aae4ed222cc4b584a9721d84d5e6f50f6755f60513fc9efb520b1f5a7fb8 SHA512 a0461a94ba3d4b7646c83b7313c54df2ed25540079cbf6b72f905f99f9da2ecce0bc52f1f961d6251e86e80c10230eaa926f2eb4a190ce1b135a1641d3223413 WHIRLPOOL 7db38f4da0a5c9a77f73ad36562212add7e27eac8f4721f2d75517387f8b33984b3e48494f5af5d77ee14d179573a00eea39f4e27fdfe5505079f38ef085a824 AUX nldap.initd 321 SHA256 9f090443493452eae3880158b26e30124c73ac3bc58b8fe760c18f2ad82a73b3 SHA512 f8ae9a03d6c4d8532699716e72ac4c61ecdbcf7fd9243998197ad7126c100ab79c4a34f906a48b0f3e9e437be99a31e935f3268251803303f6f92770cef3e441 WHIRLPOOL c37c06daa2542ecf771f68c03bca0c9ebc17e508d6fe989ec3644cfd8866eef19523127255226c1ece27486b5637ff04477a379a5c3384cccd084f04ff475580 -AUX nldap88.initd 3263 SHA256 76854724718301f3fbe0f5f0cbcc2c0c69467d0d1a8f3f703f1dccd7dbec2156 SHA512 e30e9e1d85a69bc3b2fade6d17afbdb04ab31c1ad827cdc98d553f0f6972992e85961a75660b0af3af5891f01784b0b7f1783209adf717f6626a4c55dbbee46f WHIRLPOOL 7a98aa9f2ad0fd1551a4199573d60cb1d37f7ed553c8663f77e5a64a153480a93efedf2dd472fa3fcab08ac91ae8fc083f9b0a9f89c2c2598f5c9d718bda33ac +AUX nldapd88.initd 3263 SHA256 76854724718301f3fbe0f5f0cbcc2c0c69467d0d1a8f3f703f1dccd7dbec2156 SHA512 e30e9e1d85a69bc3b2fade6d17afbdb04ab31c1ad827cdc98d553f0f6972992e85961a75660b0af3af5891f01784b0b7f1783209adf717f6626a4c55dbbee46f WHIRLPOOL 7a98aa9f2ad0fd1551a4199573d60cb1d37f7ed553c8663f77e5a64a153480a93efedf2dd472fa3fcab08ac91ae8fc083f9b0a9f89c2c2598f5c9d718bda33ac +AUX nldapd88.service 197 SHA256 c7ee6a0a535ed5de71f9b8fb5093700fa3cdcc1f8200f94eda024b9f0eb15ad4 SHA512 c76956fb78fa71b94f228e41406090163d4358342267e716aa90cb6d739f5267028673bef25340c7a1597bac80a7d793e8891a173880853c3c632e59402defa9 WHIRLPOOL 30efa05b3a5cec5a155bce15785f9f8cea323fcf90747072b3a541f8d5a6b4feb059342f2dae154a28a54c650f472538ce63cef6807b5ecb5bd403f310a89fce DIST eDirectory_88SP8_Linux_x86_64.tar.gz 115981881 SHA256 69946393b9f6cd82593eb943a62bc6773688239de1b12388765ea2b60f0431c9 SHA512 e8030463f4404aeb33e9b4b85f4da91275ff8beebf480cb8a267e6340a7209f10aef2f060b0c24f7fb18ba457fd3211b6c71748b281888ca46919d1df227b627 WHIRLPOOL 603ef881ba4a7c84d1e670b5a39205a54f56daacd8253d09017209b204f15fc06397e764e4d7a2aac69e3c88c13bf3ef5882d4837382fc6e6d2c2e4caa797449 -EBUILD netiq-ndsserv-8.8.8.1.ebuild 3814 SHA256 a386c1accc3bbbc6493da83d75802830f71cd7f7b0e654c39d06efa5be740777 SHA512 8a9f805c9e9a63f60b9b54ed3641779043ef6dccce0f956d30364a98f4dcf86afab301de3160a3ecdfac2c4f4d385c9313d7484f8882dac1e83748885f5b4109 WHIRLPOOL 6ac6bbb9e5f73348ce963320b63f8990a485f98a68668683018981b14325c2520693b16063a1fb4532e413a5ebe73d33f700356be6e0057fbf447f202e2f4db4 +EBUILD netiq-ndsserv-8.8.8.1.ebuild 3856 SHA256 b6c967976db6366b2d72a386a35a6d3c96061f8e370ddd54063205a1eb2dd390 SHA512 af6c241f43d3dfa3e28a9828368033d900b6dc9ccf829a9170a02dd75cb6119574399b11c202dde19d3fea84bb8c5afec4861a8adec4f9230111a51643a2b208 WHIRLPOOL c56d715f0c7ad67e89566e0cf616c1828a82f3bce7ea127eb169298ec0882e80a9de5704c50bff0d2b4bd0f98b41e22cae5db1c87208a12a7ed5a6bee758ad8e MISC ChangeLog 3632 SHA256 cdcea4de0436f027a2d35efb4ba489b7c67e4acc44016a5b67735cf6cf52c994 SHA512 a640fedc696d4246b9653705bcce4b36259f690be29321a4b85636714ca5743068796754ea6fe13f35c3749668907001d34ffe7f665377cfe98f9ba2333efd9f WHIRLPOOL 295594817227699c6818a4e4eb8e072ec64ef29d1bb5c738325b8d307018ca0db78772ead242f56153bb8ae06c20328a373f4b3203796d8bc9c6f66c15019670 MISC metadata.xml 226 SHA256 a9d3f7df2362a9a7ddcbe05c5d97d726eeb4bab135b21643508149a08bf6a2b2 SHA512 5912920d8f6e9ee5126fb0aaa5717a562feb009cc59b759c6a6eaa909900b19e95e51e3aa7f32fdf2e77073b19878830b97947148e3adeff3b49e7555cfe29e9 WHIRLPOOL c07e2ddb648893f1e9c422e07b0b73a6d0f7e1c9501200b6fcc9d25fe68c3b05fe4f3523e6844067eeca6969973a44004e1ba8a6fa725591a1916648bd2d4834 diff --git a/net-nds/netiq-ndsserv/files/ndsd88.confd b/net-nds/netiq-ndsserv/files/ndsd88.confd index 620fdc67..790578f3 100644 --- a/net-nds/netiq-ndsserv/files/ndsd88.confd +++ b/net-nds/netiq-ndsserv/files/ndsd88.confd @@ -1,3 +1,3 @@ NDSD_OPTS="" -NDSD_CONFIGFILE="/etc/opt/novell/eDirectory/conf/nds.conf" +NDSD_CONFIGFILE="/etc/opt/novell/eDirectory/nds.conf" diff --git a/net-nds/netiq-ndsserv/files/nldap88.initd b/net-nds/netiq-ndsserv/files/nldap88.initd deleted file mode 100755 index 250ceb92..00000000 --- a/net-nds/netiq-ndsserv/files/nldap88.initd +++ /dev/null @@ -1,139 +0,0 @@ -#!/sbin/runscript -# -# Copyright (c) 2004 Novell, Inc. -# All rights reserved. -# -# Script to wait till nldap TLS port comes up or timeout after 60 secs approx. -# -# Simplyfied and Gentooized by Mario Fetka - - -depend() { - need ndsd - use ndsd - after ndsd -} - -checkconfig() { - if [ ! -e /var/nds/ndsd.pid ] ; then - eerror "Novell eDirectory server has not been started." - return 1 - fi -} - -# -# Get nldap TCP Port status -# Cases: -# 1. nldap not loaded (nldap -c return 1 to the shell) -# 2. nldap TCP port is not listening (nldap -c returns 176 to the shell) -# 3. nldap 389 is disabled (nldap -c return 255 to the shell) -# 4. nldap TCP port is listning (nldap -c return 0 to the shell) - -GetTCPPortStatus () { -count=1 -while [ $count -ne 30 ] -do - if [ -f /opt/novell/eDirectory/sbin/nldap ]; then - /opt/novell/eDirectory/sbin/nldap -c > /dev/null 2>&1 # check the status - returnValue=$? - if [ $returnValue -eq 0 ]; then - ebegin "Novell eDirectory LDAP Server TCP port is listening" - eend 0 - break - fi - else - ebegin "Novell eDirectory /opt/novell/eDirectory/sbin/nldap not found" - eend 1 - fi - - sleep 1 # wait for maximum 60 seconds - count=`expr $count + 1` -done - - if [ $returnValue -eq 255 ]; then - ebegin "Novell eDirectory LDAP Server TCP port is disabled" - eend 1 - elif [ $returnValue -ne 0 ]; then - ebegin "Novell eDirectory LDAP Server TCP port is not listening" - eend 1 - fi -} # GetTCPPortStatus - -# -# Get nldap TLS Port status -# Cases: -# 1. nldap not loaded (nldap -s return 1 to the shell) -# 2. nldap TLS port is not listening (nldap -s returns 176 to the shell) -# 3. nldap 636 is disabled (nldap -s return 255 to the shell) -# 4. nldap TLS port is listning (nldap -s return 0 to the shell) - -GetTLSPortStatus () { - -count=1 -while [ $count -ne 30 ] -do - if [ -f /opt/novell/eDirectory/sbin/nldap ]; then - /opt/novell/eDirectory/sbin/nldap -s > /dev/null 2>&1 # check the status - returnValue=$? - if [ $returnValue -eq 0 ]; then - ebegin "Novell eDirectory LDAP Server TLS port is listening" - eend 0 - fi - - if [ $returnValue -eq 204 ]; then - if [ $count -ge 10 ]; then - ebegin "LDAP Server is not associated with Certificate" - eend 1 - fi - fi - - if [ $returnValue -eq 255 ]; then - ebegin "Novell eDirectory LDAP Server TLS port is disabled" - eend 1 - fi - else - ebegin "Novell eDirectory $sbindir/nldap not found" - eend 1 - fi - - sleep 1 # wait for maximum 60 seconds - count=`expr $count + 1` -done - - /opt/novell/eDirectory/sbin/nldap -c > /dev/null 2>&1 # check the status - if [ "$?" -eq 1 ]; then - ebegin "Novell eDirectory LDAP services are not running" - eend 1 - else - ebegin "Novell eDirectory LDAP Server TLS port is not listening" - eend 1 - fi -} # GetTLSPortStatus - -# -# MAIN FUNCTION -# - -start() { -if [ -f /var/nds/ndsd.pid ]; then - GetTCPPortStatus # TCP Port status - GetTLSPortStatus # TLS Port status -else - eend 1 -fi -} - -stop() { - /opt/novell/eDirectory/sbin/nldap -u > /dev/null 2>&1 # check the status - if [ "$?" -eq 1 ]; then - ebegin "Novell eDirectory LDAP services are not running" - eend 1 - else - ebegin "Novell eDirectory LDAP Server TCP and TLS port is not listening" - eend 0 - fi -} - -#restart() { -# (Commands necessary to restart the service) -#} diff --git a/net-nds/netiq-ndsserv/netiq-ndsserv-8.8.8.1.ebuild b/net-nds/netiq-ndsserv/netiq-ndsserv-8.8.8.1.ebuild index 9f2ce523..fa1cb88f 100644 --- a/net-nds/netiq-ndsserv/netiq-ndsserv-8.8.8.1.ebuild +++ b/net-nds/netiq-ndsserv/netiq-ndsserv-8.8.8.1.ebuild @@ -85,9 +85,11 @@ src_install() { newconfd "${FILESDIR}"/ndsd88.confd ndsd newinitd "${FILESDIR}"/ndsd88.initd ndsd - newinitd "${FILESDIR}"/nldap88.initd nldapd + newinitd "${FILESDIR}"/nldapd88.initd nldapd # add fake nldap bash script for compatibility newinitd "${FILESDIR}"/nldap.initd nldap + + keepdir /var/opt/novell/eDirectory/log } #pkg_postinst(){