[arch-commits] Commit in archlinux-keyring/trunk (PKGBUILD archlinux-keyring.install)

2019-02-09 Thread Florian Pritz via arch-commits 
Date: Saturday, February 9, 2019 @ 22:31:05
  Author: bluewind
Revision: 345783

upgpkg: archlinux-keyring 20190123-2

Always reenable alad\'s key

Modified:
  archlinux-keyring/trunk/PKGBUILD
  archlinux-keyring/trunk/archlinux-keyring.install

---+
 PKGBUILD  |2 +-
 archlinux-keyring.install |   14 ++
 2 files changed, 7 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-02-09 20:36:38 UTC (rev 345782)
+++ PKGBUILD2019-02-09 22:31:05 UTC (rev 345783)
@@ -3,7 +3,7 @@
 
 pkgname=archlinux-keyring
 pkgver=20190123
-pkgrel=1
+pkgrel=2
 pkgdesc='Arch Linux PGP keyring'
 arch=(any)
 url='https://projects.archlinux.org/archlinux-keyring.git/'

Modified: archlinux-keyring.install
===
--- archlinux-keyring.install   2019-02-09 20:36:38 UTC (rev 345782)
+++ archlinux-keyring.install   2019-02-09 22:31:05 UTC (rev 345783)
@@ -4,14 +4,12 @@
 
# Re-enable key of alad
# See https://bugs.archlinux.org/task/35478
-   if [[ -z "$2" ]] || [[ "$(vercmp "$2" "20181018-1")" -lt 0 ]]; 
then
-   printf 'enable\nquit\n' | LANG=C \
-   gpg --homedir /etc/pacman.d/gnupg \
-   --no-permission-warning --command-fd 0 \
-   --quiet --batch --edit-key \
-   DBE7D3DD8C81D58D0A13D0E76BC26A17B9B7018A \
-   2>/dev/null
-   fi
+   printf 'enable\nquit\n' | LANG=C \
+   gpg --homedir /etc/pacman.d/gnupg \
+   --no-permission-warning --command-fd 0 \
+   --quiet --batch --edit-key \
+   DBE7D3DD8C81D58D0A13D0E76BC26A17B9B7018A \
+   2>/dev/null
fi
 }

[arch-commits] Commit in archlinux-keyring/trunk (PKGBUILD archlinux-keyring.install)

2018-10-18 Thread Florian Pritz via arch-commits 
Date: Thursday, October 18, 2018 @ 13:10:07
  Author: bluewind
Revision: 336818

New release; reenable Alad's key

Modified:
  archlinux-keyring/trunk/PKGBUILD
  archlinux-keyring/trunk/archlinux-keyring.install

---+
 PKGBUILD  |5 +++--
 archlinux-keyring.install |   11 +++
 2 files changed, 14 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-10-18 06:38:57 UTC (rev 336817)
+++ PKGBUILD2018-10-18 13:10:07 UTC (rev 336818)
@@ -2,7 +2,7 @@
 # Maintainer: Bartłomiej Piotrowski 
 
 pkgname=archlinux-keyring
-pkgver=20181003
+pkgver=20181018
 pkgrel=1
 pkgdesc='Arch Linux PGP keyring'
 arch=(any)
@@ -10,7 +10,7 @@
 license=(GPL)
 install=$pkgname.install
 
source=(https://sources.archlinux.org/other/$pkgname/${pkgname}-${pkgver}.tar.gz{,.sig})
-sha256sums=('6eb0810cd4c6cda6990f08f019b8ddc7b4b2ce46025e6ac08166a7afa1024326'
+sha256sums=('24fbb4154ab7cfcbae76fbca28b1122ec7f305a138db0aa87c74d7ddd8110bb1'
 'SKIP')
 validpgpkeys=('4AA4767BBC9C4B1D18AE28B77F2D434B9741E8AC'  # Pierre Schmitz 

   'A314827C4E4250A204CE6E13284FC34C8E4B1A25'  # Thomas Bächler 

@@ -17,6 +17,7 @@
   '86CFFCA918CF3AF47147588051E8B148AC34'  # Evangelos Foutras 

   'F3691687D867B81B51CE07D9BBE43771487328A9'  # Bartlomiej 
Piotrowski 
   'BD84DE71F493DF6814B0167254EDC91609BC9183'  # Christian Hesse 

+  'CFA6AF15E5C74149FC1D8C086D1655C14CE1C13E'  # Florian Pritz 

   'E499C79F53C96A54E572FEE1C06086337C50773E')  # Jelle van der Waa 

 
 package() {

Modified: archlinux-keyring.install
===
--- archlinux-keyring.install   2018-10-18 06:38:57 UTC (rev 336817)
+++ archlinux-keyring.install   2018-10-18 13:10:07 UTC (rev 336818)
@@ -1,6 +1,17 @@
 post_upgrade() {
if usr/bin/pacman-key -l >/dev/null 2>&1; then
usr/bin/pacman-key --populate archlinux
+
+   # Re-enable key of alad
+   # See https://bugs.archlinux.org/task/35478
+   if [[ -z "$2" ]] || [[ "$(vercmp "$2" "20181018-1")" -lt 0 ]]; 
then
+   printf 'enable\nquit\n' | LANG=C \
+   gpg --homedir /etc/pacman.d/gnupg \
+   --no-permission-warning --command-fd 0 \
+   --quiet --batch --edit-key \
+   DBE7D3DD8C81D58D0A13D0E76BC26A17B9B7018A \
+   2>/dev/null
+   fi
fi
 }

[arch-commits] Commit in archlinux-keyring/trunk (PKGBUILD archlinux-keyring.install)

2013-06-08 Thread Pierre Schmitz 
Date: Saturday, June 8, 2013 @ 09:01:02
  Author: pierre
Revision: 187918

upgpkg: archlinux-keyring 20130525-2

Re-enable key of dwallace

Modified:
  archlinux-keyring/trunk/PKGBUILD
  archlinux-keyring/trunk/archlinux-keyring.install

---+
 PKGBUILD  |2 +-
 archlinux-keyring.install |   11 +++
 2 files changed, 12 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-06-08 07:00:54 UTC (rev 187917)
+++ PKGBUILD2013-06-08 07:01:02 UTC (rev 187918)
@@ -3,7 +3,7 @@
 
 pkgname=archlinux-keyring
 pkgver=20130525
-pkgrel=1
+pkgrel=2
 pkgdesc='Arch Linux PGP keyring'
 arch=('any')
 url='https://projects.archlinux.org/archlinux-keyring.git/'

Modified: archlinux-keyring.install
===
--- archlinux-keyring.install   2013-06-08 07:00:54 UTC (rev 187917)
+++ archlinux-keyring.install   2013-06-08 07:01:02 UTC (rev 187918)
@@ -1,6 +1,17 @@
 post_upgrade() {
if usr/bin/pacman-key -l /dev/null 21; then
usr/bin/pacman-key --populate archlinux
+
+   # Re-enable key of dwallace
+   # See https://bugs.archlinux.org/task/35478
+   if [ -z $2 ] || [ $2 = 20130525-1 ]; then
+   printf 'enable\nquit\n' | LANG=C \
+   gpg --homedir /etc/pacman.d/gnupg \
+   --no-permission-warning --command-fd 0 \
+   --quiet --batch --edit-key \
+   5559BC1A32B8F76B3FCCD9555FA5E5544F010D48 \
+   2/dev/null
+   fi
fi
 }

[arch-commits] Commit in archlinux-keyring/trunk (PKGBUILD archlinux-keyring.install)

2012-04-07 Thread Pierre Schmitz 
Date: Saturday, April 7, 2012 @ 14:02:58
  Author: pierre
Revision: 155852

Do not run pacman --init but ask the user to do so if needed

Modified:
  archlinux-keyring/trunk/PKGBUILD
  archlinux-keyring/trunk/archlinux-keyring.install

---+
 PKGBUILD  |6 +++---
 archlinux-keyring.install |   10 +++---
 2 files changed, 10 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-04-07 16:56:17 UTC (rev 155851)
+++ PKGBUILD2012-04-07 18:02:58 UTC (rev 155852)
@@ -2,7 +2,7 @@
 # Maintainer: Pierre Schmitz pie...@archlinux.de
 
 pkgname=archlinux-keyring
-pkgver=20120321
+pkgver=20120407
 pkgrel=1
 pkgdesc='Arch Linux PGP keyring'
 arch=('any')
@@ -11,8 +11,8 @@
 install=${pkgname}.install
 source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz;
 
ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz.sig;)
-md5sums=('7a8f0b9b46f72b72bc9579ed1123c208'
- '4411b733a7c3ab9abe0c2fc8cf2e53ec')
+md5sums=('846e97918477f98046dcd1bd1dda9bda'
+ '87025603b192b87152e7e0e72c06aa72')
 
 package() {
cd ${srcdir}/${pkgname}-${pkgver}

Modified: archlinux-keyring.install
===
--- archlinux-keyring.install   2012-04-07 16:56:17 UTC (rev 155851)
+++ archlinux-keyring.install   2012-04-07 18:02:58 UTC (rev 155852)
@@ -1,10 +1,14 @@
 post_upgrade() {
-   pacman-key --populate archlinux
+   if usr/bin/pacman-key -l /dev/null 21; then
+   usr/bin/pacman-key --populate archlinux
+   else
+   echo   Run \`pacman-key --init\` to set up your pacman 
keyring.
+   echo   Then run \`pacman-key --populate archlinux\` to 
install the Arch Linux keyring.
+   fi
 }
 
 post_install() {
-   if which pacman-key /dev/null 21; then
-   pacman-key --init
+   if [ -x usr/bin/pacman-key ]; then
post_upgrade
fi
 }

[arch-commits] Commit in archlinux-keyring/trunk (PKGBUILD archlinux-keyring.install)

2012-03-03 Thread Pierre Schmitz 
Date: Saturday, March 3, 2012 @ 13:19:09
  Author: pierre
Revision: 151903

Use pacman-key --populate

Modified:
  archlinux-keyring/trunk/PKGBUILD
  archlinux-keyring/trunk/archlinux-keyring.install

---+
 PKGBUILD  |6 +++---
 archlinux-keyring.install |5 ++---
 2 files changed, 5 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-03-03 16:12:24 UTC (rev 151902)
+++ PKGBUILD2012-03-03 18:19:09 UTC (rev 151903)
@@ -1,7 +1,7 @@
 # Maintainer: Pierre Schmitz pie...@archlinux.de
 
 pkgname=archlinux-keyring
-pkgver=20120213
+pkgver=20120303
 pkgrel=1
 pkgdesc='Arch Linux PGP keyring'
 arch=('any')
@@ -10,8 +10,8 @@
 install=${pkgname}.install
 source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz;
 
ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz.sig;)
-md5sums=('0bce827a30ddbea42b38cc24d1691ac5'
- '27275509ea3ff9d0c24e6b0ba47878a8')
+md5sums=('42f09f33b110bec53a80dfb7e8d2bade'
+ '19528f9c64ff41c75f8e15e162bb95fb')
 
 package() {
cd ${srcdir}/${pkgname}-${pkgver}

Modified: archlinux-keyring.install
===
--- archlinux-keyring.install   2012-03-03 16:12:24 UTC (rev 151902)
+++ archlinux-keyring.install   2012-03-03 18:19:09 UTC (rev 151903)
@@ -1,9 +1,8 @@
 post_upgrade() {
-   pacman-key -a \
-   usr/share/archlinux-keyring/master/*.asc \
-   usr/share/archlinux-keyring/packager/*.asc /dev/null
+   pacman-key --populate archlinux
 }
 
 post_install() {
+   pacman-key --init
post_upgrade
 }