diff options
Diffstat (limited to 'net-nds')
29 files changed, 96 insertions, 176 deletions
diff --git a/net-nds/389-ds-base/389-ds-base-1.4.4.19-r1.ebuild b/net-nds/389-ds-base/389-ds-base-1.4.4.19-r2.ebuild index f7b6df4f5029..bae1ed6a51d4 100644 --- a/net-nds/389-ds-base/389-ds-base-1.4.4.19-r1.ebuild +++ b/net-nds/389-ds-base/389-ds-base-1.4.4.19-r2.ebuild @@ -148,7 +148,7 @@ DEPEND=" dev-libs/libpcre:3 dev-libs/openssl:0= >=net-analyzer/net-snmp-5.1.2:= - net-nds/openldap[sasl] + net-nds/openldap:=[sasl] || ( $(for slot in ${BERKDB_SLOTS[@]} ; do printf '%s\n' "sys-libs/db:${slot}" ; done) ) diff --git a/net-nds/389-ds-base/389-ds-base-2.1.0.ebuild b/net-nds/389-ds-base/389-ds-base-2.1.0-r1.ebuild index 2a2646b7dd3a..42d9bf5bd2a5 100644 --- a/net-nds/389-ds-base/389-ds-base-2.1.0.ebuild +++ b/net-nds/389-ds-base/389-ds-base-2.1.0-r1.ebuild @@ -147,7 +147,7 @@ DEPEND=" dev-libs/libpcre:3 dev-libs/openssl:0= >=net-analyzer/net-snmp-5.1.2:= - net-nds/openldap[sasl] + net-nds/openldap:=[sasl] sys-libs/cracklib sys-libs/db:5.3 || ( sys-fs/e2fsprogs sys-libs/e2fsprogs-libs ) diff --git a/net-nds/389-ds-base/Manifest b/net-nds/389-ds-base/Manifest index f24754a3e052..7511945521b0 100644 --- a/net-nds/389-ds-base/Manifest +++ b/net-nds/389-ds-base/Manifest @@ -109,6 +109,6 @@ DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f955297217 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513 DIST zeroize-1.5.0.crate 17017 BLAKE2B a729d12a0a97e59d80dd024fd351c434829dc2819d9c3179c6d0781d5d80dffac10bf431d6e36ed14444680ef6d3328ab1ea6c4077eb2c31cb6f077d3552ccaf SHA512 6b6d1c5f85111f0f83ee02c633effb0bad87bb8b334d3f4e13d8722cf9c4ff252fc15c73de044c33d11ff62cbf3d2b6d33834cf08830e5b9ce9c8c298442a05c DIST zeroize_derive-1.3.1.crate 10268 BLAKE2B cfca89267374c562dc89dbddcad9bc889b33a489d2519fce69b74cbf95d7e8a6b29641a660635f77d303a5f785133caad59560e44b4973f2def52b610f364b9e SHA512 070619a664c404610cac48ad4a831e3f449a2b022c5e55c9f0ba3b19ecb0f737445ae5577f7cb9c314661efeb19801488b158961a9db0cf16e636c2df8758503 -EBUILD 389-ds-base-1.4.4.19-r1.ebuild 7051 BLAKE2B 137be7b4e3887cc1754cec20055ab03fb207c5126fc83f6e66824b02649928457c4d3a878ca510fbd2dbf7468bfc32861b092497a6f30a258176ff208de9f6df SHA512 1f6e3631c58532a713b50ed80a3aa76ac23eb1abcbd04f0ded0a2f1d3f76da4da2e87f2eff4e224dd4804d01cb9a3a945f5fa4ceea4b5a026e02f3986f9d7b87 -EBUILD 389-ds-base-2.1.0.ebuild 6948 BLAKE2B dfbfbbf56adaf06885bf39ff27564dbe426140af7a633bb6e3b5924f403aabed1ba1be67bf1111dfe9435f1efbe6c04ae30c994d6fec00020ea196e48a2e76c8 SHA512 16653751be7a6afc6960b63818e335cae9821eb51b7a1223b59a12b8493c5a0e5c7f9049e2e7e12e184aa408ffe182d3983972588a3af92c14682a7f81a35b51 +EBUILD 389-ds-base-1.4.4.19-r2.ebuild 7053 BLAKE2B da4092d1ec34570f8f9ec42416ceab335dec3c81deb5e3b10032ebfdfb39bc936b743041411b37e639c3c9b9dbe3011263e409fe481389ead9bad4383ebcd89a SHA512 396f93fcad61a0bbbe774ed7a8ef4b7169cba4affc53507d29278ed114c35afd017b3d0292a25cb3c216cc23340f7cc1d543749f79ad12712a31b6b6bbe072c6 +EBUILD 389-ds-base-2.1.0-r1.ebuild 6950 BLAKE2B dbc03da839ed55acc8a2ab6e21eae9dc94994ac30dd663dd7276c7c166a9d66d27bf1c2bce52cc8ce13196439957bbba01949fc6fd55b4190ed24e66e85f3c06 SHA512 ad3e98ad0253d744db3c665dfecf6968629d34190d31be358938baf7ca49c511df4d68bb70aa84daf53994fb4683dd5748bf78edd7268899a041cb7904f5c56c MISC metadata.xml 1582 BLAKE2B b29c4633cc0264cfc762327d8b24f21abed6a0e7b92d093d46826945f500d73898a488003d00a4c1fd2feef469a095ef3fc3d55c710f1c6543fb469e088ce2fd SHA512 6413a53a8494cb491bfdabfb4f097f657f86163e33e60ea0c7c1f02079a44d2e487ab2fd72a15f0e34d66ce840d52f058212b97213e45f50069d333a910dc83f diff --git a/net-nds/Manifest.gz b/net-nds/Manifest.gz Binary files differindex 4589f42ad244..943ab8cfcf31 100644 --- a/net-nds/Manifest.gz +++ b/net-nds/Manifest.gz diff --git a/net-nds/adtool/Manifest b/net-nds/adtool/Manifest index fb55b6973099..b0c40f1b509e 100644 --- a/net-nds/adtool/Manifest +++ b/net-nds/adtool/Manifest @@ -2,5 +2,5 @@ AUX adtool-1.3.3-automake.patch 306 BLAKE2B 34947a79d78ff15b218d4a152e31a1e28d36 AUX adtool-1.3.3-bfr-overflow.patch 587 BLAKE2B ea6322d2dcc26575676ba26f048db2755012e63f2132b6b2c0e339bedd415e7d5a73d955be60c89329829c8cf0e30f4c96a6c1ed85a9c864e2aa8556c8366eaf SHA512 4ac3772f261f5a6e57a982d3985830083b227b87246bdc0909e5c75d47eee3cf62572b1de67b296368124e5007181988466832ff2333dcf74dcfae54e2db0ad4 AUX adtool-1.3.3-fno-common.patch 528 BLAKE2B eca0e12bb41b9d52e634fee7670caa8c9b4f2b7b51ab5b1631d827b36a0cd5f705d44b1c044a71aaedd75de7564f5a7d90869d06252cf1dc01a44b652dcdcf2a SHA512 26f1b8fcba21b925c496090d90e4fe13f8f5d584ac24d40e218d1ba0e9b16a2c0cf088bbae6e43706a5737c0537c7b50bf32605747c2a411f8ac52003693756a DIST adtool-1.3.3.tar.gz 334767 BLAKE2B 401f10df2708a2e2b7384354192337145739d4a8df2f0366171d0989836c9795263dba9d95d597d3e129b72bfcd53df2532c55a62d126e773bcf79cac909df52 SHA512 800a9fd19481b2c986991c27674e24b40bd6f4d58d7cbcf94532acb88f6c36de1f18d4165d6a2dcffd7d5baeac86aaf6f0ff1ef1b46d93ffc28b826b3d857251 -EBUILD adtool-1.3.3-r1.ebuild 580 BLAKE2B c017a841de408e0c2bd596b9a1e02d0a067e41b0e6ab099be7e446219808f37d85ff45b4f10499cd3bb26f17fe95c267f83e8a3a2edc1e07a015f0d2946702fe SHA512 9000ed0995ff8d505d65cfb4d3c9bed2161ad84eeb9c5bdf6c65b67999ca3e392208cd5710a6479f552a68537cfa8cd78f6de0319f426f6e2157779072c59068 +EBUILD adtool-1.3.3-r2.ebuild 629 BLAKE2B 2887dfd2ce00c35117051ffde2945580874078ea379449d1b3bd4c7c9197a0b525829b5c4b0b10447f0bdbb82058c46d98c0798b2f06a69e7f26087015e30024 SHA512 2d493cb72ca05da8dba6db2b37cde8c0ae3a7baf6d254fb03569a320be90f1cb75abc316d93c9049a189cd7e6f2d7e4749b5a6f327c3f4689356731b42244ad1 MISC metadata.xml 317 BLAKE2B 5aed0c4e8afe6ff6146e11ceb5666c3ae1016d6569cb539d536cbad8273915b99acdc9036c0f90e37154c1fb8c11b7dea942e20eceb53f14837e7ea9a876202b SHA512 36de6a092c0a74713e2ade79bb3abb3ec1990f6405f016125896a763ae20c157055e6319c23a1d6534e7b92449ff68be95045d42333c570912708ded0e279dc3 diff --git a/net-nds/adtool/adtool-1.3.3-r1.ebuild b/net-nds/adtool/adtool-1.3.3-r2.ebuild index 014b4436dca9..cb955c1edee4 100644 --- a/net-nds/adtool/adtool-1.3.3-r1.ebuild +++ b/net-nds/adtool/adtool-1.3.3-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,7 +13,8 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~ppc ~x86" -RDEPEND="net-nds/openldap" +# Older OpenLDAP for bug #835649 (ldap_r) +RDEPEND="<net-nds/openldap-2.6:=" DEPEND="${RDEPEND}" PATCHES=( diff --git a/net-nds/ldapvi/Manifest b/net-nds/ldapvi/Manifest index 6edda3033d45..a7b54d39edc2 100644 --- a/net-nds/ldapvi/Manifest +++ b/net-nds/ldapvi/Manifest @@ -1,3 +1,3 @@ DIST ldapvi-1.7_p20101214.tar.bz2 1490491 BLAKE2B 21bb7b6113e89ce848e7a8efcec063dbfe9c32331c1125456a96dc6edc4e09d17245307a041a7d7804fac20bcce5b38677d719fb53d993fb874134bbd4d4df19 SHA512 2d2a744a36364793f406f37ecf6e546914d697457dec37b81544f4979f4c692756b2a1c3ea6fcbaba5e3238b2bf758ab3e0bd9a9a0794c4da734d65286bd5925 -EBUILD ldapvi-1.7_p20101214-r2.ebuild 1014 BLAKE2B 9f6743640cb61d43667a70a1d7da468ac2ddf76d05bbd2f776d39ad657bd058c016b3d42d930de26d4c01a926e98ed695d3dcbd10ebe373f8403887d1a57a438 SHA512 514f8441d6fc9f116bf7fcc5453dcc7bfb6cc64e684542f886afde6ce61a864fa0cb802bee0091fe66e5d0fedf221a30815b1ca3dbf6d72a2e3c625e589be660 +EBUILD ldapvi-1.7_p20101214-r3.ebuild 1016 BLAKE2B a39e9e5336e7a3e2571c6ed8acadcfecdc503e717598571eafd4a1393a356bd47849688b525ab166d51fbd117351858849a8d119b939f124f44c9e1f317117db SHA512 f2460d8f72dc474489ce1c8a000fa182d6a0b3513f3bafbdefa3efd7e326309fede73e7a7fdaf777f3e43e02c29ff1a1fb048b0e83411012eac3bd5d30d400fe MISC metadata.xml 257 BLAKE2B 2b8c0475fd2f982c8f0d1675eb7daf656b0671906551ad0c5dd151b70bf9e43194a39a08c5e6e28e07e933fd7627ba5cc5d43595b13924b60bb3515329e5e79c SHA512 c14a70df1639d58bc0aae865ee21874afbcc9b57a24c4a0612a04f58936a92e83c88d3a698bac8680c70da7a52e54fa0ee2a607063c23f57d85893c4e05b393b diff --git a/net-nds/ldapvi/ldapvi-1.7_p20101214-r2.ebuild b/net-nds/ldapvi/ldapvi-1.7_p20101214-r3.ebuild index 77f58005a718..71a2b08d735a 100644 --- a/net-nds/ldapvi/ldapvi-1.7_p20101214-r2.ebuild +++ b/net-nds/ldapvi/ldapvi-1.7_p20101214-r3.ebuild @@ -17,7 +17,7 @@ IUSE="gnutls sasl" RDEPEND="dev-libs/popt dev-libs/glib:2 - net-nds/openldap + net-nds/openldap:= sys-libs/readline:= sys-libs/ncurses:0= virtual/libcrypt:= diff --git a/net-nds/openldap/Manifest b/net-nds/openldap/Manifest index 2fd2bbeb3000..7d1ebb1a2861 100644 --- a/net-nds/openldap/Manifest +++ b/net-nds/openldap/Manifest @@ -1,29 +1,30 @@ AUX DB_CONFIG.fast.example 746 BLAKE2B daae97e8183c6e7315163873b2911aa544004b63b41a79c11c7c015fdfcf9347e43dbb4765a41cace57b4095c90f68812570b2a7e6350abafee44d1581cb4a0e SHA512 07199416b7c91864a1dd5ad45642367c4f79ee8b694214305289c47afb5b53420f0fb81cf7c8b117400c903535e88a2dd47bda28d57e969aeeec669debf6dc9e -AUX openldap-2.2.14-perlthreadsfix.patch 614 BLAKE2B b29f2c956403a909d1d0382804f7fa0a60c5f1d61dc06103d6b3dea79be1132a3a7ef7881b835d0a79cb4b586a0086b11849f0fbfacd53cf1f8c2cce47cbf057 SHA512 e2579de72194c63e445108a39a85635622c1a629cec9d276df84ce9d770dbe7e2df2057663bac192558af3dee60fa2f0ae92f4cc34145c300fe141ae7f3f13b3 -AUX openldap-2.4.11-libldap_r.patch 515 BLAKE2B 404e53c216e5e623ac74c7afdbf40899a624f4087db62233d020d6a03430cf05d3592a6da9d14450e5903698ada089f8363e708289f91a9dc65b0dc8ddadcd36 SHA512 44d97efb25d4f39ab10cd5571db43f3bfa7c617a5bb087085ae16c0298aca899b55c8742a502121ba743a73e6d77cd2056bc96cee63d6d0862dabc8fb5574357 -AUX openldap-2.4.15-ppolicy.patch 418 BLAKE2B 3bfc05201056fb652ea92427dfb8f37cc60848f9adbf8720b348990b699613038a766e731b16eee4bdecf13a9ab2f28f47209400e96e89f110345fc741b36362 SHA512 59db36c9b4d16e7ccf4b318af2a8d0c6e29cda7e567641b3bcc6069bb7d610a8ac8b56e16ca72165b3e50841abb1ef693b9e2958f16997ac637554f3a67b7146 -AUX openldap-2.4.17-gcc44.patch 509 BLAKE2B ef90f3e35248e6c6c0977b3dc2eaa165cf78402e706e2334500d70ebdc71ded586e73d4792cc8ec7a77e0e9b1784de76b9eac36d45226a5db5451a35756916ed SHA512 ea2c862c7a7b8bc17c31ece694c010dd648840cb4facd48d5640767d859bf3c9108d547007984cb759f4a8810ff99ab8295c82dc2ad069f568d037d8448e6ff4 -AUX openldap-2.4.28-fix-dash.patch 1101 BLAKE2B ae5fc2145441beeffd5368d20ad9fdb4b6d10eb57f0d2b851d44ef6eddf6e8d796d3121997427f32fb5cdd8136040c9c0ddf2208aefd6046523277e7c9f71ade SHA512 f9b3a50eb972f746878afe4a8cda8d7e2a2807932ad2faf602f43e5a1b81166bea4fde764b4e1ae4be0000cc0713ee90a4620afab5809b8460f60ae39a716e9e -AUX openldap-2.4.28-gnutls-gcrypt.patch 340 BLAKE2B c9363f2d919e8cb285cc3bff8fce38e6ac54ab0040c73a022d746a46e90f2a4978b49ec3591edb2d7a54593bc6c3cfb7b71bac3558fc11fac2498ee2e21e17cd SHA512 53441707e9b24e774c0541ad8b63295eea6dc0352ae2ef3bf389f381da18f1df05fb2f7b41c816e1f697d8f1b208643d05891c03d8fba42d85e3b7689e5ee94f +AUX openldap-2.2.14-perlthreadsfix.patch 391 BLAKE2B 6e1f89b6b50e01f1b4f4a9722867f29a0102f2bc6644e641621d1bd808f81e9eed08beafab409dd28be0f92d62476affd1688c4c9666f36641d0102a396b36b9 SHA512 b023ccf993087f53b7f37c4b214cf8a01a4d6ecda1868b49e3ae4b58806b344fc45e3e8e86b6679b237687930077c02d35a4acdbfc04f94bb0f7e999dfb8d987 +AUX openldap-2.4.11-libldap_r.patch 298 BLAKE2B 62c660e8910c6628bd52a14fa15de54f26c33dc5d515d904dbe8054d223629d5a314428f5ca0ce645d6dbc14c8f9dcd18a00a578e3c91016a3dcf954a9e00316 SHA512 28e50bfb412a5f722dde77cc430f6e3b9a0d033ddd0fbec18d3d0684ed5dbecb78ebd3ae15c6ec8c656ea1d3a102ba6da426bfc200904c1c11740215efefd976 +AUX openldap-2.4.15-ppolicy.patch 313 BLAKE2B 15b72e0cce56e33bdddefff60f470c3d2a0d104509095187a1aa45b074e60e2a4497e6931d01bd5e8dce6eba5b7eaa8438269491da33dec33d1795fed9dbd74f SHA512 4d0999248197ec5344b3eb01357b5973ab2ca7ab23d434d87af55893ae0cf83d46256b2fd2a8b6ad4e7a17a4277215acafbeaee2fd5e0b505d17c7b2358b337e +AUX openldap-2.4.17-gcc44.patch 264 BLAKE2B bf9638b0854616733bfcefbf508b93b64d9b97b4334d4f28c86c18b534f5a235d7d33378e563d484f2e8dc53e85d54e8083075ae2beef38e923e58839bad0b2e SHA512 b81f063f517d53312cba57e54b193bf6a49f18fd6ea183aa0a04347b28f3ce2174554162b9fb707e5b3ff7c52667190ad2209d3ac5c03652e696e3350f1b3884 +AUX openldap-2.4.28-fix-dash.patch 1030 BLAKE2B f8ddd33aef457c30625c6867b37a371069dd76db3a4f840a903c048ce65a184b4844a9fba5edb8c0399cd78b2f10d718fad943ebe4930a8a6a3597a7be818340 SHA512 a0b5ed4c899b0eaafd2ce9daf0fd629e6da077e6776f065523d2b2009d47753cd487e0e23f0f3ab659fbd967550d4690e158cb30857bc6da1f79e367ff17c000 +AUX openldap-2.4.28-gnutls-gcrypt.patch 235 BLAKE2B 32336abf2271224c5c9519f171b67245cda102b699082afaf34fba6435948b6afa1500041dbddd0092160205be2eefedc2c0b66de58dd0faa48413aa301fdae3 SHA512 a183cc468243c017c9fcd47a0a56914d7ad679f26150b47d8c6515fd67956655e73b8bf776073c024f55dd12312420d1b69a922f473fa07e7b36388c5a1cc30d AUX openldap-2.4.31-gcc47.patch 480 BLAKE2B 37490a10d224819b1407306a130fc9b2e0308e7e67f431edfec98961f63e675c19e17cdce53888d63ddfda7a17afed836536e757bea340a90ee0dd77d7f2296d SHA512 a35113fe3f5e9ae5b9631976415df41d53a99ae1ca4c4dcdcfd89e6ccc6ba906cf5cfe2ee4901033dba29d62b6607d4a93ca74645eb6ceba38e67c5d8521816a -AUX openldap-2.4.35-contrib-samba4.patch 1400 BLAKE2B 8fb0c09b3ab715aab1bff445e2ffd3757d42eff64ab230424a6b7435457f6c9d13cdfdf15605c16ffb29b453a4443f5085c93bd7be41526d7fcf7dc809391fb4 SHA512 332c4b2daa3eba165cfdcd479b1012e139d60095aaa628f8f5750fffb722d39395935bd7d7e56272e98fd234ab0be1c6568a71feeda5d88ba24b91b385defdad -AUX openldap-2.4.35-contrib-smbk5pwd.patch 1626 BLAKE2B 309b08c5bc3042625741daff1593bde0051a42279835733fd052daa226304d263bec96469e8ac01a5086d06128ab01ef42fc0f03dab76a5202770b85403234d1 SHA512 c045c7605d25bab9eef8c12752f4952e3e6358124764ded91f5f98210686bc371f32ac20c56a63de80410f882f20e0889eec95474f1ee9d4c5bb4ed303ec8da0 +AUX openldap-2.4.35-contrib-samba4.patch 1171 BLAKE2B cfdada40098cf3efe34ae49bcb65bd47a771f5b48b4d6a4e99097bd819dd29cef91ffbd9edfa69aa6a70d73a36c1648675d20756286515cb35333bb886798901 SHA512 e3bc2d3ca119e8d7c1847c8c316f6820e54dad0d82f4b9216f519a3605830fdd9d6de7746eb4ec7ee4082a7c3fa617ea2ffc5203a10fd5d4d3c6d10086812e2b +AUX openldap-2.4.35-contrib-smbk5pwd.patch 1393 BLAKE2B ef7dec06575be6187068923413f19f359341fc95e97bbbe2644367c31ea7117d5fa6eca533e75edca7bfc580365bfa01870ca93c2bd9eeb78ef89895503bd464 SHA512 3866687bf108fdd24e168f4e99d5f67f88bc95e3ebd443e2c651d0938eff1f77057a3f7bbda581ff4f36e1ccd85a330622c545278a2a47d81a9640272a116861 AUX openldap-2.4.40-slapd-conf 2059 BLAKE2B bc80677203c52304fd302288ea33face5b05504bcc8f98b202db3251b9cc85047db5a72f9596d51206e946298652bd1f277c1494bfae2f64d2b9bc4b7771e681 SHA512 7ce8a8262db74d86449a3d31b96b2efa9e8dae2f9992a1c3a6d6899fb65531eaf917f410d8728852cb74338d7ba3c8c3b52d2f6cdcbba4cb3b97f6c733099fa2 -AUX openldap-2.4.42-mdb-unbundle.patch 3589 BLAKE2B 243dc22251aacd5d978120219b6078bf640df2b34034adfef3b1eb7cea70bf94926cebb60c7c199a74d91b594d39763c46b07ffc1b0d72e52a86fd36f5450802 SHA512 ec123ff8cef6c32b1f29c2d0643433dd88dfa8ab62b4d7536de829475ff8b45b5c7376f3e17f3424aab326a573aa36a593630feecbd40c3e574c6c24f5dd83ec -AUX openldap-2.4.45-fix-lmpasswd-gnutls-symbols.patch 3542 BLAKE2B ffc226dc3dc2fe55d697667a49057ca9818d9bb85280bc68f1aa46e90abc92cca4ce18dbf3c735b83c1126a817e1c62911d486ef790de5a06c83468021733232 SHA512 326e73df430eb152fa5c53deb12071795f5958e6c48167021ebab83c6b1c4320ed56b0dfe5dd3475de463ff24e43cc8fe2c7cbf905e11cc1d48a70e350cb0ebc -AUX openldap-2.4.47-warnings.patch 1096 BLAKE2B d5843b0370a8785e42281ee4a760198450963e21de3babfc97bf1d69c3010360c9012c04956fedc4a9e5e3b993682b50a3aae44e7d17ba833d0c6b96a3db3e64 SHA512 7669f87e5838abae0d67b0ad42c08c51b9891507b2e4026d5910e0c770675ca71c70360e3dddfec2c077decdfce6c35cc7fb0f6332904beac12702a1db6de35f -AUX openldap-2.4.6-evolution-ntlm.patch 5161 BLAKE2B edd265d9012c91c36a7cd6abe1a409e3aac384f49dcf410d1cf3f41e8ec3a988ec90995239dd4d9c5016a3b320e945526abdaeb6f3187b4a4323fdff97e73eeb SHA512 a553231ad3e2d2ca3a3a195b20da6163c135a723e0a3ed39afcad5601ed4ef01e692533df3f8f96d5ec8cc74ca27cbd16508818007dc1343899a42b5595b980b -AUX openldap-2.6.1-cloak.patch 676 BLAKE2B e8fb84b3e9cf2653ba911142b53638735a324fb3540e2b18a34c46b04c713ca2c1e62e926eb54ff54f6256a93b74fe7d8c4afafa1192ce135012693de91b3792 SHA512 13eef29e093db4b017cb5d3c4282f1d3052a48ac68204e3a09a236bb2caeaa3665f2c65e83492756bc57fc02f71a44be82beb2504fa4e268e1412fb5872f5e7c -AUX openldap-2.6.1-fix-missing-mapping.patch 632 BLAKE2B 06f9a3421e136653074094c165f68de8301854a0a2dd386a47200cabc34d03b3fa7186a021be56ba2652624f336210cb4287a87359bb494e6fe7a22d5e02aa99 SHA512 abe9043771e896690987a56f9aa5ebbb30f8a156eaf0e5432e4c53d9c83d200ec9960e038b6de07a6c439b587c9c929350e4f2e0f6b66a053580063daa069f43 -AUX openldap-2.6.1-flags.patch 14325 BLAKE2B 71e9d7b3db8ca36a0d5553ba1e7d6dac535f92bdbee3aa53519a5981be9a65555e5dc9505c5147d8c79481f9c5e6c739a5c004dc1977b3823e5ddfa944f6945d SHA512 659968d43d97a056238eb559b1c7a1329a12350ba47e527f5a9ea974e8eabfbe278eb855bccb36e01a0c83edc0b9140fc72182818068ecd71b92d76aba7fc46a +AUX openldap-2.4.42-mdb-unbundle.patch 3286 BLAKE2B 9b960633b7e84e45dd7a69aea10575b047f0e2a0bd77b733f7aa00d266ac803dfa7075f3ae67ebeb54e1f2d1dca8c62e0e2ebcc2a40644c896d043607fbfe57b SHA512 c3550a272d94f7f69d7bd6aa55fd0b9a9474082e1574fd1d30fb02fa115e8455ad35d38483bfc94765f0edec38f37d65cec66fc8aa5711ab9f91b358ff95cfbc +AUX openldap-2.4.45-fix-lmpasswd-gnutls-symbols.patch 3437 BLAKE2B 56f1fbf6385f94ec7e34cf74e6d8d2c0c5a9e0b36202f8d812327e083fcd04df6244bf725ca7efc8b44bc32af62b14830d8c48a43ce5c18544b0c2cc405304a4 SHA512 11f72cdc20dc3a1d30eda401d0f3932a00527b49f487fc82952c283c91d58025def006704145d8b329b7ff9d005d5c6201e2283b0d369f72d9a147d1ce616ad4 +AUX openldap-2.4.47-warnings.patch 817 BLAKE2B d8bbbc8c2d10f38ab75e977a1fa4b55ceb51dbef91a95c65475bc0c58001f742b29dbdcb1698cca35dcd192f7108f1d3617ba1e7848246a47b872fb9eb472451 SHA512 55441e3058a348038e14106cba3a55e809553ad288e6387a19a39bb24ad080820c4d616a732af4e7e72f680b60fea6570e50041fddc2871f14dc035d68073628 +AUX openldap-2.4.6-evolution-ntlm.patch 4543 BLAKE2B 079c78b2608b3e5b4a69c7ee2ef9087445e7b17e4655929affc9511a035640f13f21d9320a2b8091fc5c9bd678654c656776cb9cd7129264bae0be03a79d649d SHA512 e79ac437f7dcffec19d99bb74dbc788a35b2800e82ee7411dca0576c4920d305142ac83f1d3b7c3227c50f20a899399f76c5cf4111c4fb756153ffb323f40c9c +AUX openldap-2.6.1-cloak.patch 464 BLAKE2B 5e2860123f340f172a2cc686f9d149d38976a4c2753c95342b02c2d3a6670e039f1fa039187d7d1fa8588271505a416a4a4c2352cd56482033132b7677885cfc SHA512 fe056bc36f9eaa6d309daede0264e32daa71dc599cc3393c5e3dff17ba78f6d7e17b3c126c623d6f1bf8a4616d5844f9ecf8437ed1169e237bfa44ad6d8c0f80 +AUX openldap-2.6.1-fix-bashism-configure.patch 419 BLAKE2B 2910734bd9e8a0e53efb0598200e37ed884038c966e39f5d54ed267ec62740e9fbd967933e145e5c707fea9ea745e0956bb24050c3cc6be713cbc84ca6d8856b SHA512 ee91f86774d30154a5a4b416224a1ed3373e783990efd1f6501e4fafae8d4f934dc32cf253a608c10a2a5d0d0eef3a69a4e7265770d7e934e4020f2c0a54a32e +AUX openldap-2.6.1-fix-missing-mapping.patch 458 BLAKE2B f0137f614b7fe07f80ae5ec7f2be8c08643166fe69358cba174e9d4c8c0c3e94e6901e1a75eb2d85ad62876234223b877ca1a2f689dc154985c591a8bb2f8872 SHA512 4083b99cb97f8511a9f44c8e0b6c63cffb351b20d50e5ebecb1e73b0a1441e6449db21c1af2f43112db365d193d4395a814cf7afcac730ae7a04f260370c9d0c +AUX openldap-2.6.1-flags.patch 10275 BLAKE2B 0c851a90dd2befe44d0671782676b8692ccb027ccbee2e52989a409b70fa8e917f26452bc6838e04111c6479bfa49fa138140cccec82026b53c6a0a23aac7f73 SHA512 a068987ee75de99e442d279bd3789f401e31342cac0cd699b0b06f9c3ccb51381ff7f947b339db1ee2330ed7d00e4ba5d1f56ba12824eac31e0d4cb8a605ae9a AUX openldap-2.6.1-make-flags.patch 2052 BLAKE2B b556799ddebbee51b4480ac379b15303e557ecab319342ed87e4a5fbbab9a640733045149fb5fdc8013f71cc850170477a1959c7aa8f34e06a2d93d25db9c6ab SHA512 a8ae365f9e907b0668774b01b50d042e2ab12fd32e41956fe98f7d9747bfde5d48f3571467be4213a4f8070b3726d14f0567915363b2e57bde438ec4f0c71b07 -AUX openldap-2.6.1-system-mdb.patch 4033 BLAKE2B 47f10cf7fb18f2b191f01f06acb54f2497e7eca9a9b99d13f5bec57664661bbe427552ea601a9b3b980cafe029bba9d2795ec6e25454c641cc810b1eb0069fd5 SHA512 f7aa62dea4fbacf6d69a77c7037e9eb234c18cff55bcc51eb6952694f4a6736f25567d6e21dbdde1838489c34f16edc4405e13e7ef5fd113db7a92cb46ac08fb +AUX openldap-2.6.1-system-mdb.patch 3679 BLAKE2B 9d9eb3dad904564cb453424743091c471ba52ea8fa6c98b4138f068d2b6d57eb7a3ce903df1ee9eb7bae0219cc762cff8dc1f10515c376c40e2ff9b7d25d44a2 SHA512 fc1d17e57b9596b4e744272f0e28400fbaeafe6fe6de8e050be8b934f4e4f977637e6b8ca9f43255f2b59f9640a70b4c9ff91b2f741850c5f1d04d5c34cdc34c AUX slapd-2.6.1.service 283 BLAKE2B 47f0d19eecc4ab3f026853f0a1aa75b3691db7e064cd721751e74acdd932464347e919285536b01eea64bf596761755034a7e281216bad9baad2541a2bb708f3 SHA512 cb619ca423cac1fc71e553c0633d45babb4a138a9bd791a874851c2afc92c9388543cc7ce3fb9f8c553d8db9fb01464939bfd224f8b78aeed0d47c4ccb29b46f AUX slapd-confd 614 BLAKE2B 1f82964ade38adce868c28551ba9c5fbda4d1fcfc640ef51850ef934374a35520ffcf912547d7fe14f93d2aabce6ca24c11f1867bf16b3503addf04ecb1e11ba SHA512 e4ae52d10294da787016cf39adfd68c6ad812ac1758b00845810ee7936d21734d2ef3793252b878d88f21788414071adffb5f484381d4dc6a29f71a8729486b7 AUX slapd-confd-2.4.28-r1 1072 BLAKE2B 9d4cef3614164e09e27cc681a2d37c126da6666715b1f3092751d036b42c70bb73f3b6cc51defac791c3f8e63e250d8c9d946ef0b84bc8e38c1504ac7ea239a4 SHA512 7426c04ee689bcfb29a9a3956367c571eac6bc9620efda938591d09382a05527454458f7a25bdc2fa2ac920f93bae516121e085408ffefbe8ace0c7d8c5da315 AUX slapd-confd-2.6.1 1060 BLAKE2B 06f5f0e7b87eb4962f8413f3f5ea21a29b4e8174c016420c5f8c00bf6deb1b27929175a5cb8dc2db272147154ddb6006a2cf7ac5ee07a9652e047f23603923c7 SHA512 79d332fec5e6539106ae9f457194c31ede99e682f6cac89512d76c0f5831a7cbd01de5ea05ced4228f581ba1327091eaf5209fdbeeddb5048c6ca6ba7c5b38d5 -AUX slapd-initd 1168 BLAKE2B 706df2b4e0995b151e98e84aa89ddcb58cbbd2cdb6bce846ed7471aee3129ffbd87f0322f6467fca56102609e0a420d182084ec70c8a6c2c1bd86cc0b00be1c9 SHA512 52dec305f990de797cfe12a9b0d5b306f4b5baedec1597879151a492a1743ea46d83bf659f7695e07b8652fddb8a5a2ea11339991432075907fc088edd9a8bd5 -AUX slapd-initd-2.4.40-r2 1726 BLAKE2B 998248677dfec0d71e89cde7233596ec95f017392d19c4e8c768d858ad0299f1bd0e8b94b25abf5ee0d4f52d5877678642976e22c0e600a4b0eeeadf23863494 SHA512 3945dc4cff9b20bddd2ac4f38d045f8caabb59368ab0b5e952d4194d06a1bdd9871546b84e9a54b692d2e3ca699aa065e5fa909a29ae80e102ed9635c94bcfd5 +AUX slapd-initd 754 BLAKE2B 3f4d3c02096c91a6e3f4404d1629deb8bc42c2e05bf12d094915658035b1c5a2f86a2f080accf1ceee61d7358ef356f1b4fce36a6d074305c00f9f4f47f3bbdf SHA512 adff88d93c39ae95a253c32a649f3523e79e60ad43ec959d2c206cb0ca35126c1c8531b40b2cfc1ba3692e15e1353a5c6583a14f6655d070b3ca203359592a42 +AUX slapd-initd-2.4.40-r2 1725 BLAKE2B 7fc04e889726b619f3eb29984c3fcfc88d74b216b546f5bc3a470da11afd4778c0b0c0e2491e9aa375bb0d4dba43a0caf4e13755399af01aa64f813464f96302 SHA512 1fd458da28034eb1c6287fc291f40a546f136abe4fcfba4c27311ba1f92b0c29eee6f097ee6e4285dfc5a23e4ee3edbdc4eea8811b1b2c4fada666d30b95d1c3 AUX slapd.service 284 BLAKE2B 27e3863a8b0e854e5b6b1efce50da624acbfe0d2416af1eedfbc225b5e8307f79441bb4b9afddc7736857a8fd289db65e04e297e314cad48996ab6e3ecca43f6 SHA512 450c93b320101e1c28681cad6694c24332fbe424ac98283b621a2f6e1eb01e9e2dbd80a4142e6e8d01d95c55018b44e847d4f4c55f11d7e0e0a11ae1827daa82 AUX slapd.service.conf 443 BLAKE2B 7cf9d3935ea100006fe4f8667b792d32627c933c72220a91e4d9bf99fab4af9c590834f9aaed57d80eadd2fdf75e49f55739ef6027d11f012f8da3a711707c27 SHA512 be9cf4bf19111bd77c0ce481428e6f3cc183a6939775ed1a2d7606a5162da34178cb139d666288f6a35b8413bd4dc5f8f1bd60b39f3cca8f749557674b93910b AUX slapd.tmpfilesd 90 BLAKE2B f9cdde975b45c61c18773e4a3b30e3cb3c2a7d979bfef6d0513cd33ee5d31acdbe19c0af72a6478576acfaa88a2f063213cb9fd3025f4dda6ac401a8b9488719 SHA512 c462c92911635a2a6a30eb7239e74b529062224f9798351f53dca9a2e25cbc7f9fbb3743f98a015b7ccac0823ab85adb42d91d980f053bc3f12fdce760ce4bec @@ -37,5 +38,5 @@ EBUILD openldap-2.4.57-r2.ebuild 28999 BLAKE2B 5e1836649112dd13d481acf1187748a85 EBUILD openldap-2.4.58-r2.ebuild 29000 BLAKE2B 114b2f837d5e35d472d8404e02020a0508ac871ab40e31684535dad85102d9ca78a41548550606d334a92ce54fcc418a74ee70732cfe2ae04a5d28fe8e161f4a SHA512 ba507e64fa9b3266e68eca64a63450acc0c58e89b21c73d1e29bdbae3dae2894c362002fd05bb07f0d27c8c942e8cbc05943db7ed80b0124f9c641cec6ffee78 EBUILD openldap-2.4.59-r2.ebuild 29006 BLAKE2B 50dbead8923aa438b3fc3ef4df689daf19632f758aeede75a101706d26d4cbe71d0fe9f628fdec091e6d5b4388e7d3bf2ab1cd52dc1c36547111679a915be795 SHA512 2ce1bef71ad542768f1a715fba3ec366a9005b6cae103744b3d125ad158c3b63f2ff49ae65a2faa7cc3dbe7493075d3ed42d04434fb60b14aa414a6298188c29 EBUILD openldap-2.5.4-r1.ebuild 27110 BLAKE2B f2cd62e2af7fe301500b6249ad547a378605688419f90ecd20919f5289da2bfc24eea50e93a27303f70bda14a7f671a2e20445012d0060fdc8df3824424acf6b SHA512 e5d6267f8b7d74f32a3964d424497c40e01ce637fb945c2dbdf07fb3cecad60cca7b66452edda644b925887c0a02e392bf33cafe6066c47d67fa029c3e7933e9 -EBUILD openldap-2.6.1.ebuild 24866 BLAKE2B 3950f1b94f8083581446787d362d369d472febcb79c1d0cca4db6c50a96907e743e0879544d26306a5c3da9f1080233c7e9d465054ea0021c9271596c564ba13 SHA512 9dee34ec903b458eba783cd3371a404d80c009d816175b64f64bb562224ef7b1a62de17a576db2636973323395f9d41a69ea2d0c11aab24f80101ca472193c21 +EBUILD openldap-2.6.1-r1.ebuild 25169 BLAKE2B 3ec5b12780c0df1941ea54e1bb5979917bae829fbde1f9009ed373c845f2cb9bedd0c84c6f51db7645d07f697201befa43ee060d155123732fc34f862de487db SHA512 3f2536e9ebbadffe30d13311a8f244219589d61ba4e8100290ee42b7c67ae0160872531526bde342e7a3a8b256c2080fd2f0a676f9177b7e30e99d94b5a94256 MISC metadata.xml 1298 BLAKE2B f0c2f07ed39ff1b664eba65a620b0a5bd1b41ee4da526fec241dba98ae5c7fa00a4d362a00a0341741619b16d60a5130bfe024c91428687feb97475b3b5f852e SHA512 bf38387ed57f1e78f2d78c7b2727e07ed0fc499767819311c9eddc3b28cdb32d894593e20a96f09fbe8e292c8858716d7e6273176297d51cd354a98912f6742e diff --git a/net-nds/openldap/files/openldap-2.2.14-perlthreadsfix.patch b/net-nds/openldap/files/openldap-2.2.14-perlthreadsfix.patch index ddb6672a5fa7..2a8c4bc569c8 100644 --- a/net-nds/openldap/files/openldap-2.2.14-perlthreadsfix.patch +++ b/net-nds/openldap/files/openldap-2.2.14-perlthreadsfix.patch @@ -1,6 +1,5 @@ -diff -ur openldap-2.2.14.orig/servers/slapd/back-perl/Makefile.in openldap-2.2.14/servers/slapd/back-perl/Makefile.in ---- openldap-2.2.14.orig/servers/slapd/back-perl/Makefile.in 2004-04-12 11:20:14.000000000 -0700 -+++ openldap-2.2.14/servers/slapd/back-perl/Makefile.in 2004-06-20 18:43:41.000000000 -0700 +--- a/servers/slapd/back-perl/Makefile.in ++++ b/servers/slapd/back-perl/Makefile.in @@ -31,7 +31,7 @@ shared_LDAP_LIBS = $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA) diff --git a/net-nds/openldap/files/openldap-2.4.11-libldap_r.patch b/net-nds/openldap/files/openldap-2.4.11-libldap_r.patch index 448249a3b583..f63ad3cc8dff 100644 --- a/net-nds/openldap/files/openldap-2.4.11-libldap_r.patch +++ b/net-nds/openldap/files/openldap-2.4.11-libldap_r.patch @@ -1,6 +1,5 @@ -diff -Nuar openldap-2.4.11.orig/servers/slapd/slapi/Makefile.in openldap-2.4.11/servers/slapd/slapi/Makefile.in ---- openldap-2.4.11.orig/servers/slapd/slapi/Makefile.in 2008-02-11 15:26:49.000000000 -0800 -+++ openldap-2.4.11/servers/slapd/slapi/Makefile.in 2008-10-14 02:10:18.402799262 -0700 +--- a/servers/slapd/slapi/Makefile.in ++++ b/servers/slapd/slapi/Makefile.in @@ -37,6 +37,7 @@ XLIBS = $(LIBRARY) XXLIBS = diff --git a/net-nds/openldap/files/openldap-2.4.15-ppolicy.patch b/net-nds/openldap/files/openldap-2.4.15-ppolicy.patch index 3195ee550f68..1196f1b936e8 100644 --- a/net-nds/openldap/files/openldap-2.4.15-ppolicy.patch +++ b/net-nds/openldap/files/openldap-2.4.15-ppolicy.patch @@ -1,5 +1,5 @@ ---- openldap-2.4.15/clients/tools/common.c.orig 2009-02-05 15:05:03.000000000 -0800 -+++ openldap-2.4.15/clients/tools/common.c 2009-03-21 01:45:14.000000000 -0700 +--- a/clients/tools/common.c ++++ b/clients/tools/common.c @@ -1315,8 +1315,8 @@ int nsctrls = 0; diff --git a/net-nds/openldap/files/openldap-2.4.17-gcc44.patch b/net-nds/openldap/files/openldap-2.4.17-gcc44.patch index aa7fe7ac35f6..a782da46f3af 100644 --- a/net-nds/openldap/files/openldap-2.4.17-gcc44.patch +++ b/net-nds/openldap/files/openldap-2.4.17-gcc44.patch @@ -1,6 +1,5 @@ -diff -ur openldap-2.4.17.orig/contrib/ldapc++/src/SaslInteractionHandler.cpp openldap-2.4.17/contrib/ldapc++/src/SaslInteractionHandler.cpp ---- openldap-2.4.17.orig/contrib/ldapc++/src/SaslInteractionHandler.cpp 2008-04-15 02:09:26.000000000 +0300 -+++ openldap-2.4.17/contrib/ldapc++/src/SaslInteractionHandler.cpp 2009-08-10 13:21:24.000000000 +0300 +--- a/contrib/ldapc++/src/SaslInteractionHandler.cpp ++++ b/contrib/ldapc++/src/SaslInteractionHandler.cpp @@ -13,6 +13,7 @@ #include <termios.h> #endif diff --git a/net-nds/openldap/files/openldap-2.4.28-fix-dash.patch b/net-nds/openldap/files/openldap-2.4.28-fix-dash.patch index d15c3d2231f4..bca213dbc6ce 100644 --- a/net-nds/openldap/files/openldap-2.4.28-fix-dash.patch +++ b/net-nds/openldap/files/openldap-2.4.28-fix-dash.patch @@ -11,8 +11,6 @@ Patch unbreaks build when /bin/sh points to dash: eval: 1: base_compile+= x86_64-pc-linux-gnu-gcc: not found ... make[2]: *** [decode.lo] Error 1 -diff --git a/build/top.mk b/build/top.mk -index 6fea488..ea324e3 100644 --- a/build/top.mk +++ b/build/top.mk @@ -20,7 +20,7 @@ VERSION= @VERSION@ diff --git a/net-nds/openldap/files/openldap-2.4.28-gnutls-gcrypt.patch b/net-nds/openldap/files/openldap-2.4.28-gnutls-gcrypt.patch index aeecb0f40132..0d9b88f47627 100644 --- a/net-nds/openldap/files/openldap-2.4.28-gnutls-gcrypt.patch +++ b/net-nds/openldap/files/openldap-2.4.28-gnutls-gcrypt.patch @@ -1,5 +1,5 @@ ---- openldap-2.4.28/configure.in.orig 2012-02-11 22:40:36.004360795 +0000 -+++ openldap-2.4.28/configure.in 2012-02-11 22:40:13.410986851 +0000 +--- a/configure.in ++++ b/configure.in @@ -1214,7 +1214,7 @@ ol_with_tls=gnutls ol_link_tls=yes diff --git a/net-nds/openldap/files/openldap-2.4.35-contrib-samba4.patch b/net-nds/openldap/files/openldap-2.4.35-contrib-samba4.patch index 4312dc7c55ea..8ee3891f3cb6 100644 --- a/net-nds/openldap/files/openldap-2.4.35-contrib-samba4.patch +++ b/net-nds/openldap/files/openldap-2.4.35-contrib-samba4.patch @@ -1,6 +1,5 @@ -diff -Nuar openldap-2.4.35.orig/contrib/slapd-modules/samba4/Makefile openldap-2.4.35/contrib/slapd-modules/samba4/Makefile ---- openldap-2.4.35.orig/contrib/slapd-modules/samba4/Makefile 2013-03-28 15:41:51.000000000 +0000 -+++ openldap-2.4.35/contrib/slapd-modules/samba4/Makefile 2013-04-16 02:16:40.651868432 +0000 +--- a/contrib/slapd-modules/samba4/Makefile ++++ b/contrib/slapd-modules/samba4/Makefile @@ -20,7 +20,8 @@ LIBTOOL = $(LDAP_BUILD)/libtool diff --git a/net-nds/openldap/files/openldap-2.4.35-contrib-smbk5pwd.patch b/net-nds/openldap/files/openldap-2.4.35-contrib-smbk5pwd.patch index 4383802a0ead..ca02404c8812 100644 --- a/net-nds/openldap/files/openldap-2.4.35-contrib-smbk5pwd.patch +++ b/net-nds/openldap/files/openldap-2.4.35-contrib-smbk5pwd.patch @@ -1,6 +1,5 @@ -diff -Nuar openldap-2.4.35.orig/contrib/slapd-modules/smbk5pwd/Makefile openldap-2.4.35/contrib/slapd-modules/smbk5pwd/Makefile ---- openldap-2.4.35.orig/contrib/slapd-modules/smbk5pwd/Makefile 2013-03-28 15:41:51.000000000 +0000 -+++ openldap-2.4.35/contrib/slapd-modules/smbk5pwd/Makefile 2013-04-16 02:13:38.939913119 +0000 +--- a/contrib/slapd-modules/smbk5pwd/Makefile ++++ b/contrib/slapd-modules/smbk5pwd/Makefile @@ -21,16 +21,23 @@ SSL_INC = SSL_LIB = -lcrypto diff --git a/net-nds/openldap/files/openldap-2.4.42-mdb-unbundle.patch b/net-nds/openldap/files/openldap-2.4.42-mdb-unbundle.patch index 9265a01701ab..6ec68885b5e7 100644 --- a/net-nds/openldap/files/openldap-2.4.42-mdb-unbundle.patch +++ b/net-nds/openldap/files/openldap-2.4.42-mdb-unbundle.patch @@ -1,5 +1,5 @@ ---- ./build/top.mk.orig 2014-10-24 14:34:59.260827298 +0200 -+++ ./build/top.mk 2014-10-24 14:35:25.281168893 +0200 +--- a/build/top.mk ++++ b/build/top.mk @@ -160,6 +160,7 @@ LTHREAD_LIBS = @LTHREAD_LIBS@ @@ -8,8 +8,8 @@ SLAPD_NDB_LIBS = @SLAPD_NDB_LIBS@ LDAP_LIBLBER_LA = $(LDAP_LIBDIR)/liblber/liblber.la ---- ./build/openldap.m4.orig 2014-10-24 10:52:02.837221734 +0200 -+++ ./build/openldap.m4 2014-10-24 11:31:02.748087966 +0200 +--- ./build/openldap.m4.orig ++++ ./build/openldap.m4 @@ -563,6 +563,38 @@ ], [ol_cv_bdb_compat=yes], [ol_cv_bdb_compat=no])]) ]) @@ -49,8 +49,8 @@ dnl dnl ==================================================================== dnl Check POSIX Thread version ---- ./servers/slapd/back-mdb/Makefile.in.orig 2014-10-24 10:31:30.860931076 +0200 -+++ ./servers/slapd/back-mdb/Makefile.in 2014-10-24 14:33:33.803705424 +0200 +--- a/servers/slapd/back-mdb/Makefile.in ++++ b/servers/slapd/back-mdb/Makefile.in @@ -25,11 +25,10 @@ extended.lo operational.lo \ attr.lo index.lo key.lo filterindex.lo \ @@ -85,8 +85,8 @@ - veryclean-local-lib: FORCE $(RM) $(XXHEADERS) $(XXSRCS) .links ---- ./configure.in.orig 2014-10-24 10:46:53.289139847 +0200 -+++ ./configure.in 2014-10-24 10:51:34.372846374 +0200 +--- a/configure.in ++++ b/configure.in @@ -519,6 +519,7 @@ dnl Initialize vars LDAP_LIBS= diff --git a/net-nds/openldap/files/openldap-2.4.45-fix-lmpasswd-gnutls-symbols.patch b/net-nds/openldap/files/openldap-2.4.45-fix-lmpasswd-gnutls-symbols.patch index 29688fcb14c8..05e515cd47d1 100644 --- a/net-nds/openldap/files/openldap-2.4.45-fix-lmpasswd-gnutls-symbols.patch +++ b/net-nds/openldap/files/openldap-2.4.45-fix-lmpasswd-gnutls-symbols.patch @@ -7,8 +7,8 @@ X-Gentoo-Bug: http://bugs.gentoo.org/show_bug.cgi?id=233633 X-Upstream-Bug: http://www.openldap.org/its/index.cgi/Software%20Enhancements?id=4997 X-Debian-Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=245341 ---- openldap-2.4.17.orig/libraries/liblutil/passwd.c 2009-07-27 18:59:19.635995474 -0700 -+++ openldap-2.4.17/libraries/liblutil/passwd.c 2009-07-27 19:01:13.588069010 -0700 +--- a/libraries/liblutil/passwd.c ++++ b/libraries/liblutil/passwd.c @@ -51,6 +51,26 @@ typedef unsigned char des_data_block[8]; typedef PK11Context *des_context[1]; #define DES_ENCRYPT CKA_ENCRYPT diff --git a/net-nds/openldap/files/openldap-2.4.47-warnings.patch b/net-nds/openldap/files/openldap-2.4.47-warnings.patch index d75bd0d3c5d7..10f21114954e 100644 --- a/net-nds/openldap/files/openldap-2.4.47-warnings.patch +++ b/net-nds/openldap/files/openldap-2.4.47-warnings.patch @@ -1,5 +1,3 @@ -diff --git a/include/ldap.h b/include/ldap.h -index c245651c2..7f14f1051 100644 --- a/include/ldap.h +++ b/include/ldap.h @@ -2041,6 +2041,10 @@ LDAP_F( int ) @@ -13,8 +11,6 @@ index c245651c2..7f14f1051 100644 LDAP_F( int ) ldap_url_parse LDAP_P(( LDAP_CONST char *url, -diff --git a/include/ldap_int_thread.h b/include/ldap_int_thread.h -index e2dd8a942..bbc07c845 100644 --- a/include/ldap_int_thread.h +++ b/include/ldap_int_thread.h @@ -33,7 +33,7 @@ LDAP_END_DECL @@ -26,8 +22,6 @@ index e2dd8a942..bbc07c845 100644 #include <pthread.h> #ifdef HAVE_SCHED_H #include <sched.h> -diff --git a/libraries/libldap/tls2.c b/libraries/libldap/tls2.c -index d25c190ea..639f598e7 100644 --- a/libraries/libldap/tls2.c +++ b/libraries/libldap/tls2.c @@ -76,6 +76,8 @@ static oid_name oids[] = { diff --git a/net-nds/openldap/files/openldap-2.4.6-evolution-ntlm.patch b/net-nds/openldap/files/openldap-2.4.6-evolution-ntlm.patch index 33ff29e0aed2..e8bcc50502c9 100644 --- a/net-nds/openldap/files/openldap-2.4.6-evolution-ntlm.patch +++ b/net-nds/openldap/files/openldap-2.4.6-evolution-ntlm.patch @@ -1,6 +1,5 @@ -diff -up evo-openldap-2.4.14/include/ldap.h.evolution-ntlm evo-openldap-2.4.14/include/ldap.h ---- evo-openldap-2.4.14/include/ldap.h.evolution-ntlm 2009-01-27 00:29:53.000000000 +0100 -+++ evo-openldap-2.4.14/include/ldap.h 2009-02-17 10:10:00.000000000 +0100 +--- a/include/ldap.h ++++ b/include/ldap.h @@ -2461,5 +2461,26 @@ ldap_parse_deref_control LDAP_P(( LDAPControl **ctrls, LDAPDerefRes **drp )); @@ -28,9 +27,8 @@ diff -up evo-openldap-2.4.14/include/ldap.h.evolution-ntlm evo-openldap-2.4.14/i + LDAP_END_DECL #endif /* _LDAP_H */ -diff -up evo-openldap-2.4.14/libraries/libldap/Makefile.in.evolution-ntlm evo-openldap-2.4.14/libraries/libldap/Makefile.in ---- evo-openldap-2.4.14/libraries/libldap/Makefile.in.evolution-ntlm 2009-01-27 00:29:53.000000000 +0100 -+++ evo-openldap-2.4.14/libraries/libldap/Makefile.in 2009-02-17 10:10:00.000000000 +0100 +--- a/libraries/libldap/Makefile.in ++++ b/libraries/libldap/Makefile.in @@ -20,7 +20,7 @@ PROGRAMS = apitest dntest ftest ltest ur SRCS = bind.c open.c result.c error.c compare.c search.c \ controls.c messages.c references.c extended.c cyrus.c \ @@ -49,9 +47,8 @@ diff -up evo-openldap-2.4.14/libraries/libldap/Makefile.in.evolution-ntlm evo-op filter.lo free.lo sort.lo passwd.lo whoami.lo \ getdn.lo getentry.lo getattr.lo getvalues.lo addentry.lo \ request.lo os-ip.lo url.lo pagectrl.lo sortctrl.lo vlvctrl.lo \ -diff -up /dev/null evo-openldap-2.4.14/libraries/libldap/ntlm.c ---- /dev/null 2009-02-17 09:19:52.829004420 +0100 -+++ evo-openldap-2.4.14/libraries/libldap/ntlm.c 2009-02-17 10:10:00.000000000 +0100 +--- /dev/null ++++ b/libraries/libldap/ntlm.c @@ -0,0 +1,137 @@ +/* $OpenLDAP: pkg/ldap/libraries/libldap/ntlm.c,v 1.1.4.10 2002/01/04 20:38:21 kurt Exp $ */ +/* diff --git a/net-nds/openldap/files/openldap-2.6.1-cloak.patch b/net-nds/openldap/files/openldap-2.6.1-cloak.patch index 8fab052d4db1..e023a14e4940 100644 --- a/net-nds/openldap/files/openldap-2.6.1-cloak.patch +++ b/net-nds/openldap/files/openldap-2.6.1-cloak.patch @@ -1,5 +1,3 @@ -diff --git a/contrib/slapd-modules/cloak/cloak.c b/contrib/slapd-modules/cloak/cloak.c -index ced7a8024..dffce3614 100644 --- a/contrib/slapd-modules/cloak/cloak.c +++ b/contrib/slapd-modules/cloak/cloak.c @@ -29,6 +29,7 @@ @@ -10,8 +8,6 @@ index ced7a8024..dffce3614 100644 #include "slap.h" #include "slap-config.h" -diff --git a/servers/slapd/attr.h b/servers/slapd/attr.h -index e69de29bb..73949f60c 100644 --- a/servers/slapd/attr.h +++ b/servers/slapd/attr.h @@ -0,0 +1,8 @@ diff --git a/net-nds/openldap/files/openldap-2.6.1-fix-bashism-configure.patch b/net-nds/openldap/files/openldap-2.6.1-fix-bashism-configure.patch new file mode 100644 index 000000000000..c2acb679e3ba --- /dev/null +++ b/net-nds/openldap/files/openldap-2.6.1-fix-bashism-configure.patch @@ -0,0 +1,11 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -2055,7 +2055,7 @@ dnl + WITH_SYSTEMD=no + systemdsystemunitdir= + ol_link_systemd=no +-if test $ol_enable_slapd == no && test $ol_enable_balancer != yes ; then ++if test $ol_enable_slapd = no && test $ol_enable_balancer != yes ; then + if test $ol_with_systemd != no ; then + AC_MSG_WARN([servers disabled, ignoring --with-systemd=$ol_with_systemd argument]) + ol_with_systemd=no diff --git a/net-nds/openldap/files/openldap-2.6.1-fix-missing-mapping.patch b/net-nds/openldap/files/openldap-2.6.1-fix-missing-mapping.patch index be7fbf3e528d..1d6595566c73 100644 --- a/net-nds/openldap/files/openldap-2.6.1-fix-missing-mapping.patch +++ b/net-nds/openldap/files/openldap-2.6.1-fix-missing-mapping.patch @@ -3,12 +3,6 @@ From: Simon Pichugin <spichugi@redhat.com> Date: Wed, 3 Nov 2021 19:03:40 -0700 Subject: [PATCH] Fix missing mapping ---- - libraries/liblber/lber.map | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/libraries/liblber/lber.map b/libraries/liblber/lber.map -index 9a4094b0f..083cd1f32 100644 --- a/libraries/liblber/lber.map +++ b/libraries/liblber/lber.map @@ -121,6 +121,7 @@ OPENLDAP_2.200 diff --git a/net-nds/openldap/files/openldap-2.6.1-flags.patch b/net-nds/openldap/files/openldap-2.6.1-flags.patch index 019bd9f6fd33..39ceeecb1742 100644 --- a/net-nds/openldap/files/openldap-2.6.1-flags.patch +++ b/net-nds/openldap/files/openldap-2.6.1-flags.patch @@ -1,5 +1,3 @@ -diff --git a/contrib/slapd-modules/acl/Makefile b/contrib/slapd-modules/acl/Makefile -index 2195e2d72..3efaaad72 100644 --- a/contrib/slapd-modules/acl/Makefile +++ b/contrib/slapd-modules/acl/Makefile @@ -8,7 +8,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ @@ -11,8 +9,6 @@ index 2195e2d72..3efaaad72 100644 DEFS = INCS = $(LDAP_INC) LIBS = $(LDAP_LIB) -diff --git a/contrib/slapd-modules/addpartial/Makefile b/contrib/slapd-modules/addpartial/Makefile -index ecb7cd0a3..e278dc080 100644 --- a/contrib/slapd-modules/addpartial/Makefile +++ b/contrib/slapd-modules/addpartial/Makefile @@ -8,7 +8,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ @@ -24,8 +20,6 @@ index ecb7cd0a3..e278dc080 100644 DEFS = INCS = $(LDAP_INC) LIBS = $(LDAP_LIB) -diff --git a/contrib/slapd-modules/adremap/Makefile b/contrib/slapd-modules/adremap/Makefile -index b008eabd6..23d3658c3 100644 --- a/contrib/slapd-modules/adremap/Makefile +++ b/contrib/slapd-modules/adremap/Makefile @@ -19,7 +19,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ @@ -37,8 +31,6 @@ index b008eabd6..23d3658c3 100644 DEFS = -DSLAPD_OVER_ADREMAP=SLAPD_MOD_DYNAMIC INCS = $(LDAP_INC) LIBS = $(LDAP_LIB) -diff --git a/contrib/slapd-modules/allop/Makefile b/contrib/slapd-modules/allop/Makefile -index 053f3774a..11998ce87 100644 --- a/contrib/slapd-modules/allop/Makefile +++ b/contrib/slapd-modules/allop/Makefile @@ -9,7 +9,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ @@ -50,8 +42,6 @@ index 053f3774a..11998ce87 100644 DEFS = INCS = $(LDAP_INC) LIBS = $(LDAP_LIB) -diff --git a/contrib/slapd-modules/allowed/Makefile b/contrib/slapd-modules/allowed/Makefile -index 32cb43241..674d6cafd 100644 --- a/contrib/slapd-modules/allowed/Makefile +++ b/contrib/slapd-modules/allowed/Makefile @@ -20,7 +20,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ @@ -63,8 +53,6 @@ index 32cb43241..674d6cafd 100644 DEFS = -DSLAPD_OVER_ALLOWED=SLAPD_MOD_DYNAMIC INCS = $(LDAP_INC) LIBS = $(LDAP_LIB) -diff --git a/contrib/slapd-modules/authzid/Makefile b/contrib/slapd-modules/authzid/Makefile -index ef9c4bc4f..49a756c35 100644 --- a/contrib/slapd-modules/authzid/Makefile +++ b/contrib/slapd-modules/authzid/Makefile @@ -20,7 +20,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ @@ -76,8 +64,6 @@ index ef9c4bc4f..49a756c35 100644 DEFS = INCS = $(LDAP_INC) LIBS = $(LDAP_LIB) -diff --git a/contrib/slapd-modules/autogroup/Makefile b/contrib/slapd-modules/autogroup/Makefile -index 7dd6613cf..f19acae6c 100644 --- a/contrib/slapd-modules/autogroup/Makefile +++ b/contrib/slapd-modules/autogroup/Makefile @@ -8,7 +8,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ @@ -89,8 +75,6 @@ index 7dd6613cf..f19acae6c 100644 DEFS = INCS = $(LDAP_INC) LIBS = $(LDAP_LIB) -diff --git a/contrib/slapd-modules/cloak/Makefile b/contrib/slapd-modules/cloak/Makefile -index c54e6b134..9360ef2dc 100644 --- a/contrib/slapd-modules/cloak/Makefile +++ b/contrib/slapd-modules/cloak/Makefile @@ -9,7 +9,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ @@ -102,8 +86,6 @@ index c54e6b134..9360ef2dc 100644 DEFS = -DSLAPD_OVER_CLOAK=SLAPD_MOD_DYNAMIC INCS = $(LDAP_INC) LIBS = $(LDAP_LIB) -diff --git a/contrib/slapd-modules/comp_match/Makefile b/contrib/slapd-modules/comp_match/Makefile -index 9b78c5c12..e1cb8fe3c 100644 --- a/contrib/slapd-modules/comp_match/Makefile +++ b/contrib/slapd-modules/comp_match/Makefile @@ -31,7 +31,7 @@ SSL_LIB = -lcrypto -L$(SSL_DIR)/lib @@ -115,8 +97,6 @@ index 9b78c5c12..e1cb8fe3c 100644 DEFS = -DLDAP_COMPONENT INCS = $(LDAP_INC) $(SNACC_INC) $(SSL_INC) LIBS = $(LDAP_LIB) $(SNACC_LIB) $(SSL_LIB) -diff --git a/contrib/slapd-modules/datamorph/Makefile b/contrib/slapd-modules/datamorph/Makefile -index 82bce493c..19231c71d 100644 --- a/contrib/slapd-modules/datamorph/Makefile +++ b/contrib/slapd-modules/datamorph/Makefile @@ -22,7 +22,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ @@ -128,8 +108,6 @@ index 82bce493c..19231c71d 100644 DEFS = -DSLAPD_OVER_DATAMORPH=SLAPD_MOD_DYNAMIC INCS = $(LDAP_INC) LIBS = $(LDAP_LIB) -diff --git a/contrib/slapd-modules/denyop/Makefile b/contrib/slapd-modules/denyop/Makefile -index 2cea18b06..d11dd8d4a 100644 --- a/contrib/slapd-modules/denyop/Makefile +++ b/contrib/slapd-modules/denyop/Makefile @@ -8,7 +8,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ @@ -141,8 +119,6 @@ index 2cea18b06..d11dd8d4a 100644 DEFS = -DSLAPD_OVER_DENYOP=SLAPD_MOD_DYNAMIC INCS = $(LDAP_INC) LIBS = $(LDAP_LIB) -diff --git a/contrib/slapd-modules/dsaschema/Makefile b/contrib/slapd-modules/dsaschema/Makefile -index 3a88fc01f..97e0642f3 100644 --- a/contrib/slapd-modules/dsaschema/Makefile +++ b/contrib/slapd-modules/dsaschema/Makefile @@ -8,7 +8,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ @@ -154,8 +130,6 @@ index 3a88fc01f..97e0642f3 100644 DEFS = INCS = $(LDAP_INC) LIBS = $(LDAP_LIB) -diff --git a/contrib/slapd-modules/dupent/Makefile b/contrib/slapd-modules/dupent/Makefile -index 6b3543862..1cc09a8b4 100644 --- a/contrib/slapd-modules/dupent/Makefile +++ b/contrib/slapd-modules/dupent/Makefile @@ -20,7 +20,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ @@ -167,8 +141,6 @@ index 6b3543862..1cc09a8b4 100644 DEFS = -DSLAPD_OVER_DUPENT=SLAPD_MOD_DYNAMIC INCS = $(LDAP_INC) LIBS = $(LDAP_LIB) -diff --git a/contrib/slapd-modules/kinit/Makefile b/contrib/slapd-modules/kinit/Makefile -index 7b25ced76..9f339e810 100644 --- a/contrib/slapd-modules/kinit/Makefile +++ b/contrib/slapd-modules/kinit/Makefile @@ -8,7 +8,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ @@ -180,8 +152,6 @@ index 7b25ced76..9f339e810 100644 DEFS = INCS = $(LDAP_INC) LIBS = $(LDAP_LIB) -lkrb5 -diff --git a/contrib/slapd-modules/lastbind/Makefile b/contrib/slapd-modules/lastbind/Makefile -index c273cd3a0..da9fa172f 100644 --- a/contrib/slapd-modules/lastbind/Makefile +++ b/contrib/slapd-modules/lastbind/Makefile @@ -19,7 +19,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ @@ -193,8 +163,6 @@ index c273cd3a0..da9fa172f 100644 DEFS = -DSLAPD_OVER_LASTBIND=SLAPD_MOD_DYNAMIC INCS = $(LDAP_INC) LIBS = $(LDAP_LIB) -diff --git a/contrib/slapd-modules/lastmod/Makefile b/contrib/slapd-modules/lastmod/Makefile -index 9b06c28fb..be583722b 100644 --- a/contrib/slapd-modules/lastmod/Makefile +++ b/contrib/slapd-modules/lastmod/Makefile @@ -9,7 +9,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ @@ -206,8 +174,6 @@ index 9b06c28fb..be583722b 100644 DEFS = -DSLAPD_OVER_LASTMOD=SLAPD_MOD_DYNAMIC INCS = $(LDAP_INC) LIBS = $(LDAP_LIB) -diff --git a/contrib/slapd-modules/noopsrch/Makefile b/contrib/slapd-modules/noopsrch/Makefile -index 2934a3214..22a3db04b 100644 --- a/contrib/slapd-modules/noopsrch/Makefile +++ b/contrib/slapd-modules/noopsrch/Makefile @@ -20,7 +20,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ @@ -219,8 +185,6 @@ index 2934a3214..22a3db04b 100644 DEFS = -DSLAPD_OVER_NOOPSRCH=SLAPD_MOD_DYNAMIC INCS = $(LDAP_INC) LIBS = $(LDAP_LIB) -diff --git a/contrib/slapd-modules/nops/Makefile b/contrib/slapd-modules/nops/Makefile -index 94a5bcd23..86dcdfd76 100644 --- a/contrib/slapd-modules/nops/Makefile +++ b/contrib/slapd-modules/nops/Makefile @@ -9,7 +9,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ @@ -232,8 +196,6 @@ index 94a5bcd23..86dcdfd76 100644 DEFS = -DSLAPD_OVER_NOPS=SLAPD_MOD_DYNAMIC INCS = $(LDAP_INC) LIBS = $(LDAP_LIB) -diff --git a/contrib/slapd-modules/nssov/Makefile b/contrib/slapd-modules/nssov/Makefile -index 13987c250..c2c26d473 100644 --- a/contrib/slapd-modules/nssov/Makefile +++ b/contrib/slapd-modules/nssov/Makefile @@ -27,7 +27,7 @@ NLDAPD_INC=-Inss-pam-ldapd @@ -245,8 +207,6 @@ index 13987c250..c2c26d473 100644 CC = gcc DEFS = INCS = $(LDAP_INC) $(NLDAPD_INC) -diff --git a/contrib/slapd-modules/passwd/Makefile b/contrib/slapd-modules/passwd/Makefile -index 634649603..4b6be2617 100644 --- a/contrib/slapd-modules/passwd/Makefile +++ b/contrib/slapd-modules/passwd/Makefile @@ -9,7 +9,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ @@ -258,8 +218,6 @@ index 634649603..4b6be2617 100644 DEFS = INCS = $(LDAP_INC) LIBS = $(LDAP_LIB) -diff --git a/contrib/slapd-modules/passwd/pbkdf2/Makefile b/contrib/slapd-modules/passwd/pbkdf2/Makefile -index 6279f50c1..20769028e 100644 --- a/contrib/slapd-modules/passwd/pbkdf2/Makefile +++ b/contrib/slapd-modules/passwd/pbkdf2/Makefile @@ -9,7 +9,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ @@ -271,8 +229,6 @@ index 6279f50c1..20769028e 100644 #DEFS = -DSLAPD_PBKDF2_DEBUG SSL_INC = -diff --git a/contrib/slapd-modules/passwd/sha2/Makefile b/contrib/slapd-modules/passwd/sha2/Makefile -index 2d2075688..f8a77d24d 100644 --- a/contrib/slapd-modules/passwd/sha2/Makefile +++ b/contrib/slapd-modules/passwd/sha2/Makefile @@ -9,7 +9,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ @@ -284,8 +240,6 @@ index 2d2075688..f8a77d24d 100644 DEFS = #DEFS = -DSLAPD_SHA2_DEBUG INCS = $(LDAP_INC) -diff --git a/contrib/slapd-modules/passwd/totp/Makefile b/contrib/slapd-modules/passwd/totp/Makefile -index f7dff4bd7..463a45248 100644 --- a/contrib/slapd-modules/passwd/totp/Makefile +++ b/contrib/slapd-modules/passwd/totp/Makefile @@ -9,7 +9,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ @@ -297,8 +251,6 @@ index f7dff4bd7..463a45248 100644 DEFS = INCS = $(LDAP_INC) LIBS = $(LDAP_LIB) -diff --git a/contrib/slapd-modules/ppm/Makefile b/contrib/slapd-modules/ppm/Makefile -index 7b6efaddd..f26faca2b 100644 --- a/contrib/slapd-modules/ppm/Makefile +++ b/contrib/slapd-modules/ppm/Makefile @@ -18,7 +18,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/liblber/liblber.la $(LDAP_BUILD)/libraries/li @@ -310,8 +262,6 @@ index 7b6efaddd..f26faca2b 100644 # To skip linking against CRACKLIB make CRACK=no CRACK=yes -diff --git a/contrib/slapd-modules/proxyOld/Makefile b/contrib/slapd-modules/proxyOld/Makefile -index d92967c39..f2e7524a9 100644 --- a/contrib/slapd-modules/proxyOld/Makefile +++ b/contrib/slapd-modules/proxyOld/Makefile @@ -20,7 +20,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ @@ -323,8 +273,6 @@ index d92967c39..f2e7524a9 100644 DEFS = INCS = $(LDAP_INC) LIBS = $(LDAP_LIB) -diff --git a/contrib/slapd-modules/rbac/Makefile b/contrib/slapd-modules/rbac/Makefile -index 1180bd6a1..59b614ade 100755 --- a/contrib/slapd-modules/rbac/Makefile +++ b/contrib/slapd-modules/rbac/Makefile @@ -9,7 +9,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ @@ -336,8 +284,6 @@ index 1180bd6a1..59b614ade 100755 DEFS = -DSLAPD_OVER_RBAC=SLAPD_MOD_DYNAMIC INCS = $(LDAP_INC) LIBS = $(LDAP_LIB) -diff --git a/contrib/slapd-modules/samba4/Makefile b/contrib/slapd-modules/samba4/Makefile -index f53d130d2..a4b6600ca 100644 --- a/contrib/slapd-modules/samba4/Makefile +++ b/contrib/slapd-modules/samba4/Makefile @@ -20,7 +20,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ @@ -349,8 +295,6 @@ index f53d130d2..a4b6600ca 100644 DEFS = -DSLAPD_OVER_RDNVAL=SLAPD_MOD_DYNAMIC \ -DSLAPD_OVER_PGUID=SLAPD_MOD_DYNAMIC \ -DSLAPD_OVER_VERNUM=SLAPD_MOD_DYNAMIC -diff --git a/contrib/slapd-modules/smbk5pwd/Makefile b/contrib/slapd-modules/smbk5pwd/Makefile -index a1c2c8eef..c2b1c16bb 100644 --- a/contrib/slapd-modules/smbk5pwd/Makefile +++ b/contrib/slapd-modules/smbk5pwd/Makefile @@ -27,7 +27,7 @@ HEIMDAL_LIB = -L/usr/heimdal/lib -lkrb5 -lkadm5srv @@ -362,8 +306,6 @@ index a1c2c8eef..c2b1c16bb 100644 # Omit DO_KRB5, DO_SAMBA or DO_SHADOW if you don't want to support it. DEFS = -DDO_KRB5 -DDO_SAMBA -DDO_SHADOW INCS = $(LDAP_INC) $(HEIMDAL_INC) $(SSL_INC) -diff --git a/contrib/slapd-modules/trace/Makefile b/contrib/slapd-modules/trace/Makefile -index 1bf8a5541..9026c2c93 100644 --- a/contrib/slapd-modules/trace/Makefile +++ b/contrib/slapd-modules/trace/Makefile @@ -8,7 +8,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ @@ -375,8 +317,6 @@ index 1bf8a5541..9026c2c93 100644 DEFS = -DSLAPD_OVER_TRACE=SLAPD_MOD_DYNAMIC INCS = $(LDAP_INC) LIBS = $(LDAP_LIB) -diff --git a/contrib/slapd-modules/usn/Makefile b/contrib/slapd-modules/usn/Makefile -index d7af04b10..eae938a3e 100644 --- a/contrib/slapd-modules/usn/Makefile +++ b/contrib/slapd-modules/usn/Makefile @@ -8,7 +8,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ @@ -388,8 +328,6 @@ index d7af04b10..eae938a3e 100644 DEFS = -DSLAPD_OVER_USN=SLAPD_MOD_DYNAMIC INCS = $(LDAP_INC) LIBS = $(LDAP_LIB) -diff --git a/contrib/slapd-modules/variant/Makefile b/contrib/slapd-modules/variant/Makefile -index 07effed6c..a83373b48 100644 --- a/contrib/slapd-modules/variant/Makefile +++ b/contrib/slapd-modules/variant/Makefile @@ -22,7 +22,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ @@ -401,8 +339,6 @@ index 07effed6c..a83373b48 100644 DEFS = -DSLAPD_OVER_VARIANT=SLAPD_MOD_DYNAMIC INCS = $(LDAP_INC) LIBS = $(LDAP_LIB) -diff --git a/contrib/slapd-modules/vc/Makefile b/contrib/slapd-modules/vc/Makefile -index 9fe67ab27..526037e50 100644 --- a/contrib/slapd-modules/vc/Makefile +++ b/contrib/slapd-modules/vc/Makefile @@ -20,7 +20,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ diff --git a/net-nds/openldap/files/openldap-2.6.1-system-mdb.patch b/net-nds/openldap/files/openldap-2.6.1-system-mdb.patch index ad8aaba0157a..e29ba0be964a 100644 --- a/net-nds/openldap/files/openldap-2.6.1-system-mdb.patch +++ b/net-nds/openldap/files/openldap-2.6.1-system-mdb.patch @@ -1,5 +1,3 @@ -diff --git a/build/openldap.m4 b/build/openldap.m4 -index 91e2608b8..493f85ae8 100644 --- a/build/openldap.m4 +++ b/build/openldap.m4 @@ -243,6 +243,40 @@ OL_RESOLVER_TRY(ol_cv_resolver_none) @@ -43,8 +41,6 @@ index 91e2608b8..493f85ae8 100644 dnl dnl ==================================================================== dnl Check POSIX Thread version -diff --git a/build/top.mk b/build/top.mk -index 67873d9f3..8d8787ecb 100644 --- a/build/top.mk +++ b/build/top.mk @@ -164,6 +164,7 @@ CLIENT_LIBS = @CLIENT_LIBS@ @@ -55,8 +51,6 @@ index 67873d9f3..8d8787ecb 100644 SLAPD_NDB_LIBS = @SLAPD_NDB_LIBS@ WT_LIBS = @WT_LIBS@ -diff --git a/configure.ac b/configure.ac -index 9012d0b28..52dd72eb6 100644 --- a/configure.ac +++ b/configure.ac @@ -547,6 +547,7 @@ AC_MSG_RESULT(done) @@ -108,8 +102,6 @@ index 9012d0b28..52dd72eb6 100644 AC_SUBST(BALANCER_LIBS) AC_SUBST(SLAPD_NDB_LIBS) AC_SUBST(SLAPD_NDB_INCS) -diff --git a/servers/slapd/back-mdb/Makefile.in b/servers/slapd/back-mdb/Makefile.in -index ad3804898..f9319e227 100644 --- a/servers/slapd/back-mdb/Makefile.in +++ b/servers/slapd/back-mdb/Makefile.in @@ -25,11 +25,10 @@ OBJS = init.lo tools.lo config.lo \ diff --git a/net-nds/openldap/files/slapd-initd b/net-nds/openldap/files/slapd-initd index ecd8f650a217..a8e98646569a 100644 --- a/net-nds/openldap/files/slapd-initd +++ b/net-nds/openldap/files/slapd-initd @@ -8,7 +8,7 @@ depend() { } start() { - checkpath -q -d /var/run/openldap/ -o ldap:ldap + checkpath -q -d /var/run/openldap/ -o ldap:ldap if ! checkconfig ; then eerror "There is a problem with your slapd.conf!" return 1 @@ -20,10 +20,10 @@ start() { stop() { ebegin "Stopping ldap-server" - start-stop-daemon --stop --signal 2 --quiet --pidfile /var/run/openldap/slapd.pid + start-stop-daemon --stop --signal 2 --quiet --pidfile /var/run/openldap/slapd.pid eend $? } -checkconfig() { - /usr/sbin/slaptest -u "$@" ${OPTS_CONF} +checkconfig() { + /usr/sbin/slaptest -u "$@" ${OPTS_CONF} } diff --git a/net-nds/openldap/files/slapd-initd-2.4.40-r2 b/net-nds/openldap/files/slapd-initd-2.4.40-r2 index 722b6c20de79..bf408e3d6ecd 100644 --- a/net-nds/openldap/files/slapd-initd-2.4.40-r2 +++ b/net-nds/openldap/files/slapd-initd-2.4.40-r2 @@ -57,7 +57,7 @@ checkconfig() { if [ $? -ne 0 ]; then ewarn "You have files in $d not owned by the ldap user, you must ensure they are accessible to the slapd instance!" fi - [ ! -e $d/DB_CONFIG ] && ewarn "$d/DB_CONFIG does not exist, slapd performance may be sub-optimal" + [ ! -e $d/DB_CONFIG ] && ewarn "$d/DB_CONFIG does not exist, slapd performance may be sub-optimal" done # now test the config fully /usr/sbin/slaptest -u "$@" ${OPTS_CONF} diff --git a/net-nds/openldap/openldap-2.6.1.ebuild b/net-nds/openldap/openldap-2.6.1-r1.ebuild index 971bbbe40b39..7091232465cf 100644 --- a/net-nds/openldap/openldap-2.6.1.ebuild +++ b/net-nds/openldap/openldap-2.6.1-r1.ebuild @@ -19,11 +19,12 @@ SRC_URI=" mirror://gentoo/${BIS_P}" LICENSE="OPENLDAP GPL-2" -SLOT="0" +# Subslot added for bug #835654 +SLOT="0/$(ver_cut 1-2)" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris" IUSE_DAEMON="argon2 +cleartext crypt experimental minimal samba tcpd" -IUSE_OVERLAY="overlays perl" +IUSE_OVERLAY="overlays perl autoca" IUSE_OPTIONAL="debug gnutls iodbc ipv6 odbc sasl ssl selinux static-libs +syslog test" IUSE_CONTRIB="kerberos kinit pbkdf2 sha2 smbkrb5passwd" IUSE_CONTRIB="${IUSE_CONTRIB} cxx" @@ -34,20 +35,14 @@ RESTRICT="!test? ( test )" REQUIRED_USE="cxx? ( sasl ) pbkdf2? ( ssl ) test? ( cleartext sasl ) + autoca? ( !gnutls ) ?? ( test minimal )" S=${WORKDIR}/${PN}-OPENLDAP_REL_ENG_${MY_PV} -# always list newer first -# Do not add any AGPL-3 BDB here! -# See bug 525110, comment 15. -# Advanced usage: OPENLDAP_BDB_SLOTS in the environment can be used to force a slot during build. -BDB_SLOTS="${OPENLDAP_BDB_SLOTS:=5.3 4.8}" -BDB_PKGS='' -for _slot in $BDB_SLOTS; do BDB_PKGS="${BDB_PKGS} sys-libs/db:${_slot}" ; done - # openssl is needed to generate lanman-passwords required by samba COMMON_DEPEND=" + kernel_linux? ( sys-apps/util-linux ) ssl? ( !gnutls? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] @@ -78,7 +73,7 @@ COMMON_DEPEND=" kerberos? ( virtual/krb5 kinit? ( !app-crypt/heimdal ) - ) + ) ) " DEPEND="${COMMON_DEPEND} @@ -144,6 +139,8 @@ PATCHES=( "${FILESDIR}"/${PN}-2.6.1-cloak.patch "${FILESDIR}"/${PN}-2.6.1-flags.patch "${FILESDIR}"/${PN}-2.6.1-fix-missing-mapping.patch + "${FILESDIR}"/${PN}-2.6.1-make-flags.patch + "${FILESDIR}"/${PN}-2.6.1-fix-bashism-configure.patch ) openldap_filecount() { @@ -228,6 +225,7 @@ openldap_find_versiontags() { [[ "${have_files}" == "1" ]] && einfo "DB files present" || einfo "No DB files present" # Now we must check for the major version of sys-libs/db linked against. + # TODO: remove this as we dropped bdb support (gone upstream) in 2.6.1? SLAPD_PATH="${EROOT}/usr/$(get_libdir)/openldap/slapd" if [[ "${have_files}" == "1" ]] && [[ -f "${SLAPD_PATH}" ]]; then OLDVER="$(/usr/bin/ldd ${SLAPD_PATH} \ @@ -421,6 +419,7 @@ multilib_src_configure() { fi use overlays && myconf+=( --enable-overlays=mod ) + use autoca && myconf+=( --enable-autoca=mod ) || myconf+=( --enable-autoca=no ) # compile-in the syncprov myconf+=( --enable-syncprov=yes ) @@ -440,6 +439,7 @@ multilib_src_configure() { --disable-slapd --disable-mdb --disable-overlays + --disable-autoca --disable-syslog --without-systemd ) @@ -610,7 +610,15 @@ multilib_src_compile() { multilib_src_test() { if multilib_is_native_abi; then - emake test + cd "tests" + pwd + # emake test => runs only lloadd & mdb, in serial; skips ldif,sql,wt,regression + # emake partests => runs ALL of the tests in parallel + # wt/WiredTiger is not supported in Gentoo + TESTS=( plloadd pmdb ) + #TESTS+=( pldif ) # not done by default, so also exclude here + #use odbc && TESTS+=( psql ) # not done by default, so also exclude here + emake "${TESTS[@]}" fi } @@ -785,9 +793,6 @@ pkg_postinst() { elog "Getting started using OpenLDAP? There is some documentation available:" elog "Gentoo Guide to OpenLDAP Authentication" elog "(https://wiki.gentoo.org/wiki/Centralized_authentication_using_OpenLDAP)" - elog "---" - elog "An example file for tuning BDB backends with openldap is" - elog "DB_CONFIG.fast.example in /usr/share/doc/${PF}/" fi preserve_old_lib_notify /usr/$(get_libdir)/{liblber,libldap,libldap_r}-2.4$(get_libname 0) |