diff --git a/.files b/.files index 368e04e..11e1d43 100644 Binary files a/.files and b/.files differ diff --git a/.rev b/.rev index beb9aff..5ea9d66 100644 --- a/.rev +++ b/.rev @@ -550,4 +550,12 @@ 967410 + + 2b2c55650cae5595d946c9945b03632a + 2.1.1~git8.d50340ba5 + + dimstar_suse + + 969617 + diff --git a/.servicemark b/.servicemark index daea6fa..cd02ee3 100644 --- a/.servicemark +++ b/.servicemark @@ -1 +1 @@ -272166fbbd8e1cd882c34169f790f69f +60dfbc44a9064c3e21744d1b4ee2d1d1 diff --git a/389-ds-base-2.1.1~git5.e988a3f55.tar.xz b/389-ds-base-2.1.1~git5.e988a3f55.tar.xz deleted file mode 120000 index 8763fd6..0000000 --- a/389-ds-base-2.1.1~git5.e988a3f55.tar.xz +++ /dev/null @@ -1 +0,0 @@ -/ipfs/bafybeia5u5r5n3mmbxi77vvfvxkw6hlzppizsw5vtzra7t3v3uteqlggvu \ No newline at end of file diff --git a/389-ds-base-2.1.1~git8.d50340ba5.tar.xz b/389-ds-base-2.1.1~git8.d50340ba5.tar.xz new file mode 120000 index 0000000..924d510 --- /dev/null +++ b/389-ds-base-2.1.1~git8.d50340ba5.tar.xz @@ -0,0 +1 @@ +/ipfs/bafybeie2sfdpxt5ey6b46m5zw6g6tf27vzvyzii7t4bjqnpckggsgoq25a \ No newline at end of file diff --git a/389-ds-base.obsinfo b/389-ds-base.obsinfo index cd345f4..8b600c7 100644 --- a/389-ds-base.obsinfo +++ b/389-ds-base.obsinfo @@ -1,4 +1,4 @@ name: 389-ds-base -version: 2.1.1~git5.e988a3f55 -mtime: 1649300102 -commit: e988a3f55f5188abf08a3d3cce82fe7145b42daa +version: 2.1.1~git8.d50340ba5 +mtime: 1649815256 +commit: d50340ba572a3d7c033bc3c23619036af81df5e2 diff --git a/389-ds.changes b/389-ds.changes index 5257eec..7bd4aa4 100644 --- a/389-ds.changes +++ b/389-ds.changes @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Wed Apr 13 02:07:17 UTC 2022 - william.brown@suse.com + +- Update to version 2.1.1~git8.d50340ba5: + * Issue 5260 - BUG - OpenLDAP allows multiple names of memberof overlay (#5261) + * Issue 5252 - During DEL, vlv search can erroneously return NULL candidate (#5256) + * Issue 5210 - Python undefined names in lib389 + +------------------------------------------------------------------- Thu Apr 07 02:56:02 UTC 2022 - william.brown@suse.com - Resolve bsc#1197896 - update samba schema to upstream latest diff --git a/389-ds.spec b/389-ds.spec index 250686d..407b980 100644 --- a/389-ds.spec +++ b/389-ds.spec @@ -33,7 +33,7 @@ %define svrcorelib libsvrcore0 Name: 389-ds -Version: 2.1.1~git5.e988a3f55 +Version: 2.1.1~git8.d50340ba5 Release: 0 Summary: 389 Directory Server License: GPL-3.0-or-later AND MPL-2.0 @@ -43,7 +43,7 @@ Source: 389-ds-base-%{version}.tar.xz Source1: extra-schema.tgz Source2: LICENSE.openldap Source3: vendor.tar.xz -Source4: supportutils-plugin-dirsrv-v0.1.0~git2.4c54cf4.tar.xz +Source4: supportutils-plugin-dirsrv.tar.xz Source5: 70yast.ldif Source9: %{name}-rpmlintrc Source10: %{user_group}-user.conf @@ -290,7 +290,7 @@ cp -R extra-schema "%{buildroot}/%{_datadir}/dirsrv/" cp %{SOURCE5} "%{buildroot}/%{_datadir}/dirsrv/schema/" # Install the support utils plugin. -cp supportutils-plugin-dirsrv-*/dirsrv "%{buildroot}/usr/lib/supportconfig/plugins/dirsrv" +cp supportutils-plugin-dirsrv*/dirsrv "%{buildroot}/usr/lib/supportconfig/plugins/dirsrv" # bring OpenLDAP copyright notice here because it is referenced by several extra schema files cp %{SOURCE2} ./ @@ -301,6 +301,9 @@ mv src/svrcore/README{,.svrcore} mv src/svrcore/LICENSE{,.svrcore} install -m 0644 %{SOURCE10} %{buildroot}%{_sysusersdir}/ +# For the purposes of our krb integration, we enable this by default. +mv %{buildroot}%{_datadir}/dirsrv/data/60kerberos.ldif %{buildroot}%{_datadir}/dirsrv/schema/60kerberos.ldif + # Sssshhh duplicate checker ... %fdupes %{buildroot}/%{_prefix} diff --git a/_service b/_service index aa20813..575c31d 100644 --- a/_service +++ b/_service @@ -23,6 +23,7 @@ 389-ds-base + diff --git a/supportutils-plugin-dirsrv-v0.1.0~git2.4c54cf4.tar.xz b/supportutils-plugin-dirsrv-v0.1.0~git2.4c54cf4.tar.xz deleted file mode 120000 index 8898efa..0000000 --- a/supportutils-plugin-dirsrv-v0.1.0~git2.4c54cf4.tar.xz +++ /dev/null @@ -1 +0,0 @@ -/ipfs/bafkreiftpgbxnpq2v6gelb76rjq53ye52v2xqhrv63cike4eoeicijviam \ No newline at end of file diff --git a/supportutils-plugin-dirsrv.tar.xz b/supportutils-plugin-dirsrv.tar.xz new file mode 120000 index 0000000..f0e4350 --- /dev/null +++ b/supportutils-plugin-dirsrv.tar.xz @@ -0,0 +1 @@ +/ipfs/bafkreibsi5ub2553vgwl2pyqpte23vwo57ffrvu6pd63fiygkeeojgxd5u \ No newline at end of file diff --git a/vendor.tar.xz b/vendor.tar.xz index 9682ece..971ce75 120000 --- a/vendor.tar.xz +++ b/vendor.tar.xz @@ -1 +1 @@ -/ipfs/bafybeihwrq5rxcgdvwtnjgvo6tgl2tvhpakh2dvtybdyruir6h4jyxds7i \ No newline at end of file +/ipfs/bafybeid4gsujxkj27rvphvomjbuyj2pjznwqwjqkkbynf6odljqqyze6uu \ No newline at end of file