--- Begin Message ---
- To: submit@bugs.debian.org
- Subject: libyami-utils: Switch from libbsd to libmd
- From: Guillem Jover <guillem@debian.org>
- Date: Sat, 13 Feb 2021 22:14:40 +0100
- Message-id: <YChBQDqgqpGLsTog@thunder.hadrons.org>
Source: libyami-utils
Source-Version: 1.3.0-2
Severity: normal
Tags: patch
Hi!
The MD5 functions in libbsd have been superseded by the ones in the
libmd project, and they might be removed in the next SONAME bump. The
current implementations in libbsd are just wrappers for the real
functions from libmd.
Attached a patch fixing this.
Thanks,
Guillem
From 4bebced8e1b654c915c473c4d85ef8dd26cc6c55 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@hadrons.org>
Date: Sat, 13 Feb 2021 20:29:58 +0100
Subject: [PATCH] Switch from libbsd to libmd
The MD5 functions in libbsd have been superseded by the ones in the
libmd project, and they might disappear in the next SONAME bump.
---
debian/control | 2 +-
debian/patches/0003-use-libmd.patch | 53 +++++++++++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 55 insertions(+), 1 deletion(-)
create mode 100644 debian/patches/0003-use-libmd.patch
diff --git a/debian/control b/debian/control
index 5e4706b..386ea8b 100644
--- a/debian/control
+++ b/debian/control
@@ -8,9 +8,9 @@ Build-Depends:
libavcodec-dev,
libavformat-dev,
libavutil-dev,
- libbsd-dev,
libegl1-mesa-dev,
libgles2-mesa-dev,
+ libmd-dev,
libva-dev,
libwayland-dev,
libx11-dev,
diff --git a/debian/patches/0003-use-libmd.patch b/debian/patches/0003-use-libmd.patch
new file mode 100644
index 0000000..3f161ad
--- /dev/null
+++ b/debian/patches/0003-use-libmd.patch
@@ -0,0 +1,53 @@
+Author: Guillem Jover <guillem@hadrons.org>
+Subject: Use libmd instead of libbsd for message digest functions
+ The MD5 functions in libbsd have been superseded by the ones
+ in the libmd project. Switch to use those as the ones in libbsd
+ might disappear in the next SONAME bump.
+
+---
+ configure.ac | 2 +-
+ tests/Makefile.am | 2 +-
+ tests/decodeinputavformat.cpp | 2 +-
+ tests/decodeoutput.cpp | 9 +--------
+ 4 files changed, 4 insertions(+), 11 deletions(-)
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -250,7 +250,7 @@ fi
+
+ #check openssl
+ if test "$enable_md5" = "yes"; then
+- PKG_CHECK_MODULES([LIBBSD], [libbsd],
++ PKG_CHECK_MODULES([LIBMD], [libmd],
+ [AC_DEFINE([__ENABLE_MD5__], [1],
+ [Defined to 1 if MD5 API and --enable-md5[default] are enabled])],
+ [])
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -59,7 +59,7 @@ YAMI_DECODE_LIBS += $(LIBEGL_LIBS) $(LIB
+ endif
+
+ if ENABLE_MD5
+-YAMI_DECODE_LIBS += $(LIBBSD_LIBS)
++YAMI_DECODE_LIBS += $(LIBMD_LIBS)
+ endif
+
+ YAMI_ENCODE_LIBS = \
+--- a/tests/decodeoutput.cpp
++++ b/tests/decodeoutput.cpp
+@@ -23,14 +23,7 @@
+ #include "common/VaapiUtils.h"
+
+ #if __ENABLE_MD5__
+-// including bsd/md5.h produces a warning with __bounded__ attribute,
+-// libyami-utils chooses to ignore this particular warning by pushing the
+-// current environment, ignoring attributes and then poping to restore the
+-// environment.
+-#pragma GCC diagnostic push
+-#pragma GCC diagnostic ignored "-Wattributes"
+-#include <bsd/md5.h>
+-#pragma GCC diagnostic pop
++#include <md5.h>
+ #endif
+
+ #ifdef __ENABLE_X11__
diff --git a/debian/patches/series b/debian/patches/series
index 1b39d13..471321e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
0001-decode-avformat-av_register_all-is-deprecated-since-.patch
0002-decode-avformat-use-LIBAVFORMAT_VERSION_INT-instead.patch
+0003-use-libmd.patch
--
2.30.0.284.gd98b1dd5eaa7
--- End Message ---
--- Begin Message ---
Source: libyami-utils
Source-Version: 1.3.0-3
Done: Sebastian Ramacher <sramacher@debian.org>
We believe that the bug you reported is fixed in the latest version of
libyami-utils, 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 982747@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Sebastian Ramacher <sramacher@debian.org> (supplier of updated libyami-utils 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 ftpmaster@ftp-master.debian.org)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
Format: 1.8
Date: Thu, 12 Aug 2021 16:53:40 +0200
Source: libyami-utils
Architecture: source
Version: 1.3.0-3
Distribution: unstable
Urgency: medium
Maintainer: Debian Multimedia Maintainers <debian-multimedia@lists.debian.org>
Changed-By: Sebastian Ramacher <sramacher@debian.org>
Closes: 982747
Changes:
libyami-utils (1.3.0-3) unstable; urgency=medium
.
[ Debian Janitor ]
* Bump debhelper from old 11 to 12.
* Set upstream metadata fields: Bug-Database, Bug-Submit, Repository,
Repository-Browse.
* Add missing build dependency on libgles-dev.
.
[ Sebastian Ramacher ]
* debian/control:
- Remove myself from Uploaders
- Bump Standards-Version
- Set RRR: no
- Bump debhelper compat to 13
.
[ Guillem Jover ]
* Switch from libbsd to libmd (Closes: #982747)
Checksums-Sha1:
700e6ae3fea19b17bbf83307e6bb12615109b2ce 2163 libyami-utils_1.3.0-3.dsc
8fe0bb5b690c258fe726c8fc68f403b974a5b732 3868 libyami-utils_1.3.0-3.debian.tar.xz
Checksums-Sha256:
09b8d3bfcf6574767dcbbc17e111bc324f8449fa3489f293f0e639c4e65cfbce 2163 libyami-utils_1.3.0-3.dsc
4e3b07728690272975a654e82b3efeab966ee1686469cb4d221abbbb74d0fb99 3868 libyami-utils_1.3.0-3.debian.tar.xz
Files:
de8a574006e162c8ef5a431037c111ce 2163 utils optional libyami-utils_1.3.0-3.dsc
8d7b39ecf2a45260ba52e7ae0b3570fe 3868 utils optional libyami-utils_1.3.0-3.debian.tar.xz
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCgAdFiEE94y6B4F7sUmhHTOQafL8UW6nGZMFAmEVNuwACgkQafL8UW6n
GZMBhA/9GfbioWb6SDoDpoClMrtPWw3p8pjMNEUP+5FClYpPLEXjpaLLSiM1Nh8/
PSP3BayzkA0kgnaQemTG2N0LmtFY0AgvabLq+RtzbKgjOS3cs979x3PepNlDnyBb
RCA9TnUoxOYjAQYvA+9jptyQhEuyIL4IjIYFy8cgu9Nu51w7aNge+XLFmXpbI5TK
OeA7xQPINqPCdBhrTAx2Cm1tqYacYxA2SPre36BVE2eo0qY+9DduHpQgaRUpjY1V
jZz6vh7DZ4FVBGz8wRv0MN5SQEa/mvfghnmgnrN58ox1daXi7+AV4XGmfC8cK96t
Jm7M6eTj0yBne/omyIWpmtXMs0VaSZpBxECDljpoIFk2XJIM7oX+JOVTA5vxuPM0
UqZLAXII9PRlY5mL6zij76dUIkTaamPxEe+dsEkojkdfjWVtX68ZyoQz732cP5ML
fnBrtPQDdsnb6I39gSLFKc9vyk5k+HTslfhkHDk8qoKaW/U2CfDr6G29UWQRemKK
ci9pqczgtnevQuZ01q/oalHdF3jarWKNZre2iwVEGzGI9eJRIjxOM0VBCupM0Jy+
h8xrKpeL+Q9nJq1hRcYX4gmh2VPsklZKTcbfjCJqJTM7pnNWJvck+X7eM7nOslVr
I1Mc8eyNyiys9J72XSLCvFJpkxFAq+VhwVrTkyj/hwh3jY/pDb8=
=gjSk
-----END PGP SIGNATURE-----
--- End Message ---