rpms/archlinux-keyring
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

merge into: rpms:rawhide
Branches Tags
rpms:rawhide
rpms:main
rpms:f42
rpms:f43
rpms:epel10
rpms:f41
rpms:f40
rpms:f39
rpms:epel9
rpms:f38
rpms:f37
rpms:f36
rpms:f35
rpms:f33
rpms:f34
rpms:f32
rpms:f31
rpms:f30
rpms:f29
rpms:f28
rpms:f26
rpms:f27
rpms:f25
rpms:f24
rpms:f23
rpms:f22
rpms:f21
rpms:f20
rpms:f19
...
pull from: rpms:f39
Branches Tags
rpms:main
rpms:rawhide
rpms:f42
rpms:f43
rpms:epel10
rpms:f41
rpms:f40
rpms:f39
rpms:epel9
rpms:f38
rpms:f37
rpms:f36
rpms:f35
rpms:f33
rpms:f34
rpms:f32
rpms:f31
rpms:f30
rpms:f29
rpms:f28
rpms:f26
rpms:f27
rpms:f25
rpms:f24
rpms:f23
rpms:f22
rpms:f21
rpms:f20
rpms:f19
Sign in to create a new pull request.

20 commits
rawhide ... f39

Author SHA1 Message Date
Zbigniew Jędrzejewski-Szmek
45e524cb2d Version 20241015 
... (rhbz#2319024)

(cherry picked from commit 0ca7c778e9)
(cherry picked from commit 8b6ee5f7eb)
 2024-10-24 09:48:11 +02:00
Frantisek Sumsal
028a9d0bad Version 20240709 
... (rhbz#2296950)
 2024-07-12 17:08:54 +02:00
Zbigniew Jędrzejewski-Szmek
fd2e405857 Version 20240609 
... (rhbz#2291115)
 2024-06-10 19:48:59 +02:00
Zbigniew Jędrzejewski-Szmek
df6d070d99 Version 20240520 
... (rhbz#2277698)
 2024-06-02 14:23:34 +02:00
Zbigniew Jędrzejewski-Szmek
8f7071ab4a Version 20240427 
... (rhbz#2277519)

(cherry picked from commit 3b4e0b0d82)
(cherry picked from commit e31a41046d)
 2024-04-28 20:54:22 +02:00
Zbigniew Jędrzejewski-Szmek
8651fd252c Drop now-needed patch for sequoia-sq 
[skip changelog]

(cherry picked from commit a88ca31402)
(cherry picked from commit 6594ae2daa)
 2024-04-28 20:54:21 +02:00
Frantisek Sumsal
ef1b8bbc0a Version 20240313 
... (rhbz#2269408)

This also reshuffles the patch situation a bit, notably:
 - the patch for sq-keyring-linter is no longer necessary, since we have
   sequoia-sq >= 0.31.0 in all active Fedora releases
 - a new patch was added that reverts [0], since ATTOW in Fedora we have
   sequoia-sq 0.33.0 which is from before the keyring module was moved
   into the toolbox one; once Fedora gets sequoia-sq >= 0.34.0 this
   patch can be dropped

[0] 10252b287d
 2024-03-20 17:53:14 +01:00
Zbigniew Jędrzejewski-Szmek
0edec7b972 Version 20240208 
... (rhbz#2263434)

(cherry picked from commit 3e3512daed)
 2024-02-09 12:58:49 +01:00
Zbigniew Jędrzejewski-Szmek
110405c15e Rework scriptlets to initialize the keyring 
The scriptlet would only work if pacman was already installed when the
scriptlet was called. This would often be the case, but for example, the
user might even install pacman later in a separate transaction.

Let's switch to a %transfiletriggerin: this way we should be called in
all cases where pacman-key is available. We might be called more often
than necessary, but that should be fine too. pacman is updated rather
rarely.

(cherry picked from commit 9866da662c)
 2024-02-09 12:58:49 +01:00
Frantisek Sumsal
79687b1f28 Version 20231222 
... (rhbz#2255663)
 2024-01-03 10:11:39 +01:00
Frantisek Sumsal
a1107196a3 Version 20231207 
... (rhbz#2253495)
 2023-12-13 21:46:06 +01:00
Frantisek Sumsal
5e0f6b1391 Version 20231130 
... (rhbz#2252233)
 2023-12-03 19:46:12 +01:00
Zbigniew Jędrzejewski-Szmek
f7eee61ed2 Convert license tag to SPDX 2023-11-21 14:45:56 +01:00
Frantisek Sumsal
619dba03ba Version 20231113 
... (rhbz#2248590)
 2023-11-14 19:49:30 +01:00
Frantisek Sumsal
5f378db399 Version 20231026 
... (rhbz#2246326)
 2023-11-03 18:57:16 +01:00
Zbigniew Jędrzejewski-Szmek
2a2d6fa476 Version 20231017 
... (rhbz#2243196)

(cherry picked from commit 08ca5376dd)
 2023-10-17 15:45:04 +02:00
Zbigniew Jędrzejewski-Szmek
f174f54bff Version 20230918 
... (rhbz#2239389)

(cherry picked from commit 8ecc997ae3)
 2023-09-18 18:45:56 +02:00
Zbigniew Jędrzejewski-Szmek
9d835e0719 Use rhbz# in message 
This way bodhi should be able to link the update to the bug automatically.

The bug number is moved from the git commit title to the body. We don't really
need this clutter in the git log, it is only useful in the %changelog so that
bodhi can pick it up.

(cherry picked from commit a71f4e415d)

[skip changelog]
 2023-09-18 18:45:49 +02:00
Michel Lind
44ecde5863
 		Revert upstream feature that uses sq >= 0.31.0 
Signed-off-by: Michel Lind <salimma@fedoraproject.org>
 2023-09-07 14:10:38 -05:00
Frantisek Sumsal
c0e088c38d Version 20230821 (#2233045) 2023-08-21 20:42:40 +02:00
4 changed files with 33 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

15
.gitignore vendored
View file

@ -43,3 +43,18 @@
/archlinux-keyring-20230504.tar.gz
/archlinux-keyring-20230629.tar.gz
/archlinux-keyring-20230704.tar.gz
/archlinux-keyring-20230821.tar.gz
/archlinux-keyring-20230918.tar.gz
/archlinux-keyring-20231017.tar.gz
/archlinux-keyring-20231026.tar.gz
/archlinux-keyring-20231113.tar.gz
/archlinux-keyring-20231130.tar.gz
/archlinux-keyring-20231207.tar.gz
/archlinux-keyring-20231222.tar.gz
/archlinux-keyring-20240208.tar.gz
/archlinux-keyring-20240313.tar.gz
/archlinux-keyring-20240427.tar.gz
/archlinux-keyring-20240520.tar.gz
/archlinux-keyring-20240609.tar.gz
/archlinux-keyring-20240709.tar.gz
/archlinux-keyring-20241015.tar.gz

22
archlinux-keyring.spec
View file

@ -1,11 +1,11 @@
Name: archlinux-keyring
Version: 20230704
Version: 20241015
Release: %autorelease
Url: https://archlinux.org/packages/core/any/archlinux-keyring/
Source0: https://gitlab.archlinux.org/archlinux/archlinux-keyring/-/archive/%{version}/archlinux-keyring-%{version}.tar.gz
# see https://wiki.archlinux.org/index.php/Pacman-key for introduction
License: Public Domain
Summary: GPG keys used by Arch distribution to sign packages
License: LicenseRef-Fedora-Public-Domain
Summary: GPG keys used by Arch Linux distribution to sign packages
BuildArch: noarch
BuildRequires: keyrings-filesystem
@ -28,7 +28,7 @@ developers into an RPM package to allow for safe and convenient
installation on Fedora systems.
%prep
%setup -q
%autosetup -p1
%build
@ -47,10 +47,16 @@ ln --relative -s %{_datadir}/pacman/keyrings/archlinux.gpg %{buildroot}%{_keyrin
%{_unitdir}/archlinux-keyring-wkd-sync.*
%{_unitdir}/timers.target.wants/archlinux-keyring-wkd-sync.timer
%post
if [ -x /usr/bin/pacman-key ] && /usr/bin/pacman-key -l &>/dev/null; then
/usr/bin/pacman-key --populate archlinux || :
/usr/bin/pacman-key --updatedb || :
%posttrans
if [ $1 == 1 ] && [ -x /usr/bin/pacman-key ] && ! /usr/bin/pacman-key -l &>/dev/null; then
/usr/bin/pacman-key --init && \
/usr/bin/pacman-key --populate archlinux --updatedb || :
fi
%transfiletriggerin -- /usr/bin/pacman-key
if [ -x /usr/bin/pacman-key ] && ! /usr/bin/pacman-key -l &>/dev/null; then
/usr/bin/pacman-key --init && \
/usr/bin/pacman-key --populate archlinux --updatedb || :
fi
%changelog

2
sources
View file

@ -1 +1 @@
SHA512 (archlinux-keyring-20230704.tar.gz) = b441f14217e000a0c9d892206ea64d414eaf0966c17133588a99b10fdf1da4cfd1a2b47d880aa05cb49211baaf3b7d333448903c1decdc0cc5c9dd89becf2480
SHA512 (archlinux-keyring-20241015.tar.gz) = 9f042416951cee25cec65759fa2a9ea095cc5b8e650fc7dc070f0c319b50c8f082e45ef1cae6acb1350a0bd48112ee08283fc58c793c6e9c362b91bea42499e0

4
version-update.sh
View file

@ -32,7 +32,9 @@ if [ "$sum1" != "$sum2" ]; then
fi
git add *.spec
git commit -a -m "Version $version (#$bug)"
git commit -a -m "Version $version
... (rhbz#$bug)"
if [ "$args" = "-u" ]; then
git push