The package rpms/rust-findshlibs.git has added or updated architecture specific content in
its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/rust-findshlibs.git/commit/?id=81...
https://src.fedoraproject.org/cgit/rpms/rust-findshlibs.git/commit/?id=04...
https://src.fedoraproject.org/cgit/rpms/rust-findshlibs.git/commit/?id=08....
Change:
+ExclusiveArch: %{rust_arches}
-ExclusiveArch: %{rust_arches}
+ExclusiveArch: %{rust_arches}
Thanks.
Full change:
============
commit 8270085369f39fe507b968224ef28ee39b7f5bda
Author: Michel Alexandre Salim <salimma(a)fedoraproject.org>
Date: Wed Apr 20 11:20:36 2022 -0700
Update to 0.10.2
Signed-off-by: Michel Alexandre Salim <salimma(a)fedoraproject.org>
diff --git a/.gitignore b/.gitignore
index 8eb2db7..0b269cf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/findshlibs-0.5.0.crate
/findshlibs-0.7.0.crate
/findshlibs-0.8.0.crate
+/findshlibs-0.10.2.crate
diff --git a/findshlibs-fix-metadata.diff b/findshlibs-fix-metadata.diff
index 76f6463..58911fa 100644
--- a/findshlibs-fix-metadata.diff
+++ b/findshlibs-fix-metadata.diff
@@ -1,11 +1,11 @@
---- findshlibs-0.8.0/Cargo.toml 2020-11-25T17:26:32+00:00
-+++ findshlibs-0.8.0/Cargo.toml 2021-05-11T12:22:18.128310+00:00
-@@ -23,8 +23,6 @@
- repository = "https://github.com/gimli-rs/findshlibs"
- [dependencies.libc]
- version = "0.2.65"
--[target."cfg(target_os = \"macos\")".dependencies.lazy_static]
+--- findshlibs-0.10.2/Cargo.toml 1970-01-01T00:00:00+00:00
++++ findshlibs-0.10.2/Cargo.toml 2022-04-20T18:18:00.934891+00:00
+@@ -24,8 +24,3 @@
+ version = "0.2.104"
+ [build-dependencies.cc]
+ version = "1.0.67"
+-[target."cfg(any(target_os = \"macos\", target_os =
\"ios\"))".dependencies.lazy_static]
-version = "1.4"
- [badges.coveralls]
- repository = "gimli-rs/findshlibs"
-
+-[target."cfg(target_os = \"windows\")".dependencies.winapi]
+-version = "0.3.9"
+-features = ["psapi", "memoryapi", "libloaderapi",
"processthreadsapi"]
diff --git a/rust-findshlibs.spec b/rust-findshlibs.spec
index 2b24830..daca2bf 100644
--- a/rust-findshlibs.spec
+++ b/rust-findshlibs.spec
@@ -1,28 +1,24 @@
-# Generated by rust2rpm 17
+# Generated by rust2rpm 21
%bcond_without check
%global debug_package %{nil}
%global crate findshlibs
Name: rust-%{crate}
-Version: 0.8.0
+Version: 0.10.2
Release: %autorelease
-Summary: Find the set of shared libraries loaded in the current process
+Summary: Find the set of shared libraries loaded in the current process with a
cross platform API
# Upstream license specification: MIT OR Apache-2.0
License: MIT or ASL 2.0
URL:
https://crates.io/crates/findshlibs
Source: %{crates_source}
-# Initial patched metadata
-# * drop mac OS-specific dependencies
+# Drop dependencies for Mac and Windows targets
Patch0: findshlibs-fix-metadata.diff
ExclusiveArch: %{rust_arches}
-%if %{__cargo_skip_build}
-BuildArch: noarch
-%endif
-BuildRequires: rust-packaging
+BuildRequires: rust-packaging >= 21
%global _description %{expand:
Find the set of shared libraries loaded in the current process with a cross
@@ -36,13 +32,14 @@ BuildArch: noarch
%description devel %{_description}
-This package contains library source intended for building other packages
-which use "%{crate}" crate.
+This package contains library source intended for building other packages which
+use the "%{crate}" crate.
%files devel
-%license LICENSE-APACHE LICENSE-MIT
-%doc README.md
-%{cargo_registry}/%{crate}-%{version_no_tilde}/
+%license %{crate_instdir}/LICENSE-APACHE
+%license %{crate_instdir}/LICENSE-MIT
+%doc %{crate_instdir}/README.md
+%{crate_instdir}/
%package -n %{name}+default-devel
Summary: %{summary}
@@ -50,11 +47,11 @@ BuildArch: noarch
%description -n %{name}+default-devel %{_description}
-This package contains library source intended for building other packages
-which use "default" feature of "%{crate}" crate.
+This package contains library source intended for building other packages which
+use the "default" feature of the "%{crate}" crate.
%files -n %{name}+default-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
%prep
%autosetup -n %{crate}-%{version_no_tilde} -p1
diff --git a/sources b/sources
index 82a4ae4..c3da174 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (findshlibs-0.8.0.crate) =
4ee36539d477c743208aaba821d608f3af7817376c3ab0f10b27bb230b7deb089c3921d1d5e6fa0ec4edde0da108c902e5fc501a86c7dcc5497b7cfa1e79b307
+SHA512 (findshlibs-0.10.2.crate) =
fdaf3453939375be5af082a3d044bf2d0fbdf5327059298c7c27164a191eb885bd9e4dd0577d95ac4ad4da1a4e59ecd5bbcfc5b6e1f872859fb93359f2623ab6
commit 8381e0f8eecec887abed47baa2120b4b99232165
Author: Michel Alexandre Salim <salimma(a)fedoraproject.org>
Date: Wed Apr 20 11:20:00 2022 -0700
Convert to rpmautospec
Signed-off-by: Michel Alexandre Salim <salimma(a)fedoraproject.org>
diff --git a/changelog b/changelog
new file mode 100644
index 0000000..e591432
--- /dev/null
+++ b/changelog
@@ -0,0 +1,24 @@
+* Fri Jul 23 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.8.0-2
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Tue May 11 2021 Fabio Valentini <decathorpe(a)gmail.com> - 0.8.0-1
+- Update to version 0.8.0.
+- Fixes RHBZ#1901653
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.7.0-3
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.7.0-2
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Wed May 13 07:43:29 CEST 2020 Igor Raits <ignatenkobrain(a)fedoraproject.org> -
0.7.0-1
+- Update to 0.7.0
+
+* Sun Feb 02 18:47:13 CET 2020 Robert-André Mauchin <zebob.m(a)gmail.com> - 0.5.0-3
+- Remove extraneous executable bits
+
+* Thu Jan 30 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.5.0-2
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Fri Dec 06 18:20:28 CET 2019 Robert-André Mauchin <zebob.m(a)gmail.com> - 0.5.0-1
+- Initial package
diff --git a/rust-findshlibs.spec b/rust-findshlibs.spec
index 73ab1a9..2b24830 100644
--- a/rust-findshlibs.spec
+++ b/rust-findshlibs.spec
@@ -6,7 +6,7 @@
Name: rust-%{crate}
Version: 0.8.0
-Release: 2%{?dist}
+Release: %autorelease
Summary: Find the set of shared libraries loaded in the current process
# Upstream license specification: MIT OR Apache-2.0
@@ -75,27 +75,4 @@ which use "default" feature of "%{crate}" crate.
%endif
%changelog
-* Fri Jul 23 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.8.0-2
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Tue May 11 2021 Fabio Valentini <decathorpe(a)gmail.com> - 0.8.0-1
-- Update to version 0.8.0.
-- Fixes RHBZ#1901653
-
-* Wed Jan 27 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.7.0-3
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Wed Jul 29 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.7.0-2
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Wed May 13 07:43:29 CEST 2020 Igor Raits <ignatenkobrain(a)fedoraproject.org> -
0.7.0-1
-- Update to 0.7.0
-
-* Sun Feb 02 18:47:13 CET 2020 Robert-André Mauchin <zebob.m(a)gmail.com> - 0.5.0-3
-- Remove extraneous executable bits
-
-* Thu Jan 30 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.5.0-2
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Fri Dec 06 18:20:28 CET 2019 Robert-André Mauchin <zebob.m(a)gmail.com> - 0.5.0-1
-- Initial package
+%autochangelog
commit 819e91fbc2bdffb6d1ea59d9a58e748cea3fe999
Author: Tomas Hrcka <thrcka(a)redhat.com>
Date: Thu Apr 21 14:41:46 2022 +0200
Unretirement request:
https://pagure.io/releng/issue/10755
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..8eb2db7
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+/findshlibs-0.5.0.crate
+/findshlibs-0.7.0.crate
+/findshlibs-0.8.0.crate
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..5182bab
--- /dev/null
+++ b/README.md
@@ -0,0 +1,3 @@
+# rust-findshlibs
+
+The rust-findshlibs package
\ No newline at end of file
diff --git a/dead.package b/dead.package
deleted file mode 100644
index 5ac8255..0000000
--- a/dead.package
+++ /dev/null
@@ -1 +0,0 @@
-no longer used
diff --git a/findshlibs-fix-metadata.diff b/findshlibs-fix-metadata.diff
new file mode 100644
index 0000000..76f6463
--- /dev/null
+++ b/findshlibs-fix-metadata.diff
@@ -0,0 +1,11 @@
+--- findshlibs-0.8.0/Cargo.toml 2020-11-25T17:26:32+00:00
++++ findshlibs-0.8.0/Cargo.toml 2021-05-11T12:22:18.128310+00:00
+@@ -23,8 +23,6 @@
+ repository = "https://github.com/gimli-rs/findshlibs"
+ [dependencies.libc]
+ version = "0.2.65"
+-[target."cfg(target_os = \"macos\")".dependencies.lazy_static]
+-version = "1.4"
+ [badges.coveralls]
+ repository = "gimli-rs/findshlibs"
+
diff --git a/rust-findshlibs.spec b/rust-findshlibs.spec
new file mode 100644
index 0000000..73ab1a9
--- /dev/null
+++ b/rust-findshlibs.spec
@@ -0,0 +1,101 @@
+# Generated by rust2rpm 17
+%bcond_without check
+%global debug_package %{nil}
+
+%global crate findshlibs
+
+Name: rust-%{crate}
+Version: 0.8.0
+Release: 2%{?dist}
+Summary: Find the set of shared libraries loaded in the current process
+
+# Upstream license specification: MIT OR Apache-2.0
+License: MIT or ASL 2.0
+URL:
https://crates.io/crates/findshlibs
+Source: %{crates_source}
+# Initial patched metadata
+# * drop mac OS-specific dependencies
+Patch0: findshlibs-fix-metadata.diff
+
+ExclusiveArch: %{rust_arches}
+%if %{__cargo_skip_build}
+BuildArch: noarch
+%endif
+
+BuildRequires: rust-packaging
+
+%global _description %{expand:
+Find the set of shared libraries loaded in the current process with a cross
+platform API.}
+
+%description %{_description}
+
+%package devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description devel %{_description}
+
+This package contains library source intended for building other packages
+which use "%{crate}" crate.
+
+%files devel
+%license LICENSE-APACHE LICENSE-MIT
+%doc README.md
+%{cargo_registry}/%{crate}-%{version_no_tilde}/
+
+%package -n %{name}+default-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+default-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "default" feature of "%{crate}" crate.
+
+%files -n %{name}+default-devel
+%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+
+%prep
+%autosetup -n %{crate}-%{version_no_tilde} -p1
+%cargo_prep
+
+%generate_buildrequires
+%cargo_generate_buildrequires
+
+%build
+%cargo_build
+
+%install
+%cargo_install
+
+%if %{with check}
+%check
+%cargo_test
+%endif
+
+%changelog
+* Fri Jul 23 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.8.0-2
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Tue May 11 2021 Fabio Valentini <decathorpe(a)gmail.com> - 0.8.0-1
+- Update to version 0.8.0.
+- Fixes RHBZ#1901653
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.7.0-3
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.7.0-2
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Wed May 13 07:43:29 CEST 2020 Igor Raits <ignatenkobrain(a)fedoraproject.org> -
0.7.0-1
+- Update to 0.7.0
+
+* Sun Feb 02 18:47:13 CET 2020 Robert-André Mauchin <zebob.m(a)gmail.com> - 0.5.0-3
+- Remove extraneous executable bits
+
+* Thu Jan 30 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.5.0-2
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Fri Dec 06 18:20:28 CET 2019 Robert-André Mauchin <zebob.m(a)gmail.com> - 0.5.0-1
+- Initial package
diff --git a/sources b/sources
new file mode 100644
index 0000000..82a4ae4
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+SHA512 (findshlibs-0.8.0.crate) =
4ee36539d477c743208aaba821d608f3af7817376c3ab0f10b27bb230b7deb089c3921d1d5e6fa0ec4edde0da108c902e5fc501a86c7dcc5497b7cfa1e79b307
commit 0461e4ab8252b1d8fd3708e453d7de8994a6524d
Author: Fabio Valentini <decathorpe(a)gmail.com>
Date: Tue Nov 16 19:10:29 2021 +0100
no longer used
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 8eb2db7..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/findshlibs-0.5.0.crate
-/findshlibs-0.7.0.crate
-/findshlibs-0.8.0.crate
diff --git a/README.md b/README.md
deleted file mode 100644
index 5182bab..0000000
--- a/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# rust-findshlibs
-
-The rust-findshlibs package
\ No newline at end of file
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..5ac8255
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+no longer used
diff --git a/findshlibs-fix-metadata.diff b/findshlibs-fix-metadata.diff
deleted file mode 100644
index 76f6463..0000000
--- a/findshlibs-fix-metadata.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- findshlibs-0.8.0/Cargo.toml 2020-11-25T17:26:32+00:00
-+++ findshlibs-0.8.0/Cargo.toml 2021-05-11T12:22:18.128310+00:00
-@@ -23,8 +23,6 @@
- repository = "https://github.com/gimli-rs/findshlibs"
- [dependencies.libc]
- version = "0.2.65"
--[target."cfg(target_os = \"macos\")".dependencies.lazy_static]
--version = "1.4"
- [badges.coveralls]
- repository = "gimli-rs/findshlibs"
-
diff --git a/rust-findshlibs.spec b/rust-findshlibs.spec
deleted file mode 100644
index 73ab1a9..0000000
--- a/rust-findshlibs.spec
+++ /dev/null
@@ -1,101 +0,0 @@
-# Generated by rust2rpm 17
-%bcond_without check
-%global debug_package %{nil}
-
-%global crate findshlibs
-
-Name: rust-%{crate}
-Version: 0.8.0
-Release: 2%{?dist}
-Summary: Find the set of shared libraries loaded in the current process
-
-# Upstream license specification: MIT OR Apache-2.0
-License: MIT or ASL 2.0
-URL:
https://crates.io/crates/findshlibs
-Source: %{crates_source}
-# Initial patched metadata
-# * drop mac OS-specific dependencies
-Patch0: findshlibs-fix-metadata.diff
-
-ExclusiveArch: %{rust_arches}
-%if %{__cargo_skip_build}
-BuildArch: noarch
-%endif
-
-BuildRequires: rust-packaging
-
-%global _description %{expand:
-Find the set of shared libraries loaded in the current process with a cross
-platform API.}
-
-%description %{_description}
-
-%package devel
-Summary: %{summary}
-BuildArch: noarch
-
-%description devel %{_description}
-
-This package contains library source intended for building other packages
-which use "%{crate}" crate.
-
-%files devel
-%license LICENSE-APACHE LICENSE-MIT
-%doc README.md
-%{cargo_registry}/%{crate}-%{version_no_tilde}/
-
-%package -n %{name}+default-devel
-Summary: %{summary}
-BuildArch: noarch
-
-%description -n %{name}+default-devel %{_description}
-
-This package contains library source intended for building other packages
-which use "default" feature of "%{crate}" crate.
-
-%files -n %{name}+default-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
-
-%prep
-%autosetup -n %{crate}-%{version_no_tilde} -p1
-%cargo_prep
-
-%generate_buildrequires
-%cargo_generate_buildrequires
-
-%build
-%cargo_build
-
-%install
-%cargo_install
-
-%if %{with check}
-%check
-%cargo_test
-%endif
-
-%changelog
-* Fri Jul 23 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.8.0-2
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Tue May 11 2021 Fabio Valentini <decathorpe(a)gmail.com> - 0.8.0-1
-- Update to version 0.8.0.
-- Fixes RHBZ#1901653
-
-* Wed Jan 27 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.7.0-3
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Wed Jul 29 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.7.0-2
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Wed May 13 07:43:29 CEST 2020 Igor Raits <ignatenkobrain(a)fedoraproject.org> -
0.7.0-1
-- Update to 0.7.0
-
-* Sun Feb 02 18:47:13 CET 2020 Robert-André Mauchin <zebob.m(a)gmail.com> - 0.5.0-3
-- Remove extraneous executable bits
-
-* Thu Jan 30 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.5.0-2
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Fri Dec 06 18:20:28 CET 2019 Robert-André Mauchin <zebob.m(a)gmail.com> - 0.5.0-1
-- Initial package
diff --git a/sources b/sources
deleted file mode 100644
index 82a4ae4..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-SHA512 (findshlibs-0.8.0.crate) =
4ee36539d477c743208aaba821d608f3af7817376c3ab0f10b27bb230b7deb089c3921d1d5e6fa0ec4edde0da108c902e5fc501a86c7dcc5497b7cfa1e79b307
commit 06155443ae98c83295f81bcd12038dd184ec4b3e
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Fri Jul 23 14:08:13 2021 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/rust-findshlibs.spec b/rust-findshlibs.spec
index 6c4e3e7..73ab1a9 100644
--- a/rust-findshlibs.spec
+++ b/rust-findshlibs.spec
@@ -6,7 +6,7 @@
Name: rust-%{crate}
Version: 0.8.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Find the set of shared libraries loaded in the current process
# Upstream license specification: MIT OR Apache-2.0
@@ -75,6 +75,9 @@ which use "default" feature of "%{crate}" crate.
%endif
%changelog
+* Fri Jul 23 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.8.0-2
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
* Tue May 11 2021 Fabio Valentini <decathorpe(a)gmail.com> - 0.8.0-1
- Update to version 0.8.0.
- Fixes RHBZ#1901653
commit 62945a22699d9365a2d58ff4920765344b26f97a
Author: Fabio Valentini <decathorpe(a)gmail.com>
Date: Tue May 11 14:24:20 2021 +0200
update to version 0.8.0
diff --git a/.gitignore b/.gitignore
index a942b99..8eb2db7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/findshlibs-0.5.0.crate
/findshlibs-0.7.0.crate
+/findshlibs-0.8.0.crate
diff --git a/findshlibs-fix-metadata.diff b/findshlibs-fix-metadata.diff
index 1885750..76f6463 100644
--- a/findshlibs-fix-metadata.diff
+++ b/findshlibs-fix-metadata.diff
@@ -1,5 +1,5 @@
---- findshlibs-0.7.0/Cargo.toml 2020-05-12T18:08:50+00:00
-+++ findshlibs-0.7.0/Cargo.toml 2020-05-13T05:43:29.127711+00:00
+--- findshlibs-0.8.0/Cargo.toml 2020-11-25T17:26:32+00:00
++++ findshlibs-0.8.0/Cargo.toml 2021-05-11T12:22:18.128310+00:00
@@ -23,8 +23,6 @@
repository = "https://github.com/gimli-rs/findshlibs"
[dependencies.libc]
diff --git a/rust-findshlibs.spec b/rust-findshlibs.spec
index ae6c47e..6c4e3e7 100644
--- a/rust-findshlibs.spec
+++ b/rust-findshlibs.spec
@@ -1,12 +1,12 @@
-# Generated by rust2rpm 13
+# Generated by rust2rpm 17
%bcond_without check
%global debug_package %{nil}
%global crate findshlibs
Name: rust-%{crate}
-Version: 0.7.0
-Release: 3%{?dist}
+Version: 0.8.0
+Release: 1%{?dist}
Summary: Find the set of shared libraries loaded in the current process
# Upstream license specification: MIT OR Apache-2.0
@@ -14,7 +14,7 @@ License: MIT or ASL 2.0
URL:
https://crates.io/crates/findshlibs
Source: %{crates_source}
# Initial patched metadata
-# * No MacOS
+# * drop mac OS-specific dependencies
Patch0: findshlibs-fix-metadata.diff
ExclusiveArch: %{rust_arches}
@@ -75,6 +75,10 @@ which use "default" feature of "%{crate}" crate.
%endif
%changelog
+* Tue May 11 2021 Fabio Valentini <decathorpe(a)gmail.com> - 0.8.0-1
+- Update to version 0.8.0.
+- Fixes RHBZ#1901653
+
* Wed Jan 27 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.7.0-3
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
diff --git a/sources b/sources
index e9bf2fd..82a4ae4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (findshlibs-0.7.0.crate) =
ae7b539a614da7f263be0af0475d9b3f0b81cb206d4a6b42bcea24b0da202dfd2f08770e8594c4c9c601448449305893df1dd823187cfb0b9788a8533d1b963d
+SHA512 (findshlibs-0.8.0.crate) =
4ee36539d477c743208aaba821d608f3af7817376c3ab0f10b27bb230b7deb089c3921d1d5e6fa0ec4edde0da108c902e5fc501a86c7dcc5497b7cfa1e79b307
commit 39b8b208946278719d1e7e2eb5aade1d7e03015b
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Wed Jan 27 17:35:04 2021 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/rust-findshlibs.spec b/rust-findshlibs.spec
index 3b59341..ae6c47e 100644
--- a/rust-findshlibs.spec
+++ b/rust-findshlibs.spec
@@ -6,7 +6,7 @@
Name: rust-%{crate}
Version: 0.7.0
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Find the set of shared libraries loaded in the current process
# Upstream license specification: MIT OR Apache-2.0
@@ -75,6 +75,9 @@ which use "default" feature of "%{crate}" crate.
%endif
%changelog
+* Wed Jan 27 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.7.0-3
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
* Wed Jul 29 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.7.0-2
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
commit 83c54c5aca1e35d9bd8e5e212fdbeeba6c75fda3
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Wed Jul 29 08:04:37 2020 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/rust-findshlibs.spec b/rust-findshlibs.spec
index c816f88..3b59341 100644
--- a/rust-findshlibs.spec
+++ b/rust-findshlibs.spec
@@ -6,7 +6,7 @@
Name: rust-%{crate}
Version: 0.7.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Find the set of shared libraries loaded in the current process
# Upstream license specification: MIT OR Apache-2.0
@@ -75,6 +75,9 @@ which use "default" feature of "%{crate}" crate.
%endif
%changelog
+* Wed Jul 29 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.7.0-2
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
* Wed May 13 07:43:29 CEST 2020 Igor Raits <ignatenkobrain(a)fedoraproject.org> -
0.7.0-1
- Update to 0.7.0
commit b5129347382cfa41295afd6e650c9c5f2135b81a
Author: Igor Raits <ignatenkobrain(a)fedoraproject.org>
Date: Wed May 13 07:44:29 2020 +0200
Update to 0.7.0
Signed-off-by: Igor Raits <ignatenkobrain(a)fedoraproject.org>
diff --git a/.gitignore b/.gitignore
index ba847e7..a942b99 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/findshlibs-0.5.0.crate
+/findshlibs-0.7.0.crate
diff --git a/0001-Fix-address-bias-on-32-bit-systems.patch
b/0001-Fix-address-bias-on-32-bit-systems.patch
deleted file mode 100644
index eb24d5c..0000000
--- a/0001-Fix-address-bias-on-32-bit-systems.patch
+++ /dev/null
@@ -1,179 +0,0 @@
-From 27e72713deb59f7c2e4d6ca06db9e9ff33f24bb4 Mon Sep 17 00:00:00 2001
-From: Jeremy Fitzhardinge <jeremy(a)goop.org>
-Date: Wed, 27 Nov 2019 21:42:52 -0800
-Subject: [PATCH] Fix address/bias on 32-bit systems
-
-More generally, any platform where library addresses can be in the
-"negative" part of the address space (ie, address MSB is 1).
-
-This consistently uses `usize` for both `Bias` and
-addresses (`Avma`, `Svma`). This assumes `Bias` is always positive, and
-can be very large.
-
-Converting `Avma`/`Svma` to usize makes the address
-arithmetic easier, as it avoids `ptr::offset`, which can take both
-positive and negative offsets, which means it can't offset by more than
-half the address space. It is also undefined for general `*mut u8`
-pointer arithmetic ("Both the starting and resulting pointer must
-be either in bounds or one byte past the end of the same allocated
-object" is not met, nor is "The offset being in bounds cannot rely on
-"wrapping around" the address space. That is, the infinite-precision
-sum, in bytes must fit in a usize").
-
-Fixes issue #47
----
- src/lib.rs | 28 +++++++++++++---------------
- src/linux/mod.rs | 8 +++-----
- src/macos/mod.rs | 10 +++++-----
- 3 files changed, 21 insertions(+), 25 deletions(-)
-
-diff --git a/src/lib.rs b/src/lib.rs
-index 0da499f..63b385c 100644
---- a/src/lib.rs
-+++ b/src/lib.rs
-@@ -91,7 +91,6 @@ pub mod linux;
-
- use std::ffi::OsStr;
- use std::fmt::{self, Debug};
--use std::ptr;
-
- pub mod unsupported;
-
-@@ -158,23 +157,23 @@ simple_newtypes! {
- /// Stated virtual memory address.
- ///
- /// See the module documentation for details.
-- type Svma = *const u8
-+ type Svma = usize
- where
-- default = ptr::null(),
-- display = "{:p}";
-+ default = 0,
-+ display = "{:#x}";
-
- /// Actual virtual memory address.
- ///
- /// See the module documentation for details.
-- type Avma = *const u8
-+ type Avma = usize
- where
-- default = ptr::null(),
-- display = "{:p}";
-+ default = 0,
-+ display = "{:#x}";
-
- /// Virtual memory bias.
- ///
- /// See the module documentation for details.
-- type Bias = isize
-+ type Bias = usize
- where
- default = 0,
- display = "{:#x}";
-@@ -214,24 +213,24 @@ pub trait Segment: Sized + Debug {
- fn actual_virtual_memory_address(&self, shlib: &Self::SharedLibrary) ->
Avma {
- let svma = self.stated_virtual_memory_address();
- let bias = shlib.virtual_memory_bias();
-- Avma(unsafe { svma.0.offset(bias.0) })
-+ Avma(svma.0 + bias.0 )
- }
-
- /// Does this segment contain the given address?
- #[inline]
- fn contains_svma(&self, address: Svma) -> bool {
-- let start = self.stated_virtual_memory_address().0 as usize;
-+ let start = self.stated_virtual_memory_address().0;
- let end = start + self.len();
-- let address = address.0 as usize;
-+ let address = address.0;
- start <= address && address < end
- }
-
- /// Does this segment contain the given address?
- #[inline]
- fn contains_avma(&self, shlib: &Self::SharedLibrary, address: Avma) ->
bool {
-- let start = self.actual_virtual_memory_address(shlib).0 as usize;
-+ let start = self.actual_virtual_memory_address(shlib).0;
- let end = start + self.len();
-- let address = address.0 as usize;
-+ let address = address.0;
- start <= address && address < end
- }
- }
-@@ -312,8 +311,7 @@ pub trait SharedLibrary: Sized + Debug {
- #[inline]
- fn avma_to_svma(&self, address: Avma) -> Svma {
- let bias = self.virtual_memory_bias();
-- let reverse_bias = -bias.0;
-- Svma(unsafe { address.0.offset(reverse_bias) })
-+ Svma(address.0 - bias.0)
- }
-
- /// Find all shared libraries in this process and invoke `f` with each one.
-diff --git a/src/linux/mod.rs b/src/linux/mod.rs
-index e56d4a8..b0f60db 100644
---- a/src/linux/mod.rs
-+++ b/src/linux/mod.rs
-@@ -9,7 +9,7 @@ use std::borrow::Cow;
- use std::env::current_exe;
- use std::ffi::{CStr, CString, OsStr};
- use std::fmt;
--use std::isize;
-+use std::usize;
- use std::marker::PhantomData;
- use std::mem;
- use std::os::unix::ffi::OsStrExt;
-@@ -260,8 +260,7 @@ impl<'a> SharedLibraryTrait for SharedLi
-
- #[inline]
- fn virtual_memory_bias(&self) -> Bias {
-- assert!((self.addr as usize) < (isize::MAX as usize));
-- Bias(self.addr as usize as isize)
-+ Bias(self.addr as usize)
- }
-
- #[inline]
-diff --git a/src/macos/mod.rs b/src/macos/mod.rs
-index d3919a0..cb16516 100644
---- a/src/macos/mod.rs
-+++ b/src/macos/mod.rs
-@@ -72,10 +72,10 @@ impl<'a> SegmentTrait for Segment<'a> {
- #[inline]
- fn stated_virtual_memory_address(&self) -> Svma {
- match *self {
-- Segment::Segment32(seg) => Svma(seg.vmaddr as usize as *const u8),
-+ Segment::Segment32(seg) => Svma(seg.vmaddr as usize),
- Segment::Segment64(seg) => {
- assert!(seg.vmaddr <= (usize::MAX as u64));
-- Svma(seg.vmaddr as usize as *const u8)
-+ Svma(seg.vmaddr as usize)
- }
- }
- }
-@@ -198,7 +198,7 @@ impl<'a> MachHeader<'a> {
- /// `<mach-o/dyld.h>` header.
- pub struct SharedLibrary<'a> {
- header: MachHeader<'a>,
-- slide: isize,
-+ slide: usize,
- name: &'a CStr,
- }
-
-@@ -212,7 +212,7 @@ impl<'a> fmt::Debug for SharedLibrary<'a
- }
-
- impl<'a> SharedLibrary<'a> {
-- fn new(header: MachHeader<'a>, slide: isize, name: &'a CStr) ->
Self {
-+ fn new(header: MachHeader<'a>, slide: usize, name: &'a CStr) ->
Self {
- SharedLibrary {
- header: header,
- slide: slide,
-@@ -295,7 +295,7 @@ impl<'a> SharedLibraryTrait for SharedLi
- );
-
- let name = unsafe { CStr::from_ptr(name) };
-- let shlib = SharedLibrary::new(header, slide, name);
-+ let shlib = SharedLibrary::new(header, slide as usize, name);
-
- match f(&shlib).into() {
- IterationControl::Break => break,
diff --git a/findshlibs-fix-metadata.diff b/findshlibs-fix-metadata.diff
new file mode 100644
index 0000000..1885750
--- /dev/null
+++ b/findshlibs-fix-metadata.diff
@@ -0,0 +1,11 @@
+--- findshlibs-0.7.0/Cargo.toml 2020-05-12T18:08:50+00:00
++++ findshlibs-0.7.0/Cargo.toml 2020-05-13T05:43:29.127711+00:00
+@@ -23,8 +23,6 @@
+ repository = "https://github.com/gimli-rs/findshlibs"
+ [dependencies.libc]
+ version = "0.2.65"
+-[target."cfg(target_os = \"macos\")".dependencies.lazy_static]
+-version = "1.4"
+ [badges.coveralls]
+ repository = "gimli-rs/findshlibs"
+
diff --git a/rust-findshlibs.spec b/rust-findshlibs.spec
index 3dd1cc6..c816f88 100644
--- a/rust-findshlibs.spec
+++ b/rust-findshlibs.spec
@@ -1,21 +1,21 @@
-# Generated by rust2rpm 12
+# Generated by rust2rpm 13
%bcond_without check
%global debug_package %{nil}
%global crate findshlibs
Name: rust-%{crate}
-Version: 0.5.0
-Release: 3%{?dist}
+Version: 0.7.0
+Release: 1%{?dist}
Summary: Find the set of shared libraries loaded in the current process
-# Upstream license specification: Apache-2.0/MIT
-License: ASL 2.0 or MIT
+# Upstream license specification: MIT OR Apache-2.0
+License: MIT or ASL 2.0
URL:
https://crates.io/crates/findshlibs
Source: %{crates_source}
-# Fix address/bias on 32-bit systems
-#
https://github.com/gimli-rs/findshlibs/commit/760f122b42aca9d41e7f8de533b...
-Patch0: 0001-Fix-address-bias-on-32-bit-systems.patch
+# Initial patched metadata
+# * No MacOS
+Patch0: findshlibs-fix-metadata.diff
ExclusiveArch: %{rust_arches}
%if %{__cargo_skip_build}
@@ -41,7 +41,7 @@ which use "%{crate}" crate.
%files devel
%license LICENSE-APACHE LICENSE-MIT
-%doc ./README.md
+%doc README.md
%{cargo_registry}/%{crate}-%{version_no_tilde}/
%package -n %{name}+default-devel
@@ -56,23 +56,9 @@ which use "default" feature of "%{crate}" crate.
%files -n %{name}+default-devel
%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
-%package -n %{name}+nightly-devel
-Summary: %{summary}
-BuildArch: noarch
-
-%description -n %{name}+nightly-devel %{_description}
-
-This package contains library source intended for building other packages
-which use "nightly" feature of "%{crate}" crate.
-
-%files -n %{name}+nightly-devel
-%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml
-
%prep
%autosetup -n %{crate}-%{version_no_tilde} -p1
%cargo_prep
-# Dubious executable bits, fixed upstream
-find . -type f -executable -iname "*.rs" -exec chmod 0644 '{}' \;
%generate_buildrequires
%cargo_generate_buildrequires
@@ -89,6 +75,9 @@ find . -type f -executable -iname "*.rs" -exec chmod 0644
'{}' \;
%endif
%changelog
+* Wed May 13 07:43:29 CEST 2020 Igor Raits <ignatenkobrain(a)fedoraproject.org> -
0.7.0-1
+- Update to 0.7.0
+
* Sun Feb 02 18:47:13 CET 2020 Robert-André Mauchin <zebob.m(a)gmail.com> - 0.5.0-3
- Remove extraneous executable bits
diff --git a/sources b/sources
index 917ff50..e9bf2fd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (findshlibs-0.5.0.crate) =
31c315bd459680d62bb0b7721ea4f35899b18752892cb2ef4d077b5f5064af7aa997b177bc12b5ee6f3ef8922455ed72b5996e926818dbfc1961e7cbf60a7c7f
+SHA512 (findshlibs-0.7.0.crate) =
ae7b539a614da7f263be0af0475d9b3f0b81cb206d4a6b42bcea24b0da202dfd2f08770e8594c4c9c601448449305893df1dd823187cfb0b9788a8533d1b963d
commit 510e9173e63fed39a4fea536d470bf2b4980bb98
Author: Igor Raits <ignatenkobrain(a)fedoraproject.org>
Date: Wed Feb 12 11:02:06 2020 +0100
Drop tests
They do not work for quite long time.
Signed-off-by: Igor Raits <ignatenkobrain(a)fedoraproject.org>
diff --git a/tests/.fmf/version b/tests/.fmf/version
deleted file mode 100644
index d00491f..0000000
--- a/tests/.fmf/version
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/provision.fmf b/tests/provision.fmf
deleted file mode 100644
index 503a97c..0000000
--- a/tests/provision.fmf
+++ /dev/null
@@ -1,5 +0,0 @@
----
-standard-inventory-qcow2:
- qemu:
- # `cargo test` usually eats more than 1G.
- m: 4G
diff --git a/tests/tests.yml b/tests/tests.yml
deleted file mode 100644
index f6e8ecc..0000000
--- a/tests/tests.yml
+++ /dev/null
@@ -1,13 +0,0 @@
----
-- hosts: localhost
- roles:
- - role: standard-test-basic
- tags:
- - classic
- repositories:
- - repo: "https://src.fedoraproject.org/tests/rust.git"
- dest: rust
- tests:
- - rust/cargo-test
- environment:
- pkg: rust-findshlibs
commit c9f4d9b403e8f2b6a5da08226a0e8b2db250e779
Author: Robert-André Mauchin <zebob.m(a)gmail.com>
Date: Sun Feb 2 18:54:35 2020 +0100
Remove extraneous executable bits
Signed-off-by: Robert-André Mauchin <zebob.m(a)gmail.com>
diff --git a/rust-findshlibs.spec b/rust-findshlibs.spec
index ee9aac0..3dd1cc6 100644
--- a/rust-findshlibs.spec
+++ b/rust-findshlibs.spec
@@ -6,7 +6,7 @@
Name: rust-%{crate}
Version: 0.5.0
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Find the set of shared libraries loaded in the current process
# Upstream license specification: Apache-2.0/MIT
@@ -71,6 +71,8 @@ which use "nightly" feature of "%{crate}" crate.
%prep
%autosetup -n %{crate}-%{version_no_tilde} -p1
%cargo_prep
+# Dubious executable bits, fixed upstream
+find . -type f -executable -iname "*.rs" -exec chmod 0644 '{}' \;
%generate_buildrequires
%cargo_generate_buildrequires
@@ -87,6 +89,9 @@ which use "nightly" feature of "%{crate}" crate.
%endif
%changelog
+* Sun Feb 02 18:47:13 CET 2020 Robert-André Mauchin <zebob.m(a)gmail.com> - 0.5.0-3
+- Remove extraneous executable bits
+
* Thu Jan 30 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.5.0-2
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
commit c9cde68f07dd4b76591b99ccc46b2c5985932983
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Thu Jan 30 20:31:40 2020 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/rust-findshlibs.spec b/rust-findshlibs.spec
index 34bb8df..ee9aac0 100644
--- a/rust-findshlibs.spec
+++ b/rust-findshlibs.spec
@@ -6,7 +6,7 @@
Name: rust-%{crate}
Version: 0.5.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Find the set of shared libraries loaded in the current process
# Upstream license specification: Apache-2.0/MIT
@@ -87,5 +87,8 @@ which use "nightly" feature of "%{crate}" crate.
%endif
%changelog
+* Thu Jan 30 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.5.0-2
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
* Fri Dec 06 18:20:28 CET 2019 Robert-André Mauchin <zebob.m(a)gmail.com> - 0.5.0-1
- Initial package
commit 02ae3e10a57bb5006127b3ae781ee11bbf411039
Author: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
Date: Fri Dec 20 08:30:51 2019 +0100
Add tests
Signed-off-by: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
diff --git a/rust-findshlibs.spec b/rust-findshlibs.spec
index a989dee..34bb8df 100644
--- a/rust-findshlibs.spec
+++ b/rust-findshlibs.spec
@@ -1,4 +1,4 @@
-# Generated by rust2rpm 10
+# Generated by rust2rpm 12
%bcond_without check
%global debug_package %{nil}
@@ -42,7 +42,7 @@ which use "%{crate}" crate.
%files devel
%license LICENSE-APACHE LICENSE-MIT
%doc ./README.md
-%{cargo_registry}/%{crate}-%{version}/
+%{cargo_registry}/%{crate}-%{version_no_tilde}/
%package -n %{name}+default-devel
Summary: %{summary}
@@ -54,7 +54,7 @@ This package contains library source intended for building other
packages
which use "default" feature of "%{crate}" crate.
%files -n %{name}+default-devel
-%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml
+%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
%package -n %{name}+nightly-devel
Summary: %{summary}
@@ -72,10 +72,6 @@ which use "nightly" feature of "%{crate}" crate.
%autosetup -n %{crate}-%{version_no_tilde} -p1
%cargo_prep
-# Sometimes Rust sources start with #![...] attributes, and "smart" editors
think
-# it's a shebang and make them executable. Then brp-mangle-shebangs gets upset...
-find -name '*.rs' -type f -perm /111 -exec chmod -v -x '{}' '+'
-
%generate_buildrequires
%cargo_generate_buildrequires
diff --git a/tests/.fmf/version b/tests/.fmf/version
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/tests/.fmf/version
@@ -0,0 +1 @@
+1
diff --git a/tests/provision.fmf b/tests/provision.fmf
new file mode 100644
index 0000000..503a97c
--- /dev/null
+++ b/tests/provision.fmf
@@ -0,0 +1,5 @@
+---
+standard-inventory-qcow2:
+ qemu:
+ # `cargo test` usually eats more than 1G.
+ m: 4G
diff --git a/tests/tests.yml b/tests/tests.yml
new file mode 100644
index 0000000..f6e8ecc
--- /dev/null
+++ b/tests/tests.yml
@@ -0,0 +1,13 @@
+---
+- hosts: localhost
+ roles:
+ - role: standard-test-basic
+ tags:
+ - classic
+ repositories:
+ - repo: "https://src.fedoraproject.org/tests/rust.git"
+ dest: rust
+ tests:
+ - rust/cargo-test
+ environment:
+ pkg: rust-findshlibs
commit 08b59f81745d15aa44c68029f48ed4c1e7da6093
Author: Robert-André Mauchin <zebob.m(a)gmail.com>
Date: Thu Dec 19 19:35:52 2019 +0100
Initial import (#1780718)
Signed-off-by: Robert-André Mauchin <zebob.m(a)gmail.com>
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..ba847e7
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/findshlibs-0.5.0.crate
diff --git a/0001-Fix-address-bias-on-32-bit-systems.patch
b/0001-Fix-address-bias-on-32-bit-systems.patch
new file mode 100644
index 0000000..eb24d5c
--- /dev/null
+++ b/0001-Fix-address-bias-on-32-bit-systems.patch
@@ -0,0 +1,179 @@
+From 27e72713deb59f7c2e4d6ca06db9e9ff33f24bb4 Mon Sep 17 00:00:00 2001
+From: Jeremy Fitzhardinge <jeremy(a)goop.org>
+Date: Wed, 27 Nov 2019 21:42:52 -0800
+Subject: [PATCH] Fix address/bias on 32-bit systems
+
+More generally, any platform where library addresses can be in the
+"negative" part of the address space (ie, address MSB is 1).
+
+This consistently uses `usize` for both `Bias` and
+addresses (`Avma`, `Svma`). This assumes `Bias` is always positive, and
+can be very large.
+
+Converting `Avma`/`Svma` to usize makes the address
+arithmetic easier, as it avoids `ptr::offset`, which can take both
+positive and negative offsets, which means it can't offset by more than
+half the address space. It is also undefined for general `*mut u8`
+pointer arithmetic ("Both the starting and resulting pointer must
+be either in bounds or one byte past the end of the same allocated
+object" is not met, nor is "The offset being in bounds cannot rely on
+"wrapping around" the address space. That is, the infinite-precision
+sum, in bytes must fit in a usize").
+
+Fixes issue #47
+---
+ src/lib.rs | 28 +++++++++++++---------------
+ src/linux/mod.rs | 8 +++-----
+ src/macos/mod.rs | 10 +++++-----
+ 3 files changed, 21 insertions(+), 25 deletions(-)
+
+diff --git a/src/lib.rs b/src/lib.rs
+index 0da499f..63b385c 100644
+--- a/src/lib.rs
++++ b/src/lib.rs
+@@ -91,7 +91,6 @@ pub mod linux;
+
+ use std::ffi::OsStr;
+ use std::fmt::{self, Debug};
+-use std::ptr;
+
+ pub mod unsupported;
+
+@@ -158,23 +157,23 @@ simple_newtypes! {
+ /// Stated virtual memory address.
+ ///
+ /// See the module documentation for details.
+- type Svma = *const u8
++ type Svma = usize
+ where
+- default = ptr::null(),
+- display = "{:p}";
++ default = 0,
++ display = "{:#x}";
+
+ /// Actual virtual memory address.
+ ///
+ /// See the module documentation for details.
+- type Avma = *const u8
++ type Avma = usize
+ where
+- default = ptr::null(),
+- display = "{:p}";
++ default = 0,
++ display = "{:#x}";
+
+ /// Virtual memory bias.
+ ///
+ /// See the module documentation for details.
+- type Bias = isize
++ type Bias = usize
+ where
+ default = 0,
+ display = "{:#x}";
+@@ -214,24 +213,24 @@ pub trait Segment: Sized + Debug {
+ fn actual_virtual_memory_address(&self, shlib: &Self::SharedLibrary) ->
Avma {
+ let svma = self.stated_virtual_memory_address();
+ let bias = shlib.virtual_memory_bias();
+- Avma(unsafe { svma.0.offset(bias.0) })
++ Avma(svma.0 + bias.0 )
+ }
+
+ /// Does this segment contain the given address?
+ #[inline]
+ fn contains_svma(&self, address: Svma) -> bool {
+- let start = self.stated_virtual_memory_address().0 as usize;
++ let start = self.stated_virtual_memory_address().0;
+ let end = start + self.len();
+- let address = address.0 as usize;
++ let address = address.0;
+ start <= address && address < end
+ }
+
+ /// Does this segment contain the given address?
+ #[inline]
+ fn contains_avma(&self, shlib: &Self::SharedLibrary, address: Avma) ->
bool {
+- let start = self.actual_virtual_memory_address(shlib).0 as usize;
++ let start = self.actual_virtual_memory_address(shlib).0;
+ let end = start + self.len();
+- let address = address.0 as usize;
++ let address = address.0;
+ start <= address && address < end
+ }
+ }
+@@ -312,8 +311,7 @@ pub trait SharedLibrary: Sized + Debug {
+ #[inline]
+ fn avma_to_svma(&self, address: Avma) -> Svma {
+ let bias = self.virtual_memory_bias();
+- let reverse_bias = -bias.0;
+- Svma(unsafe { address.0.offset(reverse_bias) })
++ Svma(address.0 - bias.0)
+ }
+
+ /// Find all shared libraries in this process and invoke `f` with each one.
+diff --git a/src/linux/mod.rs b/src/linux/mod.rs
+index e56d4a8..b0f60db 100644
+--- a/src/linux/mod.rs
++++ b/src/linux/mod.rs
+@@ -9,7 +9,7 @@ use std::borrow::Cow;
+ use std::env::current_exe;
+ use std::ffi::{CStr, CString, OsStr};
+ use std::fmt;
+-use std::isize;
++use std::usize;
+ use std::marker::PhantomData;
+ use std::mem;
+ use std::os::unix::ffi::OsStrExt;
+@@ -260,8 +260,7 @@ impl<'a> SharedLibraryTrait for SharedLi
+
+ #[inline]
+ fn virtual_memory_bias(&self) -> Bias {
+- assert!((self.addr as usize) < (isize::MAX as usize));
+- Bias(self.addr as usize as isize)
++ Bias(self.addr as usize)
+ }
+
+ #[inline]
+diff --git a/src/macos/mod.rs b/src/macos/mod.rs
+index d3919a0..cb16516 100644
+--- a/src/macos/mod.rs
++++ b/src/macos/mod.rs
+@@ -72,10 +72,10 @@ impl<'a> SegmentTrait for Segment<'a> {
+ #[inline]
+ fn stated_virtual_memory_address(&self) -> Svma {
+ match *self {
+- Segment::Segment32(seg) => Svma(seg.vmaddr as usize as *const u8),
++ Segment::Segment32(seg) => Svma(seg.vmaddr as usize),
+ Segment::Segment64(seg) => {
+ assert!(seg.vmaddr <= (usize::MAX as u64));
+- Svma(seg.vmaddr as usize as *const u8)
++ Svma(seg.vmaddr as usize)
+ }
+ }
+ }
+@@ -198,7 +198,7 @@ impl<'a> MachHeader<'a> {
+ /// `<mach-o/dyld.h>` header.
+ pub struct SharedLibrary<'a> {
+ header: MachHeader<'a>,
+- slide: isize,
++ slide: usize,
+ name: &'a CStr,
+ }
+
+@@ -212,7 +212,7 @@ impl<'a> fmt::Debug for SharedLibrary<'a
+ }
+
+ impl<'a> SharedLibrary<'a> {
+- fn new(header: MachHeader<'a>, slide: isize, name: &'a CStr) ->
Self {
++ fn new(header: MachHeader<'a>, slide: usize, name: &'a CStr) ->
Self {
+ SharedLibrary {
+ header: header,
+ slide: slide,
+@@ -295,7 +295,7 @@ impl<'a> SharedLibraryTrait for SharedLi
+ );
+
+ let name = unsafe { CStr::from_ptr(name) };
+- let shlib = SharedLibrary::new(header, slide, name);
++ let shlib = SharedLibrary::new(header, slide as usize, name);
+
+ match f(&shlib).into() {
+ IterationControl::Break => break,
diff --git a/rust-findshlibs.spec b/rust-findshlibs.spec
new file mode 100644
index 0000000..a989dee
--- /dev/null
+++ b/rust-findshlibs.spec
@@ -0,0 +1,95 @@
+# Generated by rust2rpm 10
+%bcond_without check
+%global debug_package %{nil}
+
+%global crate findshlibs
+
+Name: rust-%{crate}
+Version: 0.5.0
+Release: 1%{?dist}
+Summary: Find the set of shared libraries loaded in the current process
+
+# Upstream license specification: Apache-2.0/MIT
+License: ASL 2.0 or MIT
+URL:
https://crates.io/crates/findshlibs
+Source: %{crates_source}
+# Fix address/bias on 32-bit systems
+#
https://github.com/gimli-rs/findshlibs/commit/760f122b42aca9d41e7f8de533b...
+Patch0: 0001-Fix-address-bias-on-32-bit-systems.patch
+
+ExclusiveArch: %{rust_arches}
+%if %{__cargo_skip_build}
+BuildArch: noarch
+%endif
+
+BuildRequires: rust-packaging
+
+%global _description %{expand:
+Find the set of shared libraries loaded in the current process with a cross
+platform API.}
+
+%description %{_description}
+
+%package devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description devel %{_description}
+
+This package contains library source intended for building other packages
+which use "%{crate}" crate.
+
+%files devel
+%license LICENSE-APACHE LICENSE-MIT
+%doc ./README.md
+%{cargo_registry}/%{crate}-%{version}/
+
+%package -n %{name}+default-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+default-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "default" feature of "%{crate}" crate.
+
+%files -n %{name}+default-devel
+%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml
+
+%package -n %{name}+nightly-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+nightly-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "nightly" feature of "%{crate}" crate.
+
+%files -n %{name}+nightly-devel
+%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml
+
+%prep
+%autosetup -n %{crate}-%{version_no_tilde} -p1
+%cargo_prep
+
+# Sometimes Rust sources start with #![...] attributes, and "smart" editors
think
+# it's a shebang and make them executable. Then brp-mangle-shebangs gets upset...
+find -name '*.rs' -type f -perm /111 -exec chmod -v -x '{}' '+'
+
+%generate_buildrequires
+%cargo_generate_buildrequires
+
+%build
+%cargo_build
+
+%install
+%cargo_install
+
+%if %{with check}
+%check
+%cargo_test
+%endif
+
+%changelog
+* Fri Dec 06 18:20:28 CET 2019 Robert-André Mauchin <zebob.m(a)gmail.com> - 0.5.0-1
+- Initial package
diff --git a/sources b/sources
new file mode 100644
index 0000000..917ff50
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+SHA512 (findshlibs-0.5.0.crate) =
31c315bd459680d62bb0b7721ea4f35899b18752892cb2ef4d077b5f5064af7aa997b177bc12b5ee6f3ef8922455ed72b5996e926818dbfc1961e7cbf60a7c7f