The package rpms/rust-associative-cache.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-associative-cache.git/commit/?….
Change:
-%ifarch %{ix86} %{arm}
Thanks.
Full change:
============
commit a393ed4d472fda64e19a515f3e14d751cd1530ef
Author: Benjamin A. Beasley <code(a)musicinmybrain.net>
Date: Tue Mar 31 20:07:56 2026 +0100
Update to version 3.0.0; Fixes RHBZ#2451317
diff --git a/.gitignore b/.gitignore
index a9bdb96..5f49319 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/associative-cache-1.0.1.crate
/associative-cache-2.0.0.crate
+/associative-cache-3.0.0.crate
diff --git a/associative-cache-fix-metadata.diff b/associative-cache-fix-metadata.diff
deleted file mode 100644
index 6632024..0000000
--- a/associative-cache-fix-metadata.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- associative-cache-2.0.0/Cargo.toml 1970-01-01T00:00:01+00:00
-+++ associative-cache-2.0.0/Cargo.toml 2023-10-10T19:11:36.242692+00:00
-@@ -31,6 +31,8 @@
- ]
- license = "MIT OR Apache-2.0"
- repository = "https://github.com/fitzgen/associative-cache"
-+exclude = ["/ci/", "/azure-pipelines.yaml"]
-+
-
- [package.metadata.docs.rs]
- all-features = true
diff --git a/rust-associative-cache.spec b/rust-associative-cache.spec
index 74b22b9..743f90a 100644
--- a/rust-associative-cache.spec
+++ b/rust-associative-cache.spec
@@ -1,43 +1,32 @@
-# Generated by rust2rpm 24
-
-# * tests fail on 32-bit arches
-# https://github.com/fitzgen/associative-cache/issues/15
-%ifarch %{ix86} %{arm}
-%bcond check 0
-%else
+# Generated by rust2rpm 28
%bcond check 1
-%endif
%global debug_package %{nil}
%global crate associative-cache
Name: rust-associative-cache
-Version: 2.0.0
+Version: 3.0.0
Release: %autorelease
Summary: Generic N-way associative cache
License: MIT OR Apache-2.0
URL: https://crates.io/crates/associative-cache
-Source0: %{crates_source}
-# Upstream is inactive/unresponsive and has not included the license texts.
-# A bug was filled: https://github.com/fitzgen/associative-cache/issues/14
-# The upstream maintainers explicitly specify in Cargo.toml that the crate is
-# licensed under the SPDX identifier "MIT OR Apache-2.0".
-# Both of these licenses require including their texts when distributing the
-# software.
-# In compliance with
-# https://docs.fedoraproject.org/en-US/packaging-guidelines/LicensingGuidelin… ,
-# we include the license text from canonical sources in the package ourselves.
-# When/if upstream responds to the aforementioned issue report,
-# these will be removed.
-Source1: https://www.apache.org/licenses/LICENSE-2.0.txt#/LICENSE-APACHE
-Source2: https://github.com/spdx/license-list-data/raw/main/text/MIT.txt#/LICENSE-MIT
-# Manually created patch for downstream crate metadata changes
-# - Remove unnecessary packages from packaged crate.
-# We don't need to include CI configuration in the package.
-Patch: associative-cache-fix-metadata.diff
-
-BuildRequires: rust-packaging >= 21
+Source: %{crates_source}
+# * # Upstream is inactive/unresponsive and has not included the license texts.
+# # A bug was filled: https://github.com/fitzgen/associative-cache/issues/14
+# # The upstream maintainers explicitly specify in Cargo.toml that the crate is
+# # licensed under the SPDX identifier "MIT OR Apache-2.0".
+# # Both of these licenses require including their texts when distributing the
+# # software.
+# # In compliance with
+# # https://docs.fedoraproject.org/en-US/packaging-guidelines/LicensingGuidelin… ,
+# # we include the license text from canonical sources in the package ourselves.
+# # When/if upstream responds to the aforementioned issue report,
+# # these will be removed.
+Source2: https://www.apache.org/licenses/LICENSE-2.0.txt#/LICENSE-APACHE
+Source3: https://github.com/spdx/license-list-data/raw/main/text/MIT.txt#/LICENSE-MIT
+
+BuildRequires: cargo-rpm-macros >= 24
%global _description %{expand:
A generic N-way associative cache with fixed-size capacity and random or
@@ -85,8 +74,11 @@ use the "rand" feature of the "%{crate}" crate.
%ghost %{crate_instdir}/Cargo.toml
%prep
-%autosetup -n %{crate}-%{version_no_tilde} -p1
-cp -p %{S:1} %{S:2} .
+%autosetup -n %{crate}-%{version} -p1
+cp -p %{S:2} %{S:3} .
+# Remove useless execute bit from Rust sources
+# https://github.com/fitzgen/associative-cache/pull/27
+find src -type f -name '*.rs' -executable -exec chmod -v a-x '{}' '+'
%cargo_prep
%generate_buildrequires
@@ -100,8 +92,16 @@ cp -p %{S:1} %{S:2} .
%if %{with check}
%check
-# Doctests are broken
-%cargo_test -- --lib
+%if 0%{?__isa_bits} == 32
+# * Tests fail on 32-bit architectures
+# * https://github.com/fitzgen/associative-cache/issues/15
+%{cargo_test -- -- --exact %{shrink:
+ --skip indices::tests::pointer_direct_mapped
+ --skip indices::tests::pointer_two_way
+}}
+%else
+%cargo_test
+%endif
%endif
%changelog
diff --git a/rust2rpm.toml b/rust2rpm.toml
new file mode 100644
index 0000000..a7522ed
--- /dev/null
+++ b/rust2rpm.toml
@@ -0,0 +1,56 @@
+[package]
+# Upstream: “Generic N-way associative cache with fixed-size capacity and
+# random or least recently used”
+summary = "Generic N-way associative cache"
+license-files.include = [
+ "LICENSE-APACHE",
+ "LICENSE-MIT",
+]
+
+[[package.extra-sources]]
+number = 2
+file = "https://www.apache.org/licenses/LICENSE-2.0.txt#/LICENSE-APACHE"
+comments = [
+ """\
+# Upstream is inactive/unresponsive and has not included the license texts.
+# A bug was filled: https://github.com/fitzgen/associative-cache/issues/14
+# The upstream maintainers explicitly specify in Cargo.toml that the crate is
+# licensed under the SPDX identifier "MIT OR Apache-2.0".
+# Both of these licenses require including their texts when distributing the
+# software.
+# In compliance with
+# https://docs.fedoraproject.org/en-US/packaging-guidelines/LicensingGuidelin… ,
+# we include the license text from canonical sources in the package ourselves.
+# When/if upstream responds to the aforementioned issue report,
+# these will be removed.
+""",
+]
+
+[[package.extra-sources]]
+number = 3
+file = "https://github.com/spdx/license-list-data/raw/main/text/MIT.txt#/LICENSE-MIT"
+
+[scripts.prep]
+pre = [
+ "cp -p %{S:2} %{S:3} .",
+ "# Remove useless execute bit from Rust sources",
+ "# https://github.com/fitzgen/associative-cache/pull/27",
+ "find src -type f -name '*.rs' -executable -exec chmod -v a-x '{}' '+'",
+]
+
+[scripts.check]
+pre = [
+ """\
+%if 0%{?__isa_bits} == 32
+# * Tests fail on 32-bit architectures
+# * https://github.com/fitzgen/associative-cache/issues/15
+%{cargo_test -- -- --exact %{shrink:
+ --skip indices::tests::pointer_direct_mapped
+ --skip indices::tests::pointer_two_way
+}}
+%else\
+""",
+]
+post = [
+ "%endif",
+]
diff --git a/sources b/sources
index f2fc034..0433784 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (associative-cache-2.0.0.crate) = 854f5130f286aaa76ffa2f4cbe27ca57c8220ec517c0d6fac46e5a505a3cb5fdc9ab60818db9f890b63ce2f44d243594d44747f7a87af9f304aaab3f4a4e8567
+SHA512 (associative-cache-3.0.0.crate) = 839258f61af470cda946d35fcdae22f59f7fd1484248d599c393b29e2171af6308e04e6fee43640a23d21c8677e73149ad5eb5e79806f0e8acb1668f9abd6f69
commit b67d75762414fdab50abfebc84e9c09e96d9d39e
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Sat Jan 17 12:29:06 2026 +0000
Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
commit 33f662f2ea337ddfd8434737cda5f8903f597ed6
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Fri Jul 25 13:09:24 2025 +0000
Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
The package rpms/rust-associative-cache.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-associative-cache.git/commit/?….
Change:
-%ifarch %{ix86} %{arm}
Thanks.
Full change:
============
commit a393ed4d472fda64e19a515f3e14d751cd1530ef
Author: Benjamin A. Beasley <code(a)musicinmybrain.net>
Date: Tue Mar 31 20:07:56 2026 +0100
Update to version 3.0.0; Fixes RHBZ#2451317
diff --git a/.gitignore b/.gitignore
index a9bdb96..5f49319 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/associative-cache-1.0.1.crate
/associative-cache-2.0.0.crate
+/associative-cache-3.0.0.crate
diff --git a/associative-cache-fix-metadata.diff b/associative-cache-fix-metadata.diff
deleted file mode 100644
index 6632024..0000000
--- a/associative-cache-fix-metadata.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- associative-cache-2.0.0/Cargo.toml 1970-01-01T00:00:01+00:00
-+++ associative-cache-2.0.0/Cargo.toml 2023-10-10T19:11:36.242692+00:00
-@@ -31,6 +31,8 @@
- ]
- license = "MIT OR Apache-2.0"
- repository = "https://github.com/fitzgen/associative-cache"
-+exclude = ["/ci/", "/azure-pipelines.yaml"]
-+
-
- [package.metadata.docs.rs]
- all-features = true
diff --git a/rust-associative-cache.spec b/rust-associative-cache.spec
index 74b22b9..743f90a 100644
--- a/rust-associative-cache.spec
+++ b/rust-associative-cache.spec
@@ -1,43 +1,32 @@
-# Generated by rust2rpm 24
-
-# * tests fail on 32-bit arches
-# https://github.com/fitzgen/associative-cache/issues/15
-%ifarch %{ix86} %{arm}
-%bcond check 0
-%else
+# Generated by rust2rpm 28
%bcond check 1
-%endif
%global debug_package %{nil}
%global crate associative-cache
Name: rust-associative-cache
-Version: 2.0.0
+Version: 3.0.0
Release: %autorelease
Summary: Generic N-way associative cache
License: MIT OR Apache-2.0
URL: https://crates.io/crates/associative-cache
-Source0: %{crates_source}
-# Upstream is inactive/unresponsive and has not included the license texts.
-# A bug was filled: https://github.com/fitzgen/associative-cache/issues/14
-# The upstream maintainers explicitly specify in Cargo.toml that the crate is
-# licensed under the SPDX identifier "MIT OR Apache-2.0".
-# Both of these licenses require including their texts when distributing the
-# software.
-# In compliance with
-# https://docs.fedoraproject.org/en-US/packaging-guidelines/LicensingGuidelin… ,
-# we include the license text from canonical sources in the package ourselves.
-# When/if upstream responds to the aforementioned issue report,
-# these will be removed.
-Source1: https://www.apache.org/licenses/LICENSE-2.0.txt#/LICENSE-APACHE
-Source2: https://github.com/spdx/license-list-data/raw/main/text/MIT.txt#/LICENSE-MIT
-# Manually created patch for downstream crate metadata changes
-# - Remove unnecessary packages from packaged crate.
-# We don't need to include CI configuration in the package.
-Patch: associative-cache-fix-metadata.diff
-
-BuildRequires: rust-packaging >= 21
+Source: %{crates_source}
+# * # Upstream is inactive/unresponsive and has not included the license texts.
+# # A bug was filled: https://github.com/fitzgen/associative-cache/issues/14
+# # The upstream maintainers explicitly specify in Cargo.toml that the crate is
+# # licensed under the SPDX identifier "MIT OR Apache-2.0".
+# # Both of these licenses require including their texts when distributing the
+# # software.
+# # In compliance with
+# # https://docs.fedoraproject.org/en-US/packaging-guidelines/LicensingGuidelin… ,
+# # we include the license text from canonical sources in the package ourselves.
+# # When/if upstream responds to the aforementioned issue report,
+# # these will be removed.
+Source2: https://www.apache.org/licenses/LICENSE-2.0.txt#/LICENSE-APACHE
+Source3: https://github.com/spdx/license-list-data/raw/main/text/MIT.txt#/LICENSE-MIT
+
+BuildRequires: cargo-rpm-macros >= 24
%global _description %{expand:
A generic N-way associative cache with fixed-size capacity and random or
@@ -85,8 +74,11 @@ use the "rand" feature of the "%{crate}" crate.
%ghost %{crate_instdir}/Cargo.toml
%prep
-%autosetup -n %{crate}-%{version_no_tilde} -p1
-cp -p %{S:1} %{S:2} .
+%autosetup -n %{crate}-%{version} -p1
+cp -p %{S:2} %{S:3} .
+# Remove useless execute bit from Rust sources
+# https://github.com/fitzgen/associative-cache/pull/27
+find src -type f -name '*.rs' -executable -exec chmod -v a-x '{}' '+'
%cargo_prep
%generate_buildrequires
@@ -100,8 +92,16 @@ cp -p %{S:1} %{S:2} .
%if %{with check}
%check
-# Doctests are broken
-%cargo_test -- --lib
+%if 0%{?__isa_bits} == 32
+# * Tests fail on 32-bit architectures
+# * https://github.com/fitzgen/associative-cache/issues/15
+%{cargo_test -- -- --exact %{shrink:
+ --skip indices::tests::pointer_direct_mapped
+ --skip indices::tests::pointer_two_way
+}}
+%else
+%cargo_test
+%endif
%endif
%changelog
diff --git a/rust2rpm.toml b/rust2rpm.toml
new file mode 100644
index 0000000..a7522ed
--- /dev/null
+++ b/rust2rpm.toml
@@ -0,0 +1,56 @@
+[package]
+# Upstream: “Generic N-way associative cache with fixed-size capacity and
+# random or least recently used”
+summary = "Generic N-way associative cache"
+license-files.include = [
+ "LICENSE-APACHE",
+ "LICENSE-MIT",
+]
+
+[[package.extra-sources]]
+number = 2
+file = "https://www.apache.org/licenses/LICENSE-2.0.txt#/LICENSE-APACHE"
+comments = [
+ """\
+# Upstream is inactive/unresponsive and has not included the license texts.
+# A bug was filled: https://github.com/fitzgen/associative-cache/issues/14
+# The upstream maintainers explicitly specify in Cargo.toml that the crate is
+# licensed under the SPDX identifier "MIT OR Apache-2.0".
+# Both of these licenses require including their texts when distributing the
+# software.
+# In compliance with
+# https://docs.fedoraproject.org/en-US/packaging-guidelines/LicensingGuidelin… ,
+# we include the license text from canonical sources in the package ourselves.
+# When/if upstream responds to the aforementioned issue report,
+# these will be removed.
+""",
+]
+
+[[package.extra-sources]]
+number = 3
+file = "https://github.com/spdx/license-list-data/raw/main/text/MIT.txt#/LICENSE-MIT"
+
+[scripts.prep]
+pre = [
+ "cp -p %{S:2} %{S:3} .",
+ "# Remove useless execute bit from Rust sources",
+ "# https://github.com/fitzgen/associative-cache/pull/27",
+ "find src -type f -name '*.rs' -executable -exec chmod -v a-x '{}' '+'",
+]
+
+[scripts.check]
+pre = [
+ """\
+%if 0%{?__isa_bits} == 32
+# * Tests fail on 32-bit architectures
+# * https://github.com/fitzgen/associative-cache/issues/15
+%{cargo_test -- -- --exact %{shrink:
+ --skip indices::tests::pointer_direct_mapped
+ --skip indices::tests::pointer_two_way
+}}
+%else\
+""",
+]
+post = [
+ "%endif",
+]
diff --git a/sources b/sources
index f2fc034..0433784 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (associative-cache-2.0.0.crate) = 854f5130f286aaa76ffa2f4cbe27ca57c8220ec517c0d6fac46e5a505a3cb5fdc9ab60818db9f890b63ce2f44d243594d44747f7a87af9f304aaab3f4a4e8567
+SHA512 (associative-cache-3.0.0.crate) = 839258f61af470cda946d35fcdae22f59f7fd1484248d599c393b29e2171af6308e04e6fee43640a23d21c8677e73149ad5eb5e79806f0e8acb1668f9abd6f69
The package rpms/rust-associative-cache.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-associative-cache.git/commit/?….
Change:
-%ifarch %{ix86} %{arm}
Thanks.
Full change:
============
commit a393ed4d472fda64e19a515f3e14d751cd1530ef
Author: Benjamin A. Beasley <code(a)musicinmybrain.net>
Date: Tue Mar 31 20:07:56 2026 +0100
Update to version 3.0.0; Fixes RHBZ#2451317
diff --git a/.gitignore b/.gitignore
index a9bdb96..5f49319 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/associative-cache-1.0.1.crate
/associative-cache-2.0.0.crate
+/associative-cache-3.0.0.crate
diff --git a/associative-cache-fix-metadata.diff b/associative-cache-fix-metadata.diff
deleted file mode 100644
index 6632024..0000000
--- a/associative-cache-fix-metadata.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- associative-cache-2.0.0/Cargo.toml 1970-01-01T00:00:01+00:00
-+++ associative-cache-2.0.0/Cargo.toml 2023-10-10T19:11:36.242692+00:00
-@@ -31,6 +31,8 @@
- ]
- license = "MIT OR Apache-2.0"
- repository = "https://github.com/fitzgen/associative-cache"
-+exclude = ["/ci/", "/azure-pipelines.yaml"]
-+
-
- [package.metadata.docs.rs]
- all-features = true
diff --git a/rust-associative-cache.spec b/rust-associative-cache.spec
index 74b22b9..743f90a 100644
--- a/rust-associative-cache.spec
+++ b/rust-associative-cache.spec
@@ -1,43 +1,32 @@
-# Generated by rust2rpm 24
-
-# * tests fail on 32-bit arches
-# https://github.com/fitzgen/associative-cache/issues/15
-%ifarch %{ix86} %{arm}
-%bcond check 0
-%else
+# Generated by rust2rpm 28
%bcond check 1
-%endif
%global debug_package %{nil}
%global crate associative-cache
Name: rust-associative-cache
-Version: 2.0.0
+Version: 3.0.0
Release: %autorelease
Summary: Generic N-way associative cache
License: MIT OR Apache-2.0
URL: https://crates.io/crates/associative-cache
-Source0: %{crates_source}
-# Upstream is inactive/unresponsive and has not included the license texts.
-# A bug was filled: https://github.com/fitzgen/associative-cache/issues/14
-# The upstream maintainers explicitly specify in Cargo.toml that the crate is
-# licensed under the SPDX identifier "MIT OR Apache-2.0".
-# Both of these licenses require including their texts when distributing the
-# software.
-# In compliance with
-# https://docs.fedoraproject.org/en-US/packaging-guidelines/LicensingGuidelin… ,
-# we include the license text from canonical sources in the package ourselves.
-# When/if upstream responds to the aforementioned issue report,
-# these will be removed.
-Source1: https://www.apache.org/licenses/LICENSE-2.0.txt#/LICENSE-APACHE
-Source2: https://github.com/spdx/license-list-data/raw/main/text/MIT.txt#/LICENSE-MIT
-# Manually created patch for downstream crate metadata changes
-# - Remove unnecessary packages from packaged crate.
-# We don't need to include CI configuration in the package.
-Patch: associative-cache-fix-metadata.diff
-
-BuildRequires: rust-packaging >= 21
+Source: %{crates_source}
+# * # Upstream is inactive/unresponsive and has not included the license texts.
+# # A bug was filled: https://github.com/fitzgen/associative-cache/issues/14
+# # The upstream maintainers explicitly specify in Cargo.toml that the crate is
+# # licensed under the SPDX identifier "MIT OR Apache-2.0".
+# # Both of these licenses require including their texts when distributing the
+# # software.
+# # In compliance with
+# # https://docs.fedoraproject.org/en-US/packaging-guidelines/LicensingGuidelin… ,
+# # we include the license text from canonical sources in the package ourselves.
+# # When/if upstream responds to the aforementioned issue report,
+# # these will be removed.
+Source2: https://www.apache.org/licenses/LICENSE-2.0.txt#/LICENSE-APACHE
+Source3: https://github.com/spdx/license-list-data/raw/main/text/MIT.txt#/LICENSE-MIT
+
+BuildRequires: cargo-rpm-macros >= 24
%global _description %{expand:
A generic N-way associative cache with fixed-size capacity and random or
@@ -85,8 +74,11 @@ use the "rand" feature of the "%{crate}" crate.
%ghost %{crate_instdir}/Cargo.toml
%prep
-%autosetup -n %{crate}-%{version_no_tilde} -p1
-cp -p %{S:1} %{S:2} .
+%autosetup -n %{crate}-%{version} -p1
+cp -p %{S:2} %{S:3} .
+# Remove useless execute bit from Rust sources
+# https://github.com/fitzgen/associative-cache/pull/27
+find src -type f -name '*.rs' -executable -exec chmod -v a-x '{}' '+'
%cargo_prep
%generate_buildrequires
@@ -100,8 +92,16 @@ cp -p %{S:1} %{S:2} .
%if %{with check}
%check
-# Doctests are broken
-%cargo_test -- --lib
+%if 0%{?__isa_bits} == 32
+# * Tests fail on 32-bit architectures
+# * https://github.com/fitzgen/associative-cache/issues/15
+%{cargo_test -- -- --exact %{shrink:
+ --skip indices::tests::pointer_direct_mapped
+ --skip indices::tests::pointer_two_way
+}}
+%else
+%cargo_test
+%endif
%endif
%changelog
diff --git a/rust2rpm.toml b/rust2rpm.toml
new file mode 100644
index 0000000..a7522ed
--- /dev/null
+++ b/rust2rpm.toml
@@ -0,0 +1,56 @@
+[package]
+# Upstream: “Generic N-way associative cache with fixed-size capacity and
+# random or least recently used”
+summary = "Generic N-way associative cache"
+license-files.include = [
+ "LICENSE-APACHE",
+ "LICENSE-MIT",
+]
+
+[[package.extra-sources]]
+number = 2
+file = "https://www.apache.org/licenses/LICENSE-2.0.txt#/LICENSE-APACHE"
+comments = [
+ """\
+# Upstream is inactive/unresponsive and has not included the license texts.
+# A bug was filled: https://github.com/fitzgen/associative-cache/issues/14
+# The upstream maintainers explicitly specify in Cargo.toml that the crate is
+# licensed under the SPDX identifier "MIT OR Apache-2.0".
+# Both of these licenses require including their texts when distributing the
+# software.
+# In compliance with
+# https://docs.fedoraproject.org/en-US/packaging-guidelines/LicensingGuidelin… ,
+# we include the license text from canonical sources in the package ourselves.
+# When/if upstream responds to the aforementioned issue report,
+# these will be removed.
+""",
+]
+
+[[package.extra-sources]]
+number = 3
+file = "https://github.com/spdx/license-list-data/raw/main/text/MIT.txt#/LICENSE-MIT"
+
+[scripts.prep]
+pre = [
+ "cp -p %{S:2} %{S:3} .",
+ "# Remove useless execute bit from Rust sources",
+ "# https://github.com/fitzgen/associative-cache/pull/27",
+ "find src -type f -name '*.rs' -executable -exec chmod -v a-x '{}' '+'",
+]
+
+[scripts.check]
+pre = [
+ """\
+%if 0%{?__isa_bits} == 32
+# * Tests fail on 32-bit architectures
+# * https://github.com/fitzgen/associative-cache/issues/15
+%{cargo_test -- -- --exact %{shrink:
+ --skip indices::tests::pointer_direct_mapped
+ --skip indices::tests::pointer_two_way
+}}
+%else\
+""",
+]
+post = [
+ "%endif",
+]
diff --git a/sources b/sources
index f2fc034..0433784 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (associative-cache-2.0.0.crate) = 854f5130f286aaa76ffa2f4cbe27ca57c8220ec517c0d6fac46e5a505a3cb5fdc9ab60818db9f890b63ce2f44d243594d44747f7a87af9f304aaab3f4a4e8567
+SHA512 (associative-cache-3.0.0.crate) = 839258f61af470cda946d35fcdae22f59f7fd1484248d599c393b29e2171af6308e04e6fee43640a23d21c8677e73149ad5eb5e79806f0e8acb1668f9abd6f69
The package rpms/credentials-fetcher.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/credentials-fetcher.git/commit/?id=….
Change:
-ExclusiveArch: x86_64 aarch64 s390x
Thanks.
Full change:
============
commit 74cf21b586c1023970cac8f5b99bcf5c1c22cf01
Author: Tom spot Callaway <spotaws(a)amazon.com>
Date: Mon Mar 30 12:47:55 2026 -0400
move to go, 2.0.1
diff --git a/.gitignore b/.gitignore
index e6ad6a3..aadce76 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,5 @@
/v.1.2.0.tar.gz
/v.1.3.6.tar.gz
/v.1.3.8.tar.gz
+/credentials-fetcher-2.0.1.tar.gz
+/credentials-fetcher-2.0.1-vendor.tar.bz2
diff --git a/LICENSE.txt b/LICENSE.txt
new file mode 100644
index 0000000..d645695
--- /dev/null
+++ b/LICENSE.txt
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
diff --git a/credentials-fetcher.spec b/credentials-fetcher.spec
index 448cf59..a6e50cb 100644
--- a/credentials-fetcher.spec
+++ b/credentials-fetcher.spec
@@ -1,226 +1,122 @@
-%global major_version 1
-%global minor_version 3
-%global patch_version 8
+# Generated by go2rpm 1.19.0
+# Check assumes a lot of network setup that is not valid
+%bcond check 0
-# For handling bump release by rpmdev-bumpspec and mass rebuild
-%global baserelease 8
-%define _unpackaged_files_terminate_build 0
+# Define _unitdir if not already defined
+%{!?_unitdir: %global _unitdir /usr/lib/systemd/system}
-Name: credentials-fetcher
-Version: %{major_version}.%{minor_version}.%{patch_version}
-Release: %{baserelease}%{?dist}
-Summary: credentials-fetcher is a daemon that refreshes tickets or tokens periodically
-
-License: Apache-2.0
-URL: https://github.com/aws/credentials-fetcher
-Source0: https://github.com/aws/credentials-fetcher/archive/refs/tags/v.%{version}.t…
-
-# fix protobuf detection for modern protobuf
-# https://github.com/aws/credentials-fetcher/pull/116
-# Cherry-picked to v.1.3.6 and re-created against the released archive
-# Patch: credentials-fetcher-1.3.6-fixprotobuf.patch
-# Bump dotnet-sdk to 8.0
-#Patch: credentials-fetcher-1.3.6-fix-dotnet-version.patch
-# Disable integ-tests for Fedora, for now
-Patch0: credentials-fetcher-1.3.8-disable-integ-tests-for-Fedora.patch
-# Also disable integ-tests for EL targets, for now
-Patch1: credentials-fetcher-1.3.7-no-api-tests-on-el.patch
-
-BuildRequires: cmake chrpath openldap-clients grpc-devel gcc-c++ glib2-devel jsoncpp-devel
-BuildRequires: openssl-devel zlib-devel protobuf-devel re2-devel krb5-devel systemd-devel
-BuildRequires: systemd-rpm-macros dotnet-sdk-8.0 grpc-plugins
-
-%if 0%{?amzn} >= 2023
-BuildRequires: aws-sdk-cpp-devel aws-sdk-cpp aws-sdk-cpp-static
-%endif
-
-Requires: bind-utils openldap openldap-clients awscli dotnet-runtime-8.0 jsoncpp
+# Define _libexec if not already defined
+%{!?_libexec: %global _libexec /usr/libexec}
+
+%define SERVICE_NAME credentials-fetcher.service
-ExclusiveArch: x86_64 aarch64 s390x
+# https://github.com/aws/credentials-fetcher
+%global goipath github.com/aws/credentials-fetcher
+Version: 2.0.1
-# https://docs.fedoraproject.org/en-US/packaging-guidelines/CMake/
+%gometa -L -f
+
+Name: credentials-fetcher
+Release: %autorelease
+Summary: Credentials Fetcher Service is used to connect to Active Directory from Linux Instances
+
+# Generated by go-vendor-tools
+License: Apache-2.0 AND BSD-3-Clause AND ISC AND MIT
+URL: %{gourl}
+Source0: %{gosource}
+# Generated by go-vendor-tools
+Source1: %{archivename}-vendor.tar.bz2
+Source2: go-vendor-tools.toml
+# missing from upstream?
+Source3: LICENSE.txt
+
+BuildRequires: go-vendor-tools
+BuildRequires: krb5-devel
%description
-This daemon creates and refreshes kerberos tickets, these
-tickets can be used to launch new containers.
-The gMSA feature can be implemented using this daemon.
-Kerberos tickets are refreshed when tickets expire
-or when a gMSA password changes.
-The same method can be used to refresh other types of security tokens.
-This spec file is specific to Fedora, use this file to rpmbuild on Fedora.
+Credentials-fetcher is a Linux daemon that retrieves gMSA credentials from
+Active Directory over LDAP. It creates and refreshes kerberos tickets from gMSA
+credentials. Kerberos tickets can be used by containers to run apps/services
+that authenticate using Active Directory.
+
+This (v2) is the Golang refactor of the original credentials-fetcher.
%prep
-%autosetup -n credentials-fetcher-v.%{version} -p1
-# abseil-cpp LTS 20230125 requires at least C++14; string_view requires C++17:
-sed -r -i 's/(std=c\+\+)11/\117/' CMakeLists.txt
+%goprep -p1
+tar -xf %{S:1}
+cp %{SOURCE3} .
+cp %{SOURCE3} cmd/credentials-fetcher/
+
+%generate_buildrequires
+%go_vendor_license_buildrequires -c %{S:2}
%build
-# We need to set ENABLE_DEBUGGING or else the binaries get stripped
-%cmake -DENABLE_DEBUGGING=ON
-%cmake_build
+%global gomodulesmode GO111MODULE=on
+%gobuild -o %{gobuilddir}/bin/credentials-fetcherd ./cmd/credentials-fetcher/main.go
+
%install
+%go_vendor_license_install -c %{S:2}
+install -m 0755 -vd %{buildroot}/usr/sbin
+install -m 0755 -vp %{gobuilddir}/bin/* %{buildroot}/usr/sbin/
+
+# Create additional directory structure in buildroot
+mkdir -p %{buildroot}%{_unitdir}/ecs.service.d
+mkdir -p %{buildroot}/var/credentials-fetcher/{krbdir,socket,logging}
+mkdir -p %{buildroot}/etc/
+mkdir -p %{buildroot}%{_libexec}
-%cmake_install
-# https://docs.fedoraproject.org/en-US/packaging-guidelines/#_removing_rpath
-# https://docs.fedoraproject.org/en-US/packaging-guidelines/#_rpath_for_inter…
+# Copy service file to buildroot
+cp ./configuration/bin/credentials-fetcher.service %{buildroot}%{_unitdir}/
+cp ./configuration/bin/ecs-require-credentials-fetcher.conf %{buildroot}%{_unitdir}/ecs.service.d/
-# https://fedoraproject.org/wiki/Changes/Unify_bin_and_sbin
-ls -al %{buildroot}/usr/sbin/credentials-fetcherd
-chrpath --delete %{buildroot}/usr/sbin/credentials-fetcherd
+# Copy startup-order userdata script into libexec
+install -m 0755 ./scripts/credentials-fetcher-startup-order.sh %{buildroot}%{_libexec}/
-# We don't package this krb5.conf
-rm -rf %{buildroot}/usr/sbin/krb5.conf
+# Copy config files to buildroot
+cp ./configuration/conf/credentials-fetcher.conf %{buildroot}/etc/
+# Place krb5.conf in /usr/sbin to avoid conflict with system krb5-libs package
+# umm... not in Fedora we don't...
+# cp ./configuration/conf/krb5.conf %{buildroot}/usr/sbin/krb5.conf
%check
-# TBD: Run tests from top-level directory
-ctest
+%go_vendor_license_check -c %{S:2}
+%if %{with check}
+%gotest ./...
+%endif
-%files
+%post
+chmod 644 %{_unitdir}/%{SERVICE_NAME}
+/usr/bin/systemctl daemon-reload
+# Since `ecs.service` gets a new dependency on `credentials-fetcher.service`, it stops on the initial reload. Start it back up if enabled
+/usr/bin/systemctl is-enabled --quiet ecs.service 2>/dev/null && /usr/bin/systemctl restart ecs.service || :
+
+%postun
+/usr/bin/systemctl daemon-reload
+# If this is a full removal, and *NOT* an upgrade:
+if [ $1 -eq 0 ]; then
+ # If the user ran our systemd dependency script, there will be an out-of-package systemd drop-in for ECS agent.
+ # Remove this, and also clean up the drop-in directory, but only if it is empty after removing ours.
+ if [ -d "/usr/lib/systemd/system/ecs.service.d" ]; then
+ rm /usr/lib/systemd/system/ecs.service.d/require-credentials-fetcher.conf
+ if [ -z "$( ls -A '/usr/lib/systemd/system/ecs.service.d' )" ]; then
+ rm -rf /usr/lib/systemd/system/ecs.service.d
+ fi
+ fi
+ # Service continues running after a full removal, so stop it
+ /usr/bin/systemctl stop credentials-fetcher.service
+fi
+
+%files -f %{go_vendor_license_filelist}
+%doc docs README.md
/usr/sbin/credentials-fetcherd
+%config(noreplace) /etc/credentials-fetcher.conf
%{_unitdir}/credentials-fetcher.service
-%license LICENSE
-# https://docs.fedoraproject.org/en-US/packaging-guidelines/LicensingGuidelin…
-%doc CONTRIBUTING.md NOTICE README.md
-%attr(0700, -, -) /usr/sbin/credentials_fetcher_utf16_private.exe
-%attr(0700, -, -) /usr/sbin/credentials_fetcher_utf16_private.runtimeconfig.json
+%{_unitdir}/ecs.service.d/ecs-require-credentials-fetcher.conf
+%dir /var/credentials-fetcher
+%dir /var/credentials-fetcher/krbdir
+%dir /var/credentials-fetcher/socket
+%dir /var/credentials-fetcher/logging
+%{_libexec}/credentials-fetcher-startup-order.sh
%changelog
-* Sun Mar 22 2026 Björn Esser <besser82(a)fedoraproject.org> - 1.3.8-8
-- Rebuild (jsoncpp)
-- Fix BR
-- Update macros
-
-* Wed Jan 28 2026 Benjamin A. Beasley <code(a)musicinmybrain.net> - 1.3.8-7
-- Rebuilt for abseil-cpp 20260107.0
-
-* Fri Jan 16 2026 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.3.8-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
-
-* Fri Jan 16 2026 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.3.8-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
-
-* Mon Sep 08 2025 Benjamin A. Beasley <code(a)musicinmybrain.net> - 1.3.8-4
-- Rebuilt for abseil-cpp 20250814.0
-
-* Wed Aug 06 2025 František Zatloukal <fzatlouk(a)redhat.com> - 1.3.8-3
-- Rebuilt for icu 77.1
-
-* Wed Jul 23 2025 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.3.8-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Fri Jul 18 2025 Tom Callaway <spot(a)fedoraproject.org> - 1.3.8-1
-- update to 1.3.8
-
-* Thu Jul 17 2025 Tom Callaway <spot(a)fedoraproject.org> - 1.3.7-6
-- disable tests on el targets too
-
-* Mon May 26 2025 Benjamin A. Beasley <code(a)musicinmybrain.net> - 1.3.7-5
-- Rebuilt for abseil-cpp 20250512.0
-
-* Thu Feb 27 2025 Björn Esser <besser82(a)fedoraproject.org> - 1.3.7-4
-- Rebuild (abseil-cpp)
-
-* Thu Feb 27 2025 Björn Esser <besser82(a)fedoraproject.org> - 1.3.7-3
-- Rebuild (jsoncpp)
-- Use ctest binary instead of ctest3
-
-* Tue Feb 25 2025 Benjamin A. Beasley <code(a)musicinmybrain.net> - 1.3.7-2
-- Rebuilt for abseil-cpp-20250127.0
-
-* Mon Feb 3 2025 Samiullah Mohammed <samiull(a)amazon.com> - 1.3.7-1
-- Fixes for 1.3.7
-
-* Thu Jan 30 2025 Samiullah Mohammed <samiull(a)amazon.com> - 1.3.6-5
-- Bump dotnet sdk version
-
-* Thu Jan 16 2025 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.3.6-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Sun Aug 25 2024 Benjamin A. Beasley <code(a)musicinmybrain.net> - 1.3.6-3
-- Rebuilt for abseil-cpp-20240722.0
-
-* Wed Jul 17 2024 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.3.6-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Thu Feb 15 2024 Benjamin A. Beasley <code(a)musicinmybrain.net> - 1.3.6-1
-- Patch for compatibility with current protobuf
-
-* Mon Feb 05 2024 Sai Kiran Akula <saakla(a)amazon.com> - 1.3.6
-- Create 1.3.6 release
-
-* Sun Feb 04 2024 Benjamin A. Beasley <code(a)musicinmybrain.net> - 1.2.0-7
-- Rebuilt for abseil-cpp-20240116.0
-
-* Wed Jan 24 2024 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.0-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Fri Jan 19 2024 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.0-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Thu Jan 18 2024 Jonathan Wakely <jwakely(a)redhat.com> - 1.2.0-4
-- Rebuilt for Boost 1.83
-
-* Thu Aug 31 2023 Tom Callaway <spot(a)fedoraproject.org> - 1.2.0-3
-- rebuild for abseil
-
-* Wed Jul 19 2023 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Mon May 15 2023 Sai Kiran Akula <saakla(a)amazon.com> - 1.2.0
-- Create 1.2.0 release
-
-* Thu Mar 23 2023 Tom Callaway <spot(a)fedoraproject.org> - 1.1.0-7
-- rebuild for new abseil-cpp
-
-* Tue Mar 07 2023 Benjamin A. Beasley <code(a)musicinmybrain.net> - 1.1.0-6
-- Build as C++14, required by abseil-cpp 20230125
-
-* Thu Feb 23 2023 Tom Callaway <spotaws(a)amazon.com> - 1.1.0-5
-- fix build against boost 1.81 (bz2172636)
-
-* Mon Feb 20 2023 Jonathan Wakely <jwakely(a)redhat.com> - 1.1.0-4
-- Rebuilt for Boost 1.81
-
-* Thu Feb 09 2023 Benjamin A. Beasley <code(a)musicinmybrain.net> - 1.1.0-3
-- Depend on dotnet-sdk-7.0; there is no longer an unversioned “dotnet” package
-- Restore ppc64le support
-
-* Thu Jan 19 2023 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.1.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Thu Oct 27 2022 Sai Kiran Akula <saakla(a)amazon.com> - 1.1.0
-- Create 1.1 release
-* Mon Oct 24 2022 Samiullah Mohammed <samiull(a)amazon.com> - 1.0.0
-- Add domainless gmsa
-* Wed Oct 12 2022 Sai Kiran Akula <saakla(a)amazon.com> - 1.0.0
-- Create 1.0 release
-* Mon Sep 19 2022 Tom Callaway <spotaws(a)amazon.com> - 0.0.94-2
-- rebuild for rawhide
-* Sat Sep 10 2022 Samiullah Mohammed <samiull(a)amazon.com> - 0.0.94-1
-- Replace mono with dotnet
-* Mon Aug 29 2022 Tom Callaway <spotaws(a)amazon.com> - 0.0.94-1
-- systemd clean up
-* Mon Aug 22 2022 Sai Kiran Akula <saakla(a)amazon.com> - 0.0.93
-- Add validation for read metadata file and rpm install require openldap-clients
-* Wed Aug 10 2022 Samiullah Mohammed <samiull(a)amazon.com> - 0.0.92
-- Move binaries to standard Linux directories
-- Add directory paths as configurable variables in cmake
-- Generate systemd service file from cmake
-* Sun Aug 7 2022 Samiullah Mohammed <samiull(a)amazon.com> - 0.0.91
-- Relocate binary, library files and change permissions
-* Sat Jul 30 2022 Samiullah Mohammed <samiull(a)amazon.com> - 0.0.90
-- add ctests and bump revision to 0.0.90
-* Thu Jul 28 2022 Samiullah Mohammed <samiull(a)amazon.com> - 0.0.1
-- Add mono-based utf16 decoder
-* Tue Jul 12 2022 Samiullah Mohammed <samiull(a)amazon.com> - 0.0.1
-- Resolve rpath for Fedora and change macros
-* Sat Jun 18 2022 Sai Kiran Akula <saakla(a)amazon.com> - 0.0.1
-- Refactor cmake for all the directories
-* Thu Jun 16 2022 Samiullah Mohammed <samiull(a)amazon.com> - 0.0.1
-- Compile subdirectory into a shared library
-* Wed Jun 15 2022 Samiullah Mohammed <samiull(a)amazon.com> - 0.0.1
-- Add daemon infra
-* Wed Jun 8 2022 Samiullah Mohammed <samiull(a)amazon.com> - 0.0.1
-- Fixes to rpm spec
-* Mon Jun 6 2022 Samiullah Mohammed <samiull(a)amazon.com> - 0.0.1
-- Initial commit
+%autochangelog
diff --git a/go-vendor-tools.toml b/go-vendor-tools.toml
new file mode 100644
index 0000000..598286c
--- /dev/null
+++ b/go-vendor-tools.toml
@@ -0,0 +1,12 @@
+[archive]
+
+[licensing]
+detector = "askalono"
+[[licensing.licenses]]
+path = "vendor/gopkg.in/yaml.v3/LICENSE"
+sha256sum = "d18f6323b71b0b768bb5e9616e36da390fbd39369a81807cca352de4e4e6aa0b"
+expression = "MIT AND (MIT AND Apache-2.0)"
+[[licensing.licenses]]
+path = "cmd/credentials-fetcher/LICENSE.txt"
+sha256sum = "cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30"
+expression = "Apache-2.0"
diff --git a/sources b/sources
index ab22502..98158c9 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-SHA512 (v.1.3.8.tar.gz) = 390ad50e08758b81cd15eebfc2a2665ebab994de706ce534671dd2b4c7ce406a78103d5991d44e54157ef5a6aac2743437ba3deacca13784d853612c9f30629b
+SHA512 (credentials-fetcher-2.0.1.tar.gz) = 9be64ebbfa4e0ea467d1b441b8e3416aa09f62baa1af5cf84eccf4520ff4cbb387bbf8bd38ddb487771c138bfed394b1a76dd68c518b63bc82d8c6afa4d98c6c
+SHA512 (credentials-fetcher-2.0.1-vendor.tar.bz2) = 29188e5b4f14f043b4cd9862fb06afc0a609cab30c297fcd5d704a01b27c068146cbc20ef0dde95124bead0931e8e7c0f83515ff834c0dde0dcaf73cf74908f9
commit 3fb513319fe68159ddf7c7ec802399ed16b044e9
Author: Björn Esser <besser82(a)fedoraproject.org>
Date: Sun Mar 22 18:36:02 2026 +0100
Update macros
diff --git a/credentials-fetcher.spec b/credentials-fetcher.spec
index 535e48a..448cf59 100644
--- a/credentials-fetcher.spec
+++ b/credentials-fetcher.spec
@@ -55,11 +55,8 @@ This spec file is specific to Fedora, use this file to rpmbuild on Fedora.
sed -r -i 's/(std=c\+\+)11/\117/' CMakeLists.txt
%build
-# Use the distributions optflags
-export CFLAGS="%{optflags}"
-export CXXFLAGS="%{optflags}"
# We need to set ENABLE_DEBUGGING or else the binaries get stripped
-%cmake3 -DENABLE_DEBUGGING=ON
+%cmake -DENABLE_DEBUGGING=ON
%cmake_build
%install
@@ -91,6 +88,7 @@ ctest
* Sun Mar 22 2026 Björn Esser <besser82(a)fedoraproject.org> - 1.3.8-8
- Rebuild (jsoncpp)
- Fix BR
+- Update macros
* Wed Jan 28 2026 Benjamin A. Beasley <code(a)musicinmybrain.net> - 1.3.8-7
- Rebuilt for abseil-cpp 20260107.0
commit 62a2872905c1202e4a66a85688b37fc778851611
Author: Björn Esser <besser82(a)fedoraproject.org>
Date: Sun Mar 22 18:29:07 2026 +0100
Fix BR
diff --git a/credentials-fetcher.spec b/credentials-fetcher.spec
index e72efc9..535e48a 100644
--- a/credentials-fetcher.spec
+++ b/credentials-fetcher.spec
@@ -26,7 +26,7 @@ Patch0: credentials-fetcher-1.3.8-disable-integ-tests-for-Fedora.patch
# Also disable integ-tests for EL targets, for now
Patch1: credentials-fetcher-1.3.7-no-api-tests-on-el.patch
-BuildRequires: cmake3 make chrpath openldap-clients grpc-devel gcc-c++ glib2-devel jsoncpp-devel
+BuildRequires: cmake chrpath openldap-clients grpc-devel gcc-c++ glib2-devel jsoncpp-devel
BuildRequires: openssl-devel zlib-devel protobuf-devel re2-devel krb5-devel systemd-devel
BuildRequires: systemd-rpm-macros dotnet-sdk-8.0 grpc-plugins
@@ -90,6 +90,7 @@ ctest
%changelog
* Sun Mar 22 2026 Björn Esser <besser82(a)fedoraproject.org> - 1.3.8-8
- Rebuild (jsoncpp)
+- Fix BR
* Wed Jan 28 2026 Benjamin A. Beasley <code(a)musicinmybrain.net> - 1.3.8-7
- Rebuilt for abseil-cpp 20260107.0
commit 98e421160855a089f12615c53d91be72217637d4
Author: Björn Esser <besser82(a)fedoraproject.org>
Date: Sun Mar 22 18:07:07 2026 +0100
Rebuild (jsoncpp)
diff --git a/credentials-fetcher.spec b/credentials-fetcher.spec
index 071c2e5..e72efc9 100644
--- a/credentials-fetcher.spec
+++ b/credentials-fetcher.spec
@@ -3,7 +3,7 @@
%global patch_version 8
# For handling bump release by rpmdev-bumpspec and mass rebuild
-%global baserelease 7
+%global baserelease 8
%define _unpackaged_files_terminate_build 0
Name: credentials-fetcher
@@ -88,6 +88,9 @@ ctest
%attr(0700, -, -) /usr/sbin/credentials_fetcher_utf16_private.runtimeconfig.json
%changelog
+* Sun Mar 22 2026 Björn Esser <besser82(a)fedoraproject.org> - 1.3.8-8
+- Rebuild (jsoncpp)
+
* Wed Jan 28 2026 Benjamin A. Beasley <code(a)musicinmybrain.net> - 1.3.8-7
- Rebuilt for abseil-cpp 20260107.0
The package rpms/pasdoc.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/pasdoc.git/commit/?id=e9ee787f8b877….
Change:
+%ifarch %{ix86}
Thanks.
Full change:
============
commit e9ee787f8b877aad312a11531aa52b7e7238cc5e
Author: Artur Frenszek-Iwicki <fedora(a)svgames.pl>
Date: Mon Mar 30 21:37:00 2026 +0200
Update to v1.0.2
diff --git a/.gitignore b/.gitignore
index d3b7bde..cbc4216 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/pasdoc-0.16.0.tar.gz
+/pasdoc-1.0.2.tar.gz
diff --git a/0000-adapt-test-runner.patch b/0000-adapt-test-runner.patch
deleted file mode 100644
index c7d719a..0000000
--- a/0000-adapt-test-runner.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff -U4 -r pasdoc-0.16.0--orig/tests/run_all_tests.sh pasdoc-0.16.0--patched/tests/run_all_tests.sh
---- pasdoc-0.16.0--orig/tests/run_all_tests.sh 2021-02-10 00:42:00.000000000 +0100
-+++ pasdoc-0.16.0--patched/tests/run_all_tests.sh 2021-09-21 13:16:43.019923079 +0200
-@@ -4,36 +4,12 @@
- # Run all PasDoc tests.
-
- make clean
-
--# fpcunit tests --------------------------------------------------------------
--
--pushd fpcunit
--make
--popd
--
--# build pasdoc --------------------------------------------------------------
--
--pushd ../
--make
--popd
--
--# ----------------------------------------------------------------------------
--# Find pasdoc binary, setting PASDOC_BIN to absolute exe path.
--# If not found, fail.
--
--if [ -f ../bin/pasdoc ]; then
-- export PASDOC_BIN=`pwd`/../bin/pasdoc
--elif [ -f ../bin/pasdoc.exe ]; then
-- export PASDOC_BIN=`pwd`/../bin/pasdoc.exe
--else
-- if ! which pasdoc > /dev/null; then
-- echo 'pasdoc binary not found on $PATH'
-- exit 1
-- fi
-- export PASDOC_BIN=`which pasdoc`
-+if [[ -z "${PASDOC_BIN+isset}" ]]; then
-+ echo "The \$PASDOC_BIN variable is not set!" >2
-+ exit 1
- fi
--echo "Detected pasdoc binary as ${PASDOC_BIN}"
-
- # run all testcases, compare with correct output ------------------------------
-
- ALL_OUTPUT_FORMATS='html htmlhelp latex latex2rtf simplexml'
diff --git a/0001-enable-dwarf3-debuginfo.patch b/0001-enable-dwarf3-debuginfo.patch
index b157b66..d5ccfd7 100644
--- a/0001-enable-dwarf3-debuginfo.patch
+++ b/0001-enable-dwarf3-debuginfo.patch
@@ -1,6 +1,7 @@
---- pasdoc-0.16.0--orig/source/gui/pasdoc_gui.lpi 2022-01-07 12:02:36.025958963 +0100
-+++ pasdoc-0.16.0--patched/source/gui/pasdoc_gui.lpi 2022-01-07 12:03:12.783143393 +0100
-@@ -91,12 +91,19 @@
+diff -rU4 pasdoc-1.0.2--orig/source/gui/pasdoc_gui.lpi pasdoc-1.0.2/source/gui/pasdoc_gui.lpi
+--- pasdoc-1.0.2--orig/source/gui/pasdoc_gui.lpi 2026-03-30 18:13:30.000000000 +0200
++++ pasdoc-1.0.2/source/gui/pasdoc_gui.lpi 2026-03-30 20:10:41.763036281 +0200
+@@ -95,13 +95,20 @@
<Version Value="11"/>
<SearchPaths>
<SrcPath Value="$(LazarusDir)/lcl;$(LazarusDir)/lcl/interfaces/$(LCLWidgetType)"/>
@@ -13,10 +14,12 @@
+ </CodeGeneration>
<Linking>
<Debugging>
+- <DebugInfoType Value="dsDwarf2Set"/>
- <UseLineInfoUnit Value="False"/>
- <StripSymbols Value="True"/>
+ <GenerateDebugInfo Value="True"/>
+ <DebugInfoType Value="dsDwarf3"/>
++ <UseLineInfoUnit Value="True"/>
+ <StripSymbols Value="False"/>
</Debugging>
<Options>
diff --git a/file_to_pascal_data.man b/file_to_pascal_data.man
deleted file mode 100644
index 2ca8f7f..0000000
--- a/file_to_pascal_data.man
+++ /dev/null
@@ -1,64 +0,0 @@
-.TH "FILE_TO_PASCAL_DATA" 1 "2021-09-22" "" "User commands"
-.
-.SH NAME
-file_to_pascal_data, file_to_pascal_string \- convert files
-to Pascal source code
-.
-.SH SYNOPSIS
-.SY file_to_pascal_data
-.I INPUT_FILE
-.I OUTPUT_FILE
-.YS
-.SY file_to_pascal_string
-.I INPUT_FILE
-.I OUTPUT_FILE
-.YS
-.
-.SH DESCRIPTION
-The \fBfile_to_pascal_data\fR and \fBfile_to_pascal_string\fR programs
-can be used to convert files to Pascal source code, in order to embed
-data inside Pascal programs.
-
-\fBfile_to_pascal_data\fR encodes \fIINPUT_FILE\fR as an Array of Byte,
-whereas \fBfile_to_pascal_string\fR encodes it as a string literal.
-.
-.SH EXAMPLES
-Consider a file containing only the text "Example" (with a newline character
-at the end) being used as the input.
-.PP
-After converting the input using \fBfile_to_pascal_data\fR,
-the output file can be used like in the following example:
-.PP
-.in +4n
-.EX
-const EmbeddedData: {$INCLUDE output_data.inc};
-.EE
-.PP
-After including the file, this will evaluate to something like:
-.PP
-.in +4n
-.EX
-const EmbeddedData: array[0..7] of byte = (
-.br
- $45, $78, $61, $6D, $70, $6C, $65, $0A
-.br
-);
-.EE
-.PP
-The output generated by \fBfile_to_pascal_string\fR
-can be used in a similar fashion:
-.PP
-.in +4n
-.EX
-const EmbeddedString = {$INCLUDE output_string.inc};
-.EE
-.PP
-After including the file, this will evaluate to something like:
-.PP
-.in +4n
-.EX
-const EmbeddedString = 'Example' + LineEnding;
-.EE
-.SH SEE ALSO
-.BR pascal_pre_proc (1),
-.BR pasdoc (1)
diff --git a/pascal_pre_proc.man b/pascal_pre_proc.man
deleted file mode 100644
index 62f1d63..0000000
--- a/pascal_pre_proc.man
+++ /dev/null
@@ -1,43 +0,0 @@
-.TH PASCAL_PRE_PROC 1 "2021-09-22" "" "User commands"
-.
-.SH NAME
-\fBpascal_pre_proc\fR \- Pascal preprocessor based on the PasDoc parser
-.
-.SH SYNOPSIS
-.SY pascal_pre_proc
-[\fIOPTIONS\fR]
-.I FILE
-.YS
-.
-.SH DESCRIPTION
-.B pascal_pre_proc
-is a Pascal preprocessor based on the parser
-used by the PasDoc documentation generator.
-When run, it will parse \fIFILE\fR, interpreting all
-compiler directives - like \fB{$DEFINE}\fR, \fB{$IDEF}\fR, \fB{$INCLUDE}\fR,
-as well as FPC macros - and print the result on standard output.
-.
-.SH OPTIONS
-.TP
-\fB\-?\fR, \fB\-\-help\fR
-Display a help message and exit.
-.TP
-\fB\-v\fR, \fB\-\-verbosity\fR \fILEVEL\fR
-Set logging verbosity. \fILEVEL\fR must be an integer in the 0-6 range.
-The default is \fB2\fR.
-.TP
-\fB\-D\fR, \fB\-\-define\fR \fISYMBOL\fR
-Assume \fISYMBOL\fR is defined when parsing conditional blocks.
-.TP
-\fB\-d\fR, \fB\-\-conditionals\fR \fICONDFILE\fR
-Similar to \fB\-D\fR. Reads the list of symbols from \fICONDFILE\fR.
-.TP
-\fB\-I\fR, \fB\-\-include\fR \fIPATH\fR
-Search in \fIPATH\fR when evaluating \fB{$INCLUDE}\fR directives.
-.TP
-.B \-\-no\-macro
-Disable support for FPC macros.
-.SH SEE ALSO
-.BR file_to_pascal_data (1),
-.BR file_to_pascal_string (1),
-.BR pasdoc (1)
diff --git a/pasdoc.man b/pasdoc.man
deleted file mode 100644
index f7adcf1..0000000
--- a/pasdoc.man
+++ /dev/null
@@ -1,402 +0,0 @@
-.TH "PASDOC" 1 "2021-09-22" "" "User commands"
-.
-.
-.SH NAME
-\fBpasdoc\fR \- documentation generator for Pascal code
-.SH SYNOPSIS
-.SY pasdoc
-[\fIOPTIONS...\fR]
-[\fIFILES...\fR]
-.YS
-.
-.
-.SH DESCRIPTION
-PasDoc is a documentation tool for Pascal and Object Pascal source code.
-Documentation is generated from comments found in the source code,
-or from external files.
-.
-.
-.SH OPTIONS
-.TP
-\fB@\fR\fIFILE\fR
-Read options from \fIFILE\fR and insert them at current position.
-\fIFILE\fR must contain one option per line.
-Format is "\fBname\fR[=\fIvalue\fR]", options are named just like
-in the command line but without leading dashes.
-Option values with spaces must \fINOT\fR be quoted.
-.
-.TP
-\fB\-?\fR, \fB\-\-help\fR
-Show a help message and exit.
-.
-.TP
-\fB\-\-abbreviations\fR \fIFILE\fR
-Read list of abbreviations from \fIFILE\fR. Format is "[name] value".
-Values are trimmed. Lines that do not start with '[' are ignored.
-.
-.TP
-\fB-A\fR, \fB\-\-additional\fR \fIFILE\fR
-Specify the name of a text file with addition materials for the project.
-.
-.TP
-.B \-\-auto\-abstract
-Automatically make an abstract description of every item
-from the first sentence of description for that item.
-.
-.TP
-.B \-\-auto\-back\-comments
-Consider //-style comments after an identifier in the same line
-as description of that identifier.
-.
-.TP
-.B \-\-auto\-link
-Automatically create links,
-without the need to explicitly use \fB@link\fR tags.
-.
-.TP
-\fB\-\-auto\-link\-exclude\fR \fIFILE\fR
-Even when \fB\-\-auto\-link\fR is on, never automatically create links
-to identifiers listed in \fIFILE\fR.
-The list should contain one identifier per line.
-.
-.TP
-\fB\-\-cache\-dir\fR \fIDIR\fR
-Specify cache directory for parsed files.
-.
-.TP
-\fB\-\-conclusion\fR \fIFILE\fR
-Specify the name of a text file with concluding materials for the project.
-.
-.TP
-\fB\-\-css\fR \fISTYLESHEET\fR
-Specify CSS file (will be copied into output tree) to use with HTML output.
-.
-.TP
-\fB\-D\fR, \fB\-\-define\fR \fISYMBOL\fR
-Assume \fISYMBOL\fR is defined when parsing conditional blocks.
-.
-.TP
-\fB\-d\fR, \fB\-\-conditionals\fR \fIFILE\fR
-Similar to \fB\-\-define\fR, but reads the list of symbols from \fIFILE\fR.
-.
-.TP
-\fB\-E\fR, \fB\-\-output\fR \fIPATH\fR
-Specify output path.
-.
-.TP
-\fB\-\-external\-class\-hierarchy\fR \fIFILE\fR
-Specify a file defining the hierarchy of classes
-not included in your source code, for more complete class tree diagrams.
-.
-.TP
-\fB\-F\fR, \fB\-\-footer\fR \fIFILE\fR
-Use the contents of \fIFILE\fR as the footer for HTML output.
-.
-.TP
-.B \-\-graphviz\-classes
-Write a \fB"GVClasses.dot"\fR file that can be used for the \fBdot\fR program
-from GraphViz to generate a class hierarchy graph.
-.
-.TP
-.B \-\-graphviz\-uses
-Write a \fB"GVUses.dot"\fR file that can be used for the \fBdot\fR program
-from GraphViz to generate a unit dependency graph.
-.
-.TP
-\fB\-H\fR, \fB\-\-header\fR \fIFILE\fR
-Use the contents of \fIFILE\fR as the header for HTML output.
-.
-.TP
-\fB\-\-html\-body\-begin\fR \fIFILE\fR
-In HTML output, put the contents of \fIFILE\fR
-right after the opening \fB<body>\fR tag.
-.
-.TP
-\fB\-\-html\-body\-end\fR \fIFILE\fR
-In HTML output, put the contents of \fIFILE\fR
-right after the closing \fB</body>\fR tag.
-.
-.TP
-\fB\-\-html\-head\fR \fIFILE\fR
-In HTML output, put the contents of \fIFILE\fR inside the \fB<head>\fR tag.
-.
-.TP
-\fB\-\-html\-help\-contents\fR \fIFILE\fR
-Read contents for HtmlHelp from \fIFILE\fR.
-.
-.TP
-\fB\-\-ignore\-leading\fR \fILIST\fR
-Specify a list of leading characters to be ignored in comments.
-.
-.TP
-\fB\-\-ignore\-marker\fR \fIMARKER\fR
-Skip comments starting with \fIMARKER\fR (that is,
-\fB{MARKER\fR, \fB(*MARKER\fR and \fB//MARKER\fR comments).
-.
-.TP
-\fB\-\-implementation\-comments\fR \fISTRATEGY\fR
-Read implementation section of units and merge info with that
-taken from interface section. \fISTRATEGY\fR determines how info is merged:
-.RS
-.TQ
-.B none
-Do not read implementation comments.
-.TQ
-.B prefer-interface
-Read both interface and implementation comments.
-Use whichever comment is non-empty.
-If they are both non-empty, use the interface comment.
-.TQ
-.B prefer-implementation
-Just like "prefer interface", but if both comments are non-empty,
-use the implementation comment.
-.TQ
-.B join
-Read both interface and implementation comments and concatenate them.
-If the interface comment is also present at the beginning
-of the implementation comment, it will be ignored (to avoid repetition).
-.RE
-.
-.TP
-\fB\-\-implicit\-visibility\fR \fIVISIBILITY\fR
-Specify how to handle class members within default class visibility,
-i.e. treat implicit visiblity as \fIVISIBILITY\fR. For a list of
-recognized values, check the \fB\-M\fR option.
-.
-.TP
-\fB\-I\fR, \fB\-\-include\fR \fIPATH\fR
-Search inside \fIPATH\fR when evaluating \fB{$INCLUDE}\fR directives.
-.
-.TP
-.B \-\-include\-creation\-time
-Include a creation timestamp inside the generated files.
-.
-.TP
-\fB\-\-introduction\fR \fIFILE\fR
-Specify the name of a text file with introductory materials for the project.
-.
-.TP
-\fB\-L\fR, \fB\-\-language\fR \fILANG\fR
-Output language. Valid languages are:
-.RS
-.TQ
-.B ba
-Bosnian (Codepage 1250)
-.TQ
-.B bg
-Bulgarian (UTF-8)
-.TQ
-.B br.1252
-Brazilian (Codepage 1252)
-.TQ
-.B br.utf8
-Brazilian (UTF-8)
-.TQ
-.B ct
-Catalan
-.TQ
-.B cz
-Czech (Codepage 1250)
-.TQ
-.B cz.iso-8859-2
-Czech (Codepage ISO-8859-2)
-.TQ
-.B de
-German (Codepage ISO-8859-15)
-.TQ
-.B de.utf8
-German (UTF-8)
-.TQ
-.B dk
-Danish
-.TQ
-.B en
-English
-.TQ
-.B es
-Spanish
-.TQ
-.B fr
-French (Codepage ISO-8859-15)
-.TQ
-.B fr.utf8
-French (UTF-8)
-.TQ
-.B gb2312
-Chinese (Simple, gb2312)
-.TQ
-.B hu.1250
-Hungarian (Codepage 1250)
-.TQ
-.B id
-Indonesian
-.TQ
-.B it
-Italian
-.TQ
-.B jv
-Javanese
-.TQ
-.B mr
-Croatian
-.TQ
-.B nl
-Dutch
-.TQ
-.B pl.cp1250
-Polish (Codepage CP1250)
-.TQ
-.B pl.iso-8859-2
-Polish (Codepage ISO 8859-2)
-.TQ
-.B ru.866
-Russian (Codepage 866)
-.TQ
-.B ru.1251
-Russian (Codepage 1251)
-.TQ
-.B ru.koi8r
-Russian (KOI-8)
-.TQ
-.B ru.utf8
-Russian (UTF-8)
-.TQ
-.B se
-Swedish
-.TQ
-.B sk
-Slovak (Codepage 1250)
-.RE
-.
-.TP
-\fB\-\-latex\-head\fR \fIFILE\fR
-Specify a file that includes lines to be inserted
-into the preamble of the output LaTeX file.
-.
-.TP
-\fB\-\-link\-gv\-classes\fR \fIFORMAT\fR
-Add a link to a \fB"GVClasses.FORMAT"\fR file
-generated by the \fBdot\fR program, where \fIFORMAT\fR is
-any extension that \fBdot\fR can generate (e.g. jpg).
-Currently available only for HTML output.
-.
-.TP
-\fB\-\-link\-gv\-uses\fR \fIFORMAT\fR
-Add a link to a \fB"GVUses.FORMAT"\fR file generated by the \fBdot\fR program,
-where \fIFORMAT\fR is any extension that \fBdot\fR can generate (e.g. jpg).
-Currently available only for HTML output.
-.
-.TP
-\fB\-\-link\-look\fR \fISTYLE\fR
-Controls how links are displayed in documentation. Possible values are:
-.RS
-.TQ
-.B default
-Show the complete link name, as specified by @link.
-.TQ
-.B full
-Show the complete link name, and try to make each part of it a link.
-.TQ
-.B stripped
-Show only last part of the link.
-.RE
-.
-.TP
-.B \-\-lowercase-keywords
-Convert all literal tag keywords to lowercase
-(e.g. \fI@nil\fR, \fI@false\fR, \fI@true\fR).
-.
-.TP
-\fB\-M\fR, \fB\-\-visible\-members\fR \fILIST\fR
-Only include members of given visibility. Recognized visibilities are:
-\fIpulished\fR, \fIpublic\fR, \fIprotected\fR, \fIstrictprotected\fR,
-\fIprivate\fR, \fIstrictprivate\fR, \fIautomated\fR, \fIimplicit\fR.
-.
-.TP
-.B \-\-markdown
-Decode Markdown syntax.
-.
-.TP
-\fB\-\-marker\fR \fIMARKER\fR
-Parse only \fB{MARKER\fR, \fB(*MARKER\fR and \fB//MARKER\fR comments.
-Overrides the \fB\-\-staronly\fR option.
-.
-.TP
-.B \-\-marker\-optional
-Do not require the markers given by the \fB\-\-marker\fR option,
-but remove them from the comment if they exist.
-.
-.TP
-\fB\-N\fR, \fB\-\-name\fR \fINAME\fR
-Specify a name for the documentation.
-.
-.TP
-.B \-\-no\-macro
-Disable support for FPC macros.
-.
-.TP
-.B \-\-numericfilenames
-Make the HTML generator create numeric filenames.
-.
-.TP
-\fB\-O\fR, \fB\-\-format\fR \fIFORMAT\fR
-Specify the output format. Must be one of: \fIhtml\fR, \fIhtmlhelp\fR,
-\fIlatex\fR, \fIlatex2rtf\fR or \fIsimplexml\fR.
-.
-.TP
-\fB\-R\fR, \fB\-\-description\fR \fIFILE\fR
-Read descriptions from \fIFILE\fR.
-.
-.TP
-\fB\-\-sort\fR \fIGROUPLIST\fR
-Specifies which groups of items are sorted (the rest is presented
-in the same order they were declared in source files).
-Recognized groups are: \fIconstants\fR, \fIfunctions\fR, \fImethods\fR,
-\fInon-record-fields\fR, \fIproperties\fR, \fIrecord-fields\fR, \fIstructures\fR,
-\fItypes\fR, \fIvariables\fI.
-.
-.TP
-\fB\-S\fR, \fB\-\-source\fR \fIFILE\fR
-Read the list of source filenames from \fIFILE\fR.
-.
-.TP
-.B \-\-spell\-check
-Enable spell-checking (via Aspell).
-Specify language by using the \fB\-\-language\fR option.
-.
-.TP
-\fB\-\-spell\-check\-ignore\-words\fR \fIFILE\fR
-When spell-checking, ignore the words listed inside \fIFILE\fR.
-The list should contain one word per line.
-.
-.TP
-.B \-\-staronly
-Parse only \fB{**\fR, \fB(***\fR and \fB//**\fR style comments.
-.
-.TP
-\fB\-T\fR, \fB\-\-title\fR \fITITLE\fR
-Specify the title of the documentation.
-.
-.TP
-.B \-\-use\-tipue\-search
-Use the \fBtipue\fR search engine in HTML output.
-.
-.TP
-\fB\-v\fR, \fB\-\-verbosity\fR \fILEVEL\fR
-Set log verbosity. \fILEVEL\fR must be a number in the 0-6 range. Default is 2.
-.
-.TP
-.B \-\-version
-Show version information and exit.
-.
-.TP
-.B \-\-write\-uses\-list
-Add the \fBuses\fR list to the output.
-.
-.TP
-\fB\-X\fR, \fB\-\-exclude\-generator\fR
-Do not include information about PasDoc in the generated files.
-.
-.
-.SH ONLINE DOCUMENTATION
-For the full documentation, visit \fBhttps://pasdoc.github.io/\fR.
diff --git a/pasdoc.spec b/pasdoc.spec
index 78034ba..bcb311f 100644
--- a/pasdoc.spec
+++ b/pasdoc.spec
@@ -1,32 +1,29 @@
Name: pasdoc
Summary: Documentation tool for Pascal and Object Pascal source code
-# The readme says simply "GNU GPL 2", but license headers in code files
-# say "version 2 of the License, or (at your option) any later version".
-License: GPL-2.0-or-later
+# PasDoc's original code is GPLv2 or later.
+#
+# The file source/component/naive_dictionary_fix.inc is taken from
+# a different project (Castle Game Engine), which uses LGPL.
+#
+# For generating HTML output, PasDoc embeds some CSS and Javascript
+# taken from jQuery, Tipue Search and Twitter Bootstrap.
+# All of these are subject to MIT.
+License: GPL-2.0-or-later AND LGPL-2.1-or-later WITH Independent-modules-exception AND MIT
%global with_gui 1
%global with_tools 1
%global with_tests 1
-Version: 0.16.0
-Release: 15%{?dist}
+Version: 1.0.2
+Release: 1%{?dist}
URL: https://github.com/pasdoc/pasdoc
Source0: %{URL}/archive/v%{version}/pasdoc-%{version}.tar.gz
-# Submitted upstream: https://github.com/pasdoc/pasdoc/pull/135
-Source10: %{name}.man
-Source20: pascal_pre_proc.man
-Source21: file_to_pascal_data.man
-
Source30: %{name}-gui.desktop
Source31: %{name}-gui.metainfo.xml
-# The test runner script always rebuilds the program from scratch
-# before actually performing any tests.
-Patch0: 0000-adapt-test-runner.patch
-
# Edit the project configuration files to enable DWARF3 debuginfo
Patch1: 0001-enable-dwarf3-debuginfo.patch
@@ -46,6 +43,11 @@ BuildRequires: libappstream-glib
BuildRequires: make
BuildRequires: %{_bindir}/diff
BuildRequires: %{_bindir}/xmllint
+
+# php is no longer available on i686
+%ifnarch %{ix86}
+BuildRequires: php-cli
+%endif
%endif
@@ -126,14 +128,14 @@ install -m 755 -t %{buildroot}%{_bindir} ./build/bin/*
MANDIR="%{buildroot}%{_mandir}/man1"
install -m 755 -d "${MANDIR}"
-install -m 644 -p '%{SOURCE10}' "${MANDIR}/%{name}.1"
+install -m 644 -p './man/%{name}.man' "${MANDIR}/%{name}.1"
# Install man pages for tools.
# file_to_pascal_data and file_to_pascal_string are almost the same,
# so the single man page covers them both.
%if 0%{?with_tools}
-install -m 644 -p '%{SOURCE20}' "${MANDIR}/pascal_pre_proc.1"
-install -m 644 -p '%{SOURCE21}' "${MANDIR}/file_to_pascal_data.1"
+install -m 644 -p './man/pascal_pre_proc.man' "${MANDIR}/pascal_pre_proc.1"
+install -m 644 -p './man/file_to_pascal_data.man' "${MANDIR}/file_to_pascal_data.1"
ln -sr "${MANDIR}"/file_to_pascal_{data,string}.1
%endif
@@ -161,12 +163,19 @@ install -m 644 -p -t %{buildroot}%{_metainfodir} '%{SOURCE31}'
%check
%if 0%{?with_tests}
-export PASDOC_BIN="$(pwd)/build/bin/pasdoc"
+export PATH="%{buildroot}%{_bindir}:${PATH}"
export USE_DIFF_TO_COMPARE="true"
-cd tests/
+pushd tests/
./test_pasdoc -a
-./run_all_tests.sh
+
+%ifarch %{ix86}
+# Some tests rely on the "php" executable being installed.
+# On i686, php is no longer available; disable said tests.
+sed -e '/^scripts\/validate_php.sh$/d' -i ./run_all_tests_no_build.sh
+%endif
+./run_all_tests_no_build.sh
+popd
%endif
%if 0%{?with_gui}
@@ -205,6 +214,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}-gui.desktop
%changelog
+* Mon Mar 30 2026 Artur Frenszek-Iwicki <fedora(a)svgames.pl> - 1.0.2-1
+- Update to v1.0.2
+
* Fri Jan 16 2026 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.16.0-15
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
diff --git a/sources b/sources
index a3b2aaa..4f869da 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (pasdoc-0.16.0.tar.gz) = fb3cebff2338e19119c44330398eaa69bbf65bfbc1a849a6151a3cfc936ae338fde75c7c1c54c27374dd1edddf7bc9f25a3af43b0c4d8ecea0547808e8a16ad4
+SHA512 (pasdoc-1.0.2.tar.gz) = 48ebad44936f0294a141dad2da82185f1ef6a78a7d1e9230390f675babd067ecda107b591f78d3e176e0a5c441b9dcf309826fcc335261cedefb757727533bde