Merge branch 'master' of git://projects.parabola.nu/abslibre/abslibre

3 files changed, 30 insertions, 16 deletions

diff --git a/libre/pacman/PKGBUILD b/libre/pacman/PKGBUILD
index ed77089a5..6dd5a2823 100644
--- a/libre/pacman/PKGBUILD
+++ b/libre/pacman/PKGBUILD
@@ -2,15 +2,15 @@
 # $Id: PKGBUILD 268273 2016-05-18 05:54:54Z allan $
 # Maintainer (Arch): Dan McGee <dan@archlinux.org>
 # Maintainer (Arch): Dave Reisner <dreisner@archlinux.org>
-# Maintainer: André Silva <emulatorman@parabola.nu>
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+# Contributor: André Silva <emulatorman@parabola.nu>
 # Contributor: Márcio Silva <coadde@parabola.nu>
 # Contributor: Nicolás Reynolds <fauno@kiwwwi.com.ar>
-# Contributor: Luke Shumaker <lukeshu@sbcglobal.net>
 # Contributor: Daniel Milewski <niitotantei@riseup.net>
 
 pkgname=pacman
 pkgver=5.0.1
-pkgrel=4.parabola4
+pkgrel=5.parabola1
 pkgdesc="A library-based package manager with dependency support"
 arch=('i686' 'x86_64' 'armv7h')
 url="http://www.archlinux.org/pacman/"
@@ -21,6 +21,7 @@ depends=('bash' 'glibc' 'libarchive' 'curl'
          'parabola-keyring')
 depends_armv7h=('archlinuxarm-keyring')
 makedepends=('asciidoc')
+makedepends+=('openssl>=1.1' 'openssl-1.0') # for during openssl 1.0->1.1 rebuild; remove on next rebuild
 checkdepends=('python2' 'fakechroot')
 optdepends=('cron: run specified programs at scheduled times and related tools')
 provides=("$pkgname-contrib")
@@ -57,7 +58,7 @@ prepare() {
   cd "$pkgname-$pkgver"
 
   # From Arch
-  # v5.0.1..pacman-5.0.1..c2f97580
+  # v5.0.1..pacman-5.0.1..c2f975802
   patch -p1 -i $srcdir/pacman-5.0.1-roundup.patch
 
   # From Arch ARM
diff --git a/libre/parabola-keyring/PKGBUILD b/libre/parabola-keyring/PKGBUILD
index 38039fc71..76ea74adb 100644
--- a/libre/parabola-keyring/PKGBUILD
+++ b/libre/parabola-keyring/PKGBUILD
@@ -1,22 +1,35 @@
-# Maintainer: David P. <megver83@parabola.nu>
+# Maintainer: Parabola automatic package builder <autobuilder@parabola.nu>
 
 pkgname=parabola-keyring
-pkgver=20170424
+pkgver=20170425
+_gitver=01e123306e8ba84f41d7298cb9e8518bb61e6c3d
 pkgrel=1
 pkgdesc='Parabola GNU/Linux-libre PGP keyring'
 arch=('any')
-url='https://projects.parabola.nu/hackers.git/'
+url='https://git.parabola.nu/hackers.git/'
 license=('GPL')
 install=$pkgname.install
-source=("http://repo.parabola.nu/other/$pkgname/$pkgname-$pkgver.tar.gz"
-        "http://repo.parabola.nu/other/$pkgname/$pkgname-$pkgver.tar.gz.sig")
-validpgpkeys=('6DB9C4B4F0D8C0DC432CF6E4227CA7C556B2BA78' # David P.
-)
-sha512sums=('61c9d47c7e5e3eb20e7ed5ec9f4814762d476b1e69ef1fba5c9dcf5775627582ae0a27723ed182f6e1b17cfa52a1c966e629cac8bbade1b42a4cad8204afd370'
+source=(https://repo.parabola.nu/other/$pkgname/$pkgname-$pkgver.tar.gz{,.sig})
+sha512sums=('934ea4a2d4d009c49ec70d93f83c754585b393ce6fc7965983b7346abc9d1cb5094352c5893b8aecb9eb3a0b7aab3bbb2666565c67ddaaa8f5bed747fb100bcd'
             'SKIP')
+validpgpkeys=('D3EAD7F9D076EB9AF650149DA170D6A0B669E21A') # Parabola automatic package builder <dev@lists.parabolagnulinux.org>
+
+mkdepends=('parabola-hackers')
+mksource=("hackers-${_gitver}::git://git.parabola.nu/hackers.git#commit=${_gitver}")
+mkmd5sums=('SKIP')
+
+mksource() {
+	cd "$srcdir"
+	mv {,.}hackers-$_gitver
+	mkdir .cachedir
+	/usr/lib/parabola-hackers/pacman-make-keyring \
+		V="$pkgver" \
+		PARABOLA_HACKERS_YAMLDIR="$PWD/.hackers-$_gitver/users" \
+		cachedir="$PWD/.cachedir"
+	bsdtar xf "$pkgname-$pkgver.tar.gz"
+}
 
 package() {
 	cd "$srcdir/$pkgname-$pkgver"
 	make PREFIX=/usr DESTDIR="${pkgdir}" install
 }
-
diff --git a/libre/your-freedom/PKGBUILD b/libre/your-freedom/PKGBUILD
index c55edcee3..2eb7a521c 100644
--- a/libre/your-freedom/PKGBUILD
+++ b/libre/your-freedom/PKGBUILD
@@ -4,8 +4,8 @@ pkgname=your-freedom
 pkgdesc="This package conflicts with every nonfree package known to date to ensure your system is free."
 license=('GPL3')
 url="https://git.parabola.nu/blacklist.git"
-pkgver=20170424.2
-_gitver=800fc4f622a2a98b63dd9470daa20a33fa1705b5
+pkgver=20170424.5
+_gitver=30b951409716945ff48f08ccc2900d190cff2f07
 pkgrel=1
 
 arch=('any')
@@ -14,7 +14,7 @@ install=${pkgname}.install
 
 makedepends=(librelib)
 source=(blacklist-${_gitver}.txt::https://git.parabola.nu/blacklist.git/plain/blacklist.txt?id=${_gitver})
-sha512sums=('3606c611ee171ab7a1dc96d4db44c977cd5da787d026ea961d34b840d519aa3a7ce5b6dc6270eca73bb5719dbdc940e47c0040f169c3b93542f956ffc79a9be0')
+sha512sums=('0599ed8b98e4d090325e79ce7106a37da1ea4b4c6229d30b8794089a7f25918c4a974a0634cd5143a31fad0113a8b5d1ab6b2cd835ccd888d5bfb604fa2dceba')
 
 package() {
 	cd "$srcdir"