Your message dated Mon, 19 Jun 2023 16:49:17 +0000
with message-id <e1qbi45-00hdij...@fasolo.debian.org>
and subject line Bug#1037345: fixed in 389-ds-base 2.3.4+dfsg1-1
has caused the Debian Bug report #1037345,
regarding 389-ds-base: ftbfs with rust-base64 0.21
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact ow...@bugs.debian.org
immediately.)
--
1037345: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1037345
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Package: 389-ds-base
Version: 2.3.1+dfsg1-1
Tags: trixie, sid, ftbfs
389-ds-base FTBFS with the new version of rust-base64.
I attach a patch which makes the package build, and also fixes some
packaging annoyances. I have not tested it beyond that. I may or may not
NMU this later.
diff -Nru 389-ds-base-2.3.1+dfsg1/debian/changelog
389-ds-base-2.3.1+dfsg1/debian/changelog
--- 389-ds-base-2.3.1+dfsg1/debian/changelog 2023-01-24 11:21:19.000000000
+0000
+++ 389-ds-base-2.3.1+dfsg1/debian/changelog 2023-06-11 13:22:07.000000000
+0000
@@ -1,3 +1,13 @@
+389-ds-base (2.3.1+dfsg1-1.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Add patch for base64 0.21
+ * Make Debian dependency on base64 match cargo dependency.
+ * Improve clean target.
+ * Use ln -fs instead of ln -s to allow resuming build after fixing errors.
+
+ -- Peter Michael Green <plugw...@debian.org> Sun, 11 Jun 2023 13:22:07 +0000
+
389-ds-base (2.3.1+dfsg1-1) unstable; urgency=medium
* Repackage the source, filter vendored crates and allow building with
diff -Nru 389-ds-base-2.3.1+dfsg1/debian/control
389-ds-base-2.3.1+dfsg1/debian/control
--- 389-ds-base-2.3.1+dfsg1/debian/control 2023-01-24 11:21:16.000000000
+0000
+++ 389-ds-base-2.3.1+dfsg1/debian/control 2023-06-11 13:22:07.000000000
+0000
@@ -27,7 +27,7 @@
libpci-dev,
libpcre2-dev,
libperl-dev,
- librust-base64-dev,
+ librust-base64-0.21-dev,
librust-cbindgen-dev,
librust-cc-dev,
librust-crossbeam-dev,
diff -Nru 389-ds-base-2.3.1+dfsg1/debian/patches/base64-0.21.diff
389-ds-base-2.3.1+dfsg1/debian/patches/base64-0.21.diff
--- 389-ds-base-2.3.1+dfsg1/debian/patches/base64-0.21.diff 1970-01-01
00:00:00.000000000 +0000
+++ 389-ds-base-2.3.1+dfsg1/debian/patches/base64-0.21.diff 2023-06-11
13:22:07.000000000 +0000
@@ -0,0 +1,65 @@
+Description: update for base64 0.21
+Author: Peter Michael Green <plugw...@debian.org>
+
+Index: 389-ds-base-2.3.1+dfsg1.new/src/plugins/pwdchan/src/lib.rs
+===================================================================
+--- 389-ds-base-2.3.1+dfsg1.new.orig/src/plugins/pwdchan/src/lib.rs
++++ 389-ds-base-2.3.1+dfsg1.new/src/plugins/pwdchan/src/lib.rs
+@@ -42,6 +42,12 @@ macro_rules! ab64_to_b64 {
+ }};
+ }
+
++use base64::engine::GeneralPurpose;
++use base64::engine::GeneralPurposeConfig;
++use base64::Engine;
++use base64::alphabet;
++static BASE64CONFIG: GeneralPurposeConfig =
GeneralPurposeConfig::new().with_decode_allow_trailing_bits(true);
++static BASE64ENGINE: GeneralPurpose =
GeneralPurpose::new(&alphabet::STANDARD,BASE64CONFIG);
+ impl PwdChanCrypto {
+ #[inline(always)]
+ fn pbkdf2_decompose(encrypted: &str) -> Result<(usize, Vec<u8>, Vec<u8>),
PluginError> {
+@@ -62,7 +68,7 @@ impl PwdChanCrypto {
+ .ok_or(PluginError::MissingValue)
+ .and_then(|ab64| {
+ let s = ab64_to_b64!(ab64);
+- base64::decode_config(&s,
base64::STANDARD.decode_allow_trailing_bits(true))
++ BASE64ENGINE.decode(&s)
+ .map_err(|e| {
+ log_error!(ErrorLevel::Error, "Invalid Base 64 {} ->
{:?}", s, e);
+ PluginError::InvalidBase64
+@@ -74,7 +80,7 @@ impl PwdChanCrypto {
+ .ok_or(PluginError::MissingValue)
+ .and_then(|ab64| {
+ let s = ab64_to_b64!(ab64);
+- base64::decode_config(&s,
base64::STANDARD.decode_allow_trailing_bits(true))
++ BASE64ENGINE.decode(&s)
+ .map_err(|e| {
+ log_error!(ErrorLevel::Error, "Invalid Base 64 {} ->
{:?}", s, e);
+ PluginError::InvalidBase64
+@@ -152,11 +158,11 @@ impl PwdChanCrypto {
+ PluginError::Format
+ })?;
+ // the base64 salt
+- base64::encode_config_buf(&salt, base64::STANDARD, &mut output);
++ BASE64ENGINE.encode_string(&salt, &mut output);
+ // Push the delim
+ output.push_str("$");
+ // Finally the base64 hash
+- base64::encode_config_buf(&hash_input, base64::STANDARD, &mut output);
++ BASE64ENGINE.encode_string(&hash_input, &mut output);
+ // Return it
+ Ok(output)
+ }
+Index: 389-ds-base-2.3.1+dfsg1.new/src/plugins/pwdchan/Cargo.toml
+===================================================================
+--- 389-ds-base-2.3.1+dfsg1.new.orig/src/plugins/pwdchan/Cargo.toml
++++ 389-ds-base-2.3.1+dfsg1.new/src/plugins/pwdchan/Cargo.toml
+@@ -17,7 +17,7 @@ paste = "1.*"
+ slapi_r_plugin = { path="../../slapi_r_plugin" }
+ uuid = { version = "0.8", features = [ "v4" ] }
+ openssl = { version = "0.10" }
+-base64 = "0.13"
++base64 = "0.21"
+
+ [build-dependencies]
+ cc = { version = "1.0", features = ["parallel"] }
diff -Nru 389-ds-base-2.3.1+dfsg1/debian/patches/series
389-ds-base-2.3.1+dfsg1/debian/patches/series
--- 389-ds-base-2.3.1+dfsg1/debian/patches/series 2023-01-24
11:21:16.000000000 +0000
+++ 389-ds-base-2.3.1+dfsg1/debian/patches/series 2023-06-11
13:22:07.000000000 +0000
@@ -3,3 +3,4 @@
dont-run-rpm.diff
use-packaged-rust-registry.diff
allow-newer-crates.diff
+base64-0.21.diff
diff -Nru 389-ds-base-2.3.1+dfsg1/debian/rules
389-ds-base-2.3.1+dfsg1/debian/rules
--- 389-ds-base-2.3.1+dfsg1/debian/rules 2023-01-24 11:21:16.000000000
+0000
+++ 389-ds-base-2.3.1+dfsg1/debian/rules 2023-06-11 13:22:07.000000000
+0000
@@ -24,6 +24,10 @@
rm -rf src/lib389/build src/lib389/lib389.egg-info
find src/lib389/ -name '__pycache__' -exec rm -rf '{}' ';'
rm -f src/lib389/man/*.8
+ rm -f ldap/admin/src/*.inf rust-nsslapd-private.h src/Cargo.lock
+ rm -f wrappers/dirsrv-snmp.service wrappers/dirsrv.target
wrappers/dirsrv@.service wrappers/dirsrv@.service.d/custom.conf
wrappers/ds_selinux_restorecon.sh wrappers/ds_systemd_ask_password_acl
+ rm -f debian/vendor/*-*
+ rm -f config.sub config.guess
override_dh_auto_configure:
dh_auto_configure -- \
@@ -41,7 +45,7 @@
--enable-rust-offline
(cd debian/vendor && for i in `ls /usr/share/cargo/registry`; do \
- ln -s /usr/share/cargo/registry/$$i .; done)
+ ln -fs /usr/share/cargo/registry/$$i .; done)
override_dh_auto_build:
(cd src/lib389 && python3 setup.py build)
--- End Message ---
--- Begin Message ---
Source: 389-ds-base
Source-Version: 2.3.4+dfsg1-1
Done: Timo Aaltonen <tjaal...@debian.org>
We believe that the bug you reported is fixed in the latest version of
389-ds-base, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to 1037...@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Timo Aaltonen <tjaal...@debian.org> (supplier of updated 389-ds-base package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmas...@ftp-master.debian.org)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
Format: 1.8
Date: Mon, 19 Jun 2023 19:13:30 +0300
Source: 389-ds-base
Built-For-Profiles: noudeb
Architecture: source
Version: 2.3.4+dfsg1-1
Distribution: unstable
Urgency: medium
Maintainer: Debian FreeIPA Team <pkg-freeipa-de...@alioth-lists.debian.net>
Changed-By: Timo Aaltonen <tjaal...@debian.org>
Closes: 1037345
Changes:
389-ds-base (2.3.4+dfsg1-1) unstable; urgency=medium
.
[ Timo Aaltonen ]
* New upstream release.
* patches: Drop upstreamed or obsolete patches.
* control: Add dependency on python3-cryptography.
.
[ Peter Michael Green ]
* Improve clean target.
* Use ln -fs instead of ln -s to allow resuming build after fixing errors.
* Fix build with base64 0.21. (Closes: #1037345)
Checksums-Sha1:
9cf65f327ab75ff73af7a52371c0a38a5a803700 3140 389-ds-base_2.3.4+dfsg1-1.dsc
58c15d8dacf468bbd811215f62205088e4b3ecff 4692832
389-ds-base_2.3.4+dfsg1.orig.tar.xz
a693311f50280b315b1d5548ea1c4207195e238a 802996
389-ds-base_2.3.4+dfsg1-1.debian.tar.xz
aaa1647022e9e455605e88e6269d354583f28936 9501
389-ds-base_2.3.4+dfsg1-1_source.buildinfo
Checksums-Sha256:
bb5ce91ba6cb1dc244722f72a9795f65f2aa7ab97b2646a0812aba9c6470cf3c 3140
389-ds-base_2.3.4+dfsg1-1.dsc
b1cd2278e34630d5dc55f5db8f1ca9acce08df31f9d78399daa5c5942bb7b630 4692832
389-ds-base_2.3.4+dfsg1.orig.tar.xz
4d6596a8f3e61c9d7e56d8a48fe2787bb88a54103ef64d3eb8760fedd1d9a8bf 802996
389-ds-base_2.3.4+dfsg1-1.debian.tar.xz
44e9908de7cbf07430662a650b1338df1b986ab17733583de47772119be510f7 9501
389-ds-base_2.3.4+dfsg1-1_source.buildinfo
Files:
7fd496383becc12aa6643bbe9a8c32d5 3140 net optional
389-ds-base_2.3.4+dfsg1-1.dsc
e6e2e580aac753277baf914bdecb71fd 4692832 net optional
389-ds-base_2.3.4+dfsg1.orig.tar.xz
e346be0514cdf40c12bae3f18c8f0cc3 802996 net optional
389-ds-base_2.3.4+dfsg1-1.debian.tar.xz
02a4ed1c33d55b2975d480774c9cec90 9501 net optional
389-ds-base_2.3.4+dfsg1-1_source.buildinfo
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCgAdFiEEdS3ifE3rFwGbS2Yjy3AxZaiJhNwFAmSQfsUACgkQy3AxZaiJ
hNyDvBAAit9enbl4h+6kjz/67zZdOwJCbc/cto9SANhZXUE3TC+IQJ/y3IOQBsYe
rtEcmh7lQQeVeBX8rH3oSpaWKp3Wxp/Rdt4TgOSpIrnzLMsD9xOnjX6zDr1hXY4C
/Q000e8kuGjBxlaaA5D0UVmjrRFZn4HMOMShQ5IrTSg7+0MWSXYTI48+xAuR4A+v
0f329K90pYrLCpVsi/SxhPXnrfXnDUmsQP8Mr8/p0d9+XIqtpExCdAHREN7PJUuo
YGrSmv1aELrBCEPKAUbnAbv9gjTg3sNSVRQ8jK4uJLdQ3wOcFxsm9fKsd9j31SYU
q7nqFgitBo8+7/Ecxmc9s9jxY3bdeomprd1GXDBO0c6G16KfSaUKQZ7H3yYV3QPv
bUqUf/ldpKaqQM4naSIlOtY/jzCussQjpnK+tIUid/bEvmz59uaeLP0afKWBg5ym
L+487saT3ObEkd3mOD0GVIaHyKezhZ79FYcwDH8XbK4qkHK7pLlSqYWGhR4cS5wR
KDEPyotta2Idc7NLEHgCSBxkqfb5N4bI4/6QKd4NuqCU07ZGSXQ1r16wG0B78Jet
vYpQdUN3WKebh73r6dyuT6XN9xUg+2Rv++l25EsvFn2eXTCVPp7k5GehkxGos6Ko
mbSp0y57ryMq8W37ETCzZEw+qdvrG/N78jSxBZAfdh1quAIm9Sw=
=xIOG
-----END PGP SIGNATURE-----
--- End Message ---
