Skip to content

Commit e0f0f2c

Browse files
authored
libbsd :update version to 0.12.2 (#10953)
1 parent 3f21f28 commit e0f0f2c

8 files changed

Lines changed: 124 additions & 61 deletions
Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
-----BEGIN PGP PUBLIC KEY BLOCK-----
2+
3+
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
62+
=Gi+y
63+
-----END PGP PUBLIC KEY BLOCK-----
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
-----BEGIN PGP SIGNATURE-----
2+
3+
iQIzBAABCgAdFiEETz509DYFDBD1aWV0uXK/PqSuV6MFAmX3qQAACgkQuXK/PqSu
4+
V6M/Uw/9EpatI+Czbi4cgRBGIIh7jzz6UkJQCohrEp6vyPPFOvsvh10J+eKz/otE
5+
omjBJp0IpUV6uwM68Bs5jxO8qWnje0xoVg77e0zzJywxnhWNpxebtz8xSSfJmIUZ
6+
cKVRcGa4ff1AAvJfuh4Xh2JEYRP80IS5qIWw58WKyMNwFd5gFi4YjHkcUY14Vnuv
7+
kOltL5o+qN0ZqFrrm0WiKjf+/j39Z4keD9rIrv2mq+BXmRXpDjeVREghvPHRQbx9
8+
qIbgUFwpLqYNFuPVEI1vNTLUu0wJHNpZKqmvKWzL2oOWyW05+IDg5vAHgMYPfl/C
9+
fDdPQBRb/6M7UPlUYvoqK3BlizuHMvJd3Uv1rJGv0IU6tEQ7G96M2MYQad8nk33e
10+
46MsPxUOY9E187TgaBp2P5DNx225VXrhuZJYH8LQHA0THuHupRFZNZb5ymmpBZre
11+
tVzvMRNtNYiaS24+/H2uk7Qydf/beGy9GIysYrkxoC6BX1+pPdVd4NJyNJS+fWxJ
12+
HnH1JaJkyAbr8A1zDMkNysHC+HTXvHN7Cz+KLtWO3BTprXCHhgY0AlmVW6ggVpFa
13+
XT2bNuueBKmCVJggCeJHikJcsTDjT5qzFI/Jv9fWQXbdxvoUxnAHLg05YOjG5z9d
14+
UjVOKzFC6MKJ7JN+qvtvSyGsNIP2a+GZti7Q5fUBmTx6gvZiRSg=
15+
=sSIS
16+
-----END PGP SIGNATURE-----

SPECS-EXTENDED/libbsd/libbsd-0.8.3-deprecated.patch

Lines changed: 0 additions & 28 deletions
This file was deleted.

SPECS-EXTENDED/libbsd/libbsd-0.8.6-compat.patch

Lines changed: 0 additions & 18 deletions
This file was deleted.
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
#include <bits/wordsize.h>
2+
3+
#if __WORDSIZE == 32
4+
# ifdef LIBBSD_OVERLAY
5+
# include "sys/cdefs-32.h"
6+
# else
7+
# include "cdefs-32.h"
8+
# endif
9+
#elif __WORDSIZE == 64
10+
# ifdef LIBBSD_OVERLAY
11+
# include "sys/cdefs-64.h"
12+
# else
13+
# include "cdefs-64.h"
14+
# endif
15+
#else
16+
# error "Unknown word size"
17+
#endif
Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
{
22
"Signatures": {
3-
"libbsd-0.10.0.tar.xz": "34b8adc726883d0e85b3118fa13605e179a62b31ba51f676136ecb2d0bc1a887"
3+
"libbsd-0.12.2.tar.xz": "b88cc9163d0c652aaf39a99991d974ddba1c3a9711db8f1b5838af2a14731014",
4+
"libbsd-0.12.2.tar.xz.asc": "620dc92f158ebe0a650c0e92214a8121b927276895dc9a1dcaa38f627fa0fcb0",
5+
"libbsd-cdefs.h": "5f85ce9374352a2ad21ab2bbc42a4a95ea4a05da010bf128ece0d0327dc54605",
6+
"4F3E74F436050C10F5696574B972BF3EA4AE57A3": "56b3e6dc62d6de533d1a86621b3d3fe8f9523a83f2b19927a95cffb8b562150b"
47
}
58
}

SPECS-EXTENDED/libbsd/libbsd.spec

Lines changed: 22 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,22 @@
11
Vendor: Microsoft Corporation
22
Distribution: Azure Linux
33
Name: libbsd
4-
Version: 0.10.0
5-
Release: 3%{?dist}
4+
Version: 0.12.2
5+
Release: 1%{?dist}
66
Summary: Library providing BSD-compatible functions for portability
7-
URL: http://libbsd.freedesktop.org/
7+
URL: https://libbsd.freedesktop.org/
88
License: BSD and ISC and Copyright only and Public Domain
99

10-
Source0: http://libbsd.freedesktop.org/releases/libbsd-%{version}.tar.xz
11-
Patch1: %{name}-0.8.3-deprecated.patch
12-
Patch2: %{name}-0.8.6-compat.patch
10+
Source0: https://libbsd.freedesktop.org/releases/libbsd-%{version}.tar.xz
11+
Source1: https://libbsd.freedesktop.org/releases/libbsd-%{version}.tar.xz.asc
12+
Source2: https://keys.openpgp.org/vks/v1/by-fingerprint/4F3E74F436050C10F5696574B972BF3EA4AE57A3
13+
Source3: libbsd-cdefs.h
1314

1415
BuildRequires: gcc
16+
BuildRequires: gnupg2
17+
BuildRequires: libmd-devel
18+
BuildRequires: make
19+
1520
%description
1621
libbsd provides useful functions commonly found on BSD systems, and
1722
lacking on others like GNU systems, thus making it easier to port
@@ -21,6 +26,7 @@ code over and over again on each project.
2126
%package devel
2227
Summary: Development files for libbsd
2328
Requires: %{name}%{?_isa} = %{version}-%{release}
29+
Requires: libmd-devel
2430

2531
%description devel
2632
Development files for the libbsd library.
@@ -37,11 +43,8 @@ configured using "pkg-config --libs libbsd-ctor".
3743
# http://lists.freedesktop.org/archives/libbsd/2013-July/000091.html
3844

3945
%prep
40-
%setup -q
41-
%if 0%{?rhel} && 0%{?rhel} < 7
42-
%patch 1 -p1 -b .deprecated
43-
%patch 2 -p1 -b .compat
44-
%endif
46+
%autosetup
47+
%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
4548

4649
%build
4750
%configure
@@ -60,13 +63,16 @@ rm %{buildroot}%{_libdir}/%{name}.la
6063
# remove manual pages that conflict with man-pages package
6164
rm %{buildroot}%{_mandir}/man3/explicit_bzero.3bsd
6265

66+
# avoid file conflicts in multilib installations of -devel subpackage
67+
mv -f %{buildroot}%{_includedir}/bsd/sys/cdefs{,-%{__isa_bits}}.h
68+
install -p -m 0644 %{SOURCE3} %{buildroot}%{_includedir}/bsd/sys/cdefs.h
6369

6470
%ldconfig_scriptlets
6571

6672
%files
6773
%license COPYING
6874
%doc README TODO ChangeLog
69-
%{_libdir}/%{name}.so.*
75+
%{_libdir}/%{name}.so.0*
7076

7177
%files devel
7278
%{_mandir}/man3/*.3bsd.*
@@ -81,6 +87,10 @@ rm %{buildroot}%{_mandir}/man3/explicit_bzero.3bsd
8187
%{_libdir}/pkgconfig/%{name}-ctor.pc
8288

8389
%changelog
90+
* Wed Nov 06 2024 Jyoti Kanase <v-jykanase@microsoft.com> - 0.12.2-1
91+
- Update version to 0.12.2
92+
- License verified
93+
8494
* Fri Oct 15 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 0.10.0-3
8595
- Initial CBL-Mariner import from Fedora 32 (license: MIT).
8696

cgmanifest.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8821,8 +8821,8 @@
88218821
"type": "other",
88228822
"other": {
88238823
"name": "libbsd",
8824-
"version": "0.10.0",
8825-
"downloadUrl": "http://libbsd.freedesktop.org/releases/libbsd-0.10.0.tar.xz"
8824+
"version": "0.12.2",
8825+
"downloadUrl": "https://libbsd.freedesktop.org/releases/libbsd-0.12.2.tar.xz"
88268826
}
88278827
}
88288828
},

0 commit comments

Comments
 (0)