From a7d744145c6723b8cca7a3689b0690326190de65 Mon Sep 17 00:00:00 2001
From: Paul Menzel <pmenzel@molgen.mpg.de>
Date: Tue, 6 Nov 2018 17:14:08 +0100
Subject: [PATCH 1/9] libarchive: Remove trailing space

---
 libarchive-3.2.1-0.bee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libarchive-3.2.1-0.bee b/libarchive-3.2.1-0.bee
index 4a014d8e4..cfbb3a120 100755
--- a/libarchive-3.2.1-0.bee
+++ b/libarchive-3.2.1-0.bee
@@ -22,7 +22,7 @@ SRCURL[0]="http://www.libarchive.org/downloads/libarchive-${PKGVERSION}.tar.gz"
 #  Hirn: {F}:download, {S}:source, {B}:build, {D}:image
 
 function mee_patch() {
-  ( cd ${S}; rm -v CMakeLists.txt; sleep 3 ) # defeat cmake 
+  ( cd ${S}; rm -v CMakeLists.txt; sleep 3 ) # defeat cmake
 }
 
 function mee_install() {

From b740ea2d1d7371f90f5a355a02ba00cd5861ad78 Mon Sep 17 00:00:00 2001
From: Paul Menzel <pmenzel@molgen.mpg.de>
Date: Tue, 6 Nov 2018 17:14:53 +0100
Subject: [PATCH 2/9] libarchive: Convert to versionless bee file

---
 libarchive-3.2.1-0.bee => libarchive.be0 | 2 ++
 1 file changed, 2 insertions(+)
 rename libarchive-3.2.1-0.bee => libarchive.be0 (96%)

diff --git a/libarchive-3.2.1-0.bee b/libarchive.be0
similarity index 96%
rename from libarchive-3.2.1-0.bee
rename to libarchive.be0
index cfbb3a120..c6bb78338 100755
--- a/libarchive-3.2.1-0.bee
+++ b/libarchive.be0
@@ -1,5 +1,7 @@
 #!/usr/bin/env beesh
 
+# BEE_VERSION libarchive-3.2.1-0
+
 # Mon Jun 27 -- kreitler
 
 BEE_MAKEFLAGS=${BEE_MAKEFLAGS:-' -j12 '}

From a7e7ddf6b447484066494fe68110bf2d3b526a80 Mon Sep 17 00:00:00 2001
From: Paul Menzel <pmenzel@molgen.mpg.de>
Date: Tue, 6 Nov 2018 17:15:05 +0100
Subject: [PATCH 3/9] libarchive: Update version from 3.2.1 to 3.3.3

https://github.com/libarchive/libarchive/blob/master/NEWS
---
 libarchive.be0 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libarchive.be0 b/libarchive.be0
index c6bb78338..a28c4ab5b 100755
--- a/libarchive.be0
+++ b/libarchive.be0
@@ -1,6 +1,6 @@
 #!/usr/bin/env beesh
 
-# BEE_VERSION libarchive-3.2.1-0
+# BEE_VERSION libarchive-3.3.3-0
 
 # Mon Jun 27 -- kreitler
 

From 780ceefcf2a28fc1aa1534c86527d898c8e6ef37 Mon Sep 17 00:00:00 2001
From: Paul Menzel <pmenzel@molgen.mpg.de>
Date: Tue, 6 Nov 2018 18:08:41 +0100
Subject: [PATCH 4/9] libarchive: Remove unneeded comment

Our version control system git tracks changes for us, so remove the
comment.
---
 libarchive.be0 | 2 --
 1 file changed, 2 deletions(-)

diff --git a/libarchive.be0 b/libarchive.be0
index a28c4ab5b..aa81430dd 100755
--- a/libarchive.be0
+++ b/libarchive.be0
@@ -2,8 +2,6 @@
 
 # BEE_VERSION libarchive-3.3.3-0
 
-# Mon Jun 27 -- kreitler
-
 BEE_MAKEFLAGS=${BEE_MAKEFLAGS:-' -j12 '}
 
 [ $UID != 0 ] && PREFIX=/dev/shm/junk

From f4948805bfdb0d61d05b67aaa63fafa340025426 Mon Sep 17 00:00:00 2001
From: Paul Menzel <pmenzel@molgen.mpg.de>
Date: Tue, 6 Nov 2018 18:09:39 +0100
Subject: [PATCH 5/9] libarchive: Remove uncommon bee configuration changes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It’s uncommon to specify these things in our bee files, so do not do it
here either.

For example, my desktop only has four threads.
---
 libarchive.be0 | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/libarchive.be0 b/libarchive.be0
index aa81430dd..998711b11 100755
--- a/libarchive.be0
+++ b/libarchive.be0
@@ -2,10 +2,6 @@
 
 # BEE_VERSION libarchive-3.3.3-0
 
-BEE_MAKEFLAGS=${BEE_MAKEFLAGS:-' -j12 '}
-
-[ $UID != 0 ] && PREFIX=/dev/shm/junk
-
 SRCURL[0]="http://www.libarchive.org/downloads/libarchive-${PKGVERSION}.tar.gz"
 
 #  Diese kloppskoepfe kuemmern sich einen dreck um so.versionsn

From ba4ffbac81982e2ca2d8b4645461b49560afa689 Mon Sep 17 00:00:00 2001
From: Paul Menzel <pmenzel@molgen.mpg.de>
Date: Tue, 6 Nov 2018 18:11:03 +0100
Subject: [PATCH 6/9] libarchive: Fix typo in comment

---
 libarchive.be0 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libarchive.be0 b/libarchive.be0
index 998711b11..2020d169a 100755
--- a/libarchive.be0
+++ b/libarchive.be0
@@ -4,7 +4,7 @@
 
 SRCURL[0]="http://www.libarchive.org/downloads/libarchive-${PKGVERSION}.tar.gz"
 
-#  Diese kloppskoepfe kuemmern sich einen dreck um so.versionsn
+#  Diese kloppskoepfe kuemmern sich einen dreck um so.versions
 #
 #                       libarchive-3.1.2      libarchive-3.2.1
 #

From 1d0d56086f8d0400c3f9e0c2404b926264e2a8d4 Mon Sep 17 00:00:00 2001
From: Paul Menzel <pmenzel@molgen.mpg.de>
Date: Tue, 6 Nov 2018 18:11:19 +0100
Subject: [PATCH 7/9] libarchive: Securely download source archive over HTTPS

---
 libarchive.be0 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libarchive.be0 b/libarchive.be0
index 2020d169a..c5ed455d8 100755
--- a/libarchive.be0
+++ b/libarchive.be0
@@ -2,7 +2,7 @@
 
 # BEE_VERSION libarchive-3.3.3-0
 
-SRCURL[0]="http://www.libarchive.org/downloads/libarchive-${PKGVERSION}.tar.gz"
+SRCURL[0]="https://www.libarchive.org/downloads/libarchive-${PKGVERSION}.tar.gz"
 
 #  Diese kloppskoepfe kuemmern sich einen dreck um so.versions
 #

From d81ef84d3b5e93ee049db72521f2b2905cc027b1 Mon Sep 17 00:00:00 2001
From: Paul Menzel <pmenzel@molgen.mpg.de>
Date: Tue, 6 Nov 2018 17:09:57 +0100
Subject: [PATCH 8/9] file-roller: Update version from 3.22.0 to 3.30.1

https://github.com/GNOME/file-roller/blob/master/NEWS
---
 file-roller.be0 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/file-roller.be0 b/file-roller.be0
index d1a8f050a..e7c38a5e9 100755
--- a/file-roller.be0
+++ b/file-roller.be0
@@ -1,6 +1,6 @@
 #!/usr/bin/env beesh
 
-# BEE_VERSION file-roller-3.22.0-1
+# BEE_VERSION file-roller-3.30.1-0
 
 SRCURL[0]="http://ftp.gnome.org/pub/gnome/sources/file-roller/${PKGVERSION[2]}/file-roller-${PKGVERSION}.tar.xz"
 
@@ -15,8 +15,8 @@ PATCHURL[0]=""
 #}
 
 mee_configure() {
-    bee_configure --disable-packagekit \
-                  --disable-static
+    bee_configure \
+        -Dpackagekit=false
 }
 
 #mee_build() {

From 44d2d8272e9779abc1c2b45fbfc3c7033483c84f Mon Sep 17 00:00:00 2001
From: Paul Menzel <pmenzel@molgen.mpg.de>
Date: Tue, 6 Nov 2018 18:15:51 +0100
Subject: [PATCH 9/9] file-roller: Securely download source archive over HTTPS

---
 file-roller.be0 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/file-roller.be0 b/file-roller.be0
index e7c38a5e9..9a302482f 100755
--- a/file-roller.be0
+++ b/file-roller.be0
@@ -2,7 +2,7 @@
 
 # BEE_VERSION file-roller-3.30.1-0
 
-SRCURL[0]="http://ftp.gnome.org/pub/gnome/sources/file-roller/${PKGVERSION[2]}/file-roller-${PKGVERSION}.tar.xz"
+SRCURL[0]="https://ftp.gnome.org/pub/gnome/sources/file-roller/${PKGVERSION[2]}/file-roller-${PKGVERSION}.tar.xz"
 
 PATCHURL[0]=""