10 left

5 files changed, 92 insertions, 0 deletions

diff --git a/src/stage1/build_from_deptree.sh b/src/stage1/build_from_deptree.sh
index 20f23f7..df9f623 100644
--- a/src/stage1/build_from_deptree.sh
+++ b/src/stage1/build_from_deptree.sh
@@ -43,6 +43,29 @@ while [ -s "$_deptree" ]; do
       # simply reuse arch=(any) packages
       _pkgver=$(pacman -Si $_pkgname | grep '^Version' | awk '{print $3}')
       pacman -Sw --noconfirm --cachedir . $_pkgname
+    elif [ "x$_pkgname" == "xca-certificates-mozilla" ]; then
+      # ca-certificates-mozilla should really be arch=(any)
+      _pkgver=$(pacman -Si $_pkgname | grep '^Version' | awk '{print $3}')
+      pacman -Sw --noconfirm --cachedir . $_pkgname
+      mkdir tmp && bsdtar -C tmp -xf $_pkgname-$_pkgver-*.pkg.tar.xz
+      mkdir -p "$_pkgdir"/usr/share/
+      cp -rv tmp/usr/share/ca-certificates/ "$_pkgdir"/usr/share/
+      cat > "$_pkgdir"/.PKGINFO << EOF
+pkgname = $_pkgname
+pkgver = $_pkgver
+pkgdesc = Mozilla's set of trusted CA certificates
+url = https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS
+builddate = $(date '+%s')
+size = 0
+arch = $_pkgarch
+EOF
+      cd "$_pkgdir"
+      env LANG=C bsdtar -czf .MTREE \
+        --format=mtree \
+        --options='!all,use-set,type,uid,gid,mode,time,size,md5,sha256,link' \
+        .PKGINFO *
+      env LANG=C bsdtar -cf - .MTREE .PKGINFO * | xz -c -z - > \
+        "$_makepkgdir"/$_pkgname/$_pkgname-$_pkgver-$_pkgarch.pkg.tar.xz
     else
       # acquire the pkgbuild and auxiliary files
       _libre=https://www.parabola.nu/packages/libre/x86_64/$_pkgname/
diff --git a/src/stage1/create_package_tree.sh b/src/stage1/create_package_tree.sh
index d52a27f..91859f6 100644
--- a/src/stage1/create_package_tree.sh
+++ b/src/stage1/create_package_tree.sh
@@ -74,6 +74,9 @@ if [ ! -f "$_deptree" ]; then
   _tree[make]="${_tree[make]/guile}"
   unset _tree[guile]
   unset _tree[gc]
+  # we build stage1 pinentry without libsecret
+  _tree[pinentry]="${_tree[pinentry]/libsecret}"
+  unset _tree[libsecret]
   # resolve systemd dependency situation
   _tree[libutil-linux]="${_tree[libutil-linux]/libsystemd}"
   _tree[util-linux]="${_tree[util-linux]/libsystemd}"
diff --git a/src/stage1/patches/gnupg.patch b/src/stage1/patches/gnupg.patch
new file mode 100644
index 0000000..a14ca14
--- /dev/null
+++ b/src/stage1/patches/gnupg.patch
@@ -0,0 +1,10 @@
+--- a/PKGBUILD	2018-02-22 11:31:01.137536256 +0100
++++ b/PKGBUILD	2018-02-22 11:31:27.087806168 +0100
+@@ -40,6 +40,7 @@ prepare() {
+ build() {
+ 	cd "${srcdir}/${pkgname}-${pkgver}"
+ 	./configure \
++    --host=@TARGET@ --build=@BUILDHOST@ \
+ 		--prefix=/usr \
+ 		--sysconfdir=/etc \
+ 		--sbindir=/usr/bin \
diff --git a/src/stage1/patches/gpgme.patch b/src/stage1/patches/gpgme.patch
new file mode 100644
index 0000000..f86f8bb
--- /dev/null
+++ b/src/stage1/patches/gpgme.patch
@@ -0,0 +1,32 @@
+--- a/PKGBUILD	2018-02-22 11:35:45.855515252 +0100
++++ b/PKGBUILD	2018-02-22 11:37:33.121645532 +0100
+@@ -4,7 +4,7 @@
+ # Contributor: Sarah Hay <sarah@archlinux.org>
+ 
+ pkgbase=gpgme
+-pkgname=(gpgme qgpgme python-gpgme)
++pkgname=(gpgme)
+ pkgver=1.10.0
+ pkgrel=1
+ pkgdesc="A C wrapper library for GnuPG"
+@@ -20,6 +20,7 @@ validpgpkeys=('D8692123C4065DEA5E0F3AB52
+ build() {
+   cd ${pkgbase}-${pkgver}
+   ./configure --prefix=/usr --disable-fd-passing --disable-static \
++              --host=@TARGET@ --build=@BUILDHOST@ \
+               --disable-gpgsm-test
+   make
+ }
+@@ -37,9 +38,9 @@ package_gpgme() {
+   make DESTDIR="${pkgdir}" install
+ 
+   # split qgpgme
+-  rm -r "${pkgdir}"/usr/include/{qgpgme,QGpgME}/
+-  rm -r "${pkgdir}"/usr/lib/{cmake/QGpgme/,libqgpgme.*}
+-  rm -r "${pkgdir}"/usr/lib/python*
++  rm -r "${pkgdir}"/usr/include/{qgpgme,QGpgME}/ | true
++  rm -r "${pkgdir}"/usr/lib/{cmake/QGpgme/,libqgpgme.*} | true
++  rm -r "${pkgdir}"/usr/lib/python* | true
+ }
+ 
+ package_qgpgme() {
diff --git a/src/stage1/patches/pinentry.patch b/src/stage1/patches/pinentry.patch
new file mode 100644
index 0000000..6e44eb6
--- /dev/null
+++ b/src/stage1/patches/pinentry.patch
@@ -0,0 +1,24 @@
+--- a/PKGBUILD	2018-02-22 11:28:46.689144570 +0100
++++ b/PKGBUILD	2018-02-22 11:29:56.353864179 +0100
+@@ -22,15 +22,16 @@ validpgpkeys=('D8692123C4065DEA5E0F3AB52
+ build() {
+ 	cd "${srcdir}/${pkgname}-${pkgver}"
+ 	./configure \
++    --host=@TARGET@ --build=@BUILDHOST@ \
+ 		--prefix=/usr \
+ 		--enable-pinentry-tty \
+ 		--enable-pinentry-curses \
+ 		--enable-fallback-curses \
+-		--enable-pinentry-emacs \
+-		--enable-pinentry-gtk2 \
+-		--enable-pinentry-gnome3 \
+-		--enable-pinentry-qt \
+-		--enable-libsecret \
++		--disable-pinentry-emacs \
++		--disable-pinentry-gtk2 \
++		--disable-pinentry-gnome3 \
++		--disable-pinentry-qt \
++		--disable-libsecret \
+ 
+ 	make
+ }