remove custom gpg.conf, dirmngr.conf and sks-keyservers.netCA.pem from pacman and remove modified arch-install-scripts package for compatibility

6 files changed, 2 insertions, 150 deletions

diff --git a/libre/arch-install-scripts/PKGBUILD b/libre/arch-install-scripts/PKGBUILD
deleted file mode 100644
index d92f5e595..000000000
--- a/libre/arch-install-scripts/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 227573 2014-12-12 23:47:01Z dreisner $
-# Maintainer (Arch): Dave Reisner <dreisner@archlinux.org>
-# Maintainer: André Silva <emulatorman@parabola.nu>
-# Maintainer: Esteban Carnevale <alfplayer@mailoo.org>
-
-pkgname=arch-install-scripts
-pkgver=14
-pkgrel=1.parabola1
-pkgdesc="Scripts to aid in installing Parabola"
-arch=('any')
-url="https://projects.archlinux.org/arch-install-scripts.git"
-license=('GPL')
-depends=('bash' 'coreutils' 'pacman' 'util-linux')
-source=("ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz"
-        'copykeyring_fix.patch')
-md5sums=('fcab5a3e463413b06790969cfe09851c'
-         '566b8d1b0b4ac21c4040ff5171275beb')
-
-prepare() {
-  cd "$pkgname-$pkgver"
-  patch -Np1 -i "$srcdir"/copykeyring_fix.patch
-}
-
-build() {
-  make -C "$pkgname-$pkgver"
-}
-
-check() {
-  make -C "$pkgname-$pkgver" check
-}
-
-package() {
-  make -C "$pkgname-$pkgver" PREFIX=/usr DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/libre/arch-install-scripts/copykeyring_fix.patch b/libre/arch-install-scripts/copykeyring_fix.patch
deleted file mode 100644
index cc4f3f8cd..000000000
--- a/libre/arch-install-scripts/copykeyring_fix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Nur arch-install-scripts-14.orig/pacstrap.in arch-install-scripts-14/pacstrap.in
---- arch-install-scripts-14.orig/pacstrap.in	2014-12-12 21:43:21.000000000 -0200
-+++ arch-install-scripts-14/pacstrap.in	2015-02-02 01:21:12.998548374 -0200
-@@ -109,10 +109,7 @@
- fi
- 
- if (( copykeyring )); then
--  # if there's a keyring on the host, copy it into the new root, unless it exists already
--  if [[ -d /etc/pacman.d/gnupg && ! -d $newroot/etc/pacman.d/gnupg ]]; then
--    cp -a /etc/pacman.d/gnupg "$newroot/etc/pacman.d/"
--  fi
-+    cp -na /etc/pacman.d/gnupg/* "$newroot/etc/pacman.d/gnupg/"
- fi
- 
- if (( copymirrorlist )); then
diff --git a/libre/pacman/PKGBUILD b/libre/pacman/PKGBUILD
index f846fcf09..8e4bc6740 100644
--- a/libre/pacman/PKGBUILD
+++ b/libre/pacman/PKGBUILD
@@ -9,7 +9,7 @@
 
 pkgname=pacman
 pkgver=4.2.0
-pkgrel=6.parabola4
+pkgrel=6.parabola5
 pkgdesc="A library-based package manager with dependency support"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.archlinux.org/pacman/"
@@ -23,17 +23,13 @@ checkdepends=('python2' 'fakechroot')
 provides=("$pkgname-contrib")
 conflicts=("$pkgname-contrib" "$pkgname-parabola" 'cacert-dot-org')
 replaces=("$pkgname-contrib" "$pkgname-parabola" 'cacert-dot-org')
-backup=('etc/pacman.conf' 'etc/makepkg.conf' 'etc/pacman.d/gnupg/gpg.conf'
-        'etc/pacman.d/gnupg/dirmngr.conf')
+backup=('etc/pacman.conf' 'etc/makepkg.conf')
 options=('strip' 'debug')
 source=("ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig}
         "$pkgname.conf."{i686,x86_64,mips64el}
         "makepkg.conf"
         "pacman-4.2.0-roundup.patch"
-        "gpg.conf"
-        "dirmngr.conf"
         "refresh-$pkgname-keys"
-        "sks-keyservers.netCA.pem"
         "makepkg-pkgrel-4.patch")
 md5sums=('184ce14f1f326fede72012cca51bba51'
          'SKIP'
@@ -42,10 +38,7 @@ md5sums=('184ce14f1f326fede72012cca51bba51'
          'a12b1a4533c170aecc8b9b8561048248'
          'ce525a9af50f1d9b824806d2e5a4f0c8'
          'abe3baaf610d9cc42b4e3748c936bbce'
-         '65da808317595b310e59f2f395f787a9'
-         'e1174020d2edf2e770857d005b7af0b9'
          '093f0779ac55ae781ba028ad74b95f84'
-         '3cfc5d2867a6672f4f629220632948f4'
          '0ee98dc38ff80ba127772f5104e18e46')
 validpgpkeys=('6645B0A8C7005E78DB1D7864F99FFE0FEAE999BD')  # Allan McRae <allan@archlinux.org>
 
@@ -125,11 +118,5 @@ package() {
 
   install -Dm644 contrib/PKGBUILD.vim "$pkgdir/usr/share/vim/vimfiles/syntax/PKGBUILD.vim"
 
-  install -Dm644 "$srcdir/gpg.conf" "$pkgdir/etc/pacman.d/gnupg/gpg.conf"
-
-  install -Dm644 "$srcdir/dirmngr.conf" "$pkgdir/etc/pacman.d/gnupg/dirmngr.conf"
-
   install -Dm755 "$srcdir/refresh-pacman-keys" "$pkgdir/etc/cron.weekly/refresh-pacman-keys"
-
-  install -Dm644 "$srcdir/sks-keyservers.netCA.pem" "$pkgdir/etc/pacman.d/gnupg/sks-keyservers.netCA.pem"
 }
diff --git a/libre/pacman/dirmngr.conf b/libre/pacman/dirmngr.conf
deleted file mode 100644
index 6a724eafd..000000000
--- a/libre/pacman/dirmngr.conf
+++ /dev/null
@@ -1 +0,0 @@
-hkp-cacert /etc/pacman.d/gnupg/sks-keyservers.netCA.pem
diff --git a/libre/pacman/gpg.conf b/libre/pacman/gpg.conf
deleted file mode 100644
index ec9ef9dc1..000000000
--- a/libre/pacman/gpg.conf
+++ /dev/null
@@ -1,51 +0,0 @@
-# pacman-key default options
-no-greeting
-no-permission-warning
-lock-never
-keyserver-options timeout=20
-
-# From duraconf
-# personal digest preferences
-personal-digest-preferences SHA512
-
-# message digest algorithm used when signing a key
-cert-digest-algo SHA512
-
-# Set the list of default preferences to string.
-# used for new keys and default for "setpref"
-default-preference-list SHA512 SHA384 SHA256 SHA224 AES256 AES192 AES CAST5 ZLIB BZIP2 ZIP Uncompressed
-
-# From
-# https://crabgrass.riseup.net/riseuplabs+paow/openpgp-best-practices
-# Only use secure keyservers
-#keyserver hkps://hkps.pool.sks-keyservers.net
-#keyserver-options no-honor-keyserver-url
-
-keyserver hkp://pool.sks-keyservers.net
-
-# when outputting certificates, view user IDs distinctly from keys:
-fixed-list-mode
-
-# short-keyids are trivially spoofed; it's easy to create a long-keyid
-# collision; if you care about strong key identifiers, you always want
-# to see the fingerprint:
-keyid-format 0xlong
-fingerprint
-
-# when multiple digests are supported by all recipients, choose the
-# strongest one:
-personal-digest-preferences SHA512 SHA384 SHA256 SHA224
-
-# If you use a graphical environment (and even if you don't)
-# you should be using an agent: (similar arguments as
-# https://www.debian-administration.org/users/dkg/weblog/64)
-use-agent
-
-# You should always know at a glance which User IDs gpg thinks are
-# legitimately bound to the keys in your keyring:
-verify-options show-uid-validity
-list-options show-uid-validity
-
-# include an unambiguous indicator of which key made a signature: (see
-# http://thread.gmane.org/gmane.mail.notmuch.general/3721/focus=7234)
-sig-notation issuer-fpr@notations.openpgp.fifthhorseman.net=%g
diff --git a/libre/pacman/sks-keyservers.netCA.pem b/libre/pacman/sks-keyservers.netCA.pem
deleted file mode 100644
index 24a2ad2e8..000000000
--- a/libre/pacman/sks-keyservers.netCA.pem
+++ /dev/null
@@ -1,32 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFizCCA3OgAwIBAgIJAK9zyLTPn4CPMA0GCSqGSIb3DQEBBQUAMFwxCzAJBgNV
-BAYTAk5PMQ0wCwYDVQQIDARPc2xvMR4wHAYDVQQKDBVza3Mta2V5c2VydmVycy5u
-ZXQgQ0ExHjAcBgNVBAMMFXNrcy1rZXlzZXJ2ZXJzLm5ldCBDQTAeFw0xMjEwMDkw
-MDMzMzdaFw0yMjEwMDcwMDMzMzdaMFwxCzAJBgNVBAYTAk5PMQ0wCwYDVQQIDARP
-c2xvMR4wHAYDVQQKDBVza3Mta2V5c2VydmVycy5uZXQgQ0ExHjAcBgNVBAMMFXNr
-cy1rZXlzZXJ2ZXJzLm5ldCBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoC
-ggIBANdsWy4PXWNUCkS3L//nrd0GqN3dVwoBGZ6w94Tw2jPDPifegwxQozFXkG6I
-6A4TK1CJLXPvfz0UP0aBYyPmTNadDinaB9T4jIwd4rnxl+59GiEmqkN3IfPsv5Jj
-MkKUmJnvOT0DEVlEaO1UZIwx5WpfprB3mR81/qm4XkAgmYrmgnLXd/pJDAMk7y1F
-45b5zWofiD5l677lplcIPRbFhpJ6kDTODXh/XEdtF71EAeaOdEGOvyGDmCO0GWqS
-FDkMMPTlieLA/0rgFTcz4xwUYj/cD5e0ZBuSkYsYFAU3hd1cGfBue0cPZaQH2HYx
-Qk4zXD8S3F4690fRhr+tki5gyG6JDR67aKp3BIGLqm7f45WkX1hYp+YXywmEziM4
-aSbGYhx8hoFGfq9UcfPEvp2aoc8u5sdqjDslhyUzM1v3m3ZGbhwEOnVjljY6JJLx
-MxagxnZZSAY424ZZ3t71E/Mn27dm2w+xFRuoy8JEjv1d+BT3eChM5KaNwrj0IO/y
-u8kFIgWYA1vZ/15qMT+tyJTfyrNVV/7Df7TNeWyNqjJ5rBmt0M6NpHG7CrUSkBy9
-p8JhimgjP5r0FlEkgg+lyD+V79H98gQfVgP3pbJICz0SpBQf2F/2tyS4rLm+49rP
-fcOajiXEuyhpcmzgusAj/1FjrtlynH1r9mnNaX4e+rLWzvU5AgMBAAGjUDBOMB0G
-A1UdDgQWBBTkwyoJFGfYTVISTpM8E+igjdq28zAfBgNVHSMEGDAWgBTkwyoJFGfY
-TVISTpM8E+igjdq28zAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4ICAQAR
-OXnYwu3g1ZjHyley3fZI5aLPsaE17cOImVTehC8DcIphm2HOMR/hYTTL+V0G4P+u
-gH+6xeRLKSHMHZTtSBIa6GDL03434y9CBuwGvAFCMU2GV8w92/Z7apkAhdLToZA/
-X/iWP2jeaVJhxgEcH8uPrnSlqoPBcKC9PrgUzQYfSZJkLmB+3jEa3HKruy1abJP5
-gAdQvwvcPpvYRnIzUc9fZODsVmlHVFBCl2dlu/iHh2h4GmL4Da2rRkUMlbVTdioB
-UYIvMycdOkpH5wJftzw7cpjsudGas0PARDXCFfGyKhwBRFY7Xp7lbjtU5Rz0Gc04
-lPrhDf0pFE98Aw4jJRpFeWMjpXUEaG1cq7D641RpgcMfPFvOHY47rvDTS7XJOaUT
-BwRjmDt896s6vMDcaG/uXJbQjuzmmx3W2Idyh3s5SI0GTHb0IwMKYb4eBUIpQOnB
-cE77VnCYqKvN1NVYAqhWjXbY7XasZvszCRcOG+W3FqNaHOK/n/0ueb0uijdLan+U
-f4p1bjbAox8eAOQS/8a3bzkJzdyBNUKGx1BIK2IBL9bn/HravSDOiNRSnZ/R3l9G
-ZauX0tu7IIDlRCILXSyeazu0aj/vdT3YFQXPcvt5Fkf5wiNTo53f72/jYEJd6qph
-WrpoKqrwGwTpRUCMhYIUt65hsTxCiJJ5nKe39h46sg==
------END CERTIFICATE-----