From 23ad3a801107a92acdfcfbe2a0197fa3d39e789b Mon Sep 17 00:00:00 2001
From: Donald Buczek <buczek@molgen.mpg.de>
Date: Sat, 8 Dec 2018 19:39:42 +0100
Subject: [PATCH 1/2] krb5: Update version from 1.11.4 to 1.16.2

Before further experimentis with kerberization, we'd like to have the
latest and greatest version.

Convert to template, convert to versionless bee file, update version,
fix URL.

Also use --with-system-ed to prevent usage and installation of the error
table compile bundlet with MIT kerberos instead of removing the
installation from $D in mee_install.
---
 krb5-1.11.4-1.bee => krb5.be0 | 40 ++++++++++++-----------------------
 1 file changed, 13 insertions(+), 27 deletions(-)
 rename krb5-1.11.4-1.bee => krb5.be0 (70%)

diff --git a/krb5-1.11.4-1.bee b/krb5.be0
similarity index 70%
rename from krb5-1.11.4-1.bee
rename to krb5.be0
index aba3073f9..246d0535b 100755
--- a/krb5-1.11.4-1.bee
+++ b/krb5.be0
@@ -1,5 +1,7 @@
 #!/usr/bin/env beesh
 
+# BEE_VERSION krb5-1.16.2-0
+
 ## this file was created by bee init and should be executed to build a
 ## bee-package. (Additional hints are located at the end of this file.)
 
@@ -7,9 +9,7 @@
 ## The source URL(s) define the location of the sources that will be
 ## downloaded. Version variables may be used to simplify reuse of this bee-file.
 
-# SRCURL[0]="http://web.mit.edu/kerberos/dist/krb5/${PKGVERSION[2]}/krb5-${PKGVERSION}-signed.tar"
-
-SRCURL[0]="/src/mariux/download/krb5-${PKGVERSION}.tar.gz"
+SRCURL[0]="https://web.mit.edu/kerberos/dist/krb5/${PKGVERSION[2]}/krb5-${PKGVERSION}.tar.gz"
 
 ###############################################################################
 ## Add URLs/pathes to patch files to the PATCHURL array.
@@ -18,14 +18,8 @@ SRCURL[0]="/src/mariux/download/krb5-${PKGVERSION}.tar.gz"
 # PATCHURL+=()
 
 ###############################################################################
-## Add filename patterns to the EXCLUDE array of files that should not
-## be added to you package but may be present in the image directory.
-
-# EXCLUDE+=()
-
-###############################################################################
-## Uncomment the next statement, if the software may not be able to be build
-## outside the source directory and need to be build inside the source
+## Uncomment the next statement, if the software may not be able to be built
+## outside the source directory and needs to be built inside the source
 ## directory.
 
 # build_in_sourcedir
@@ -53,26 +47,18 @@ sourcesubdir_append src
 #    bee_patch "${@}"
 #}
 
-#mee_configure() {
-#    bee_configure 
-#}
+mee_configure() {
+    bee_configure \
+      --with-system-et
+}
 
 #mee_build() {
 #    bee_build
 #}
 
-mee_install() {
-    bee_install
-
-    for i in \
-        /usr/bin/compile_et \
-        /usr/lib/libcom_err.so \
-        /usr/share/et/et_c.awk \
-        /usr/share/et/et_h.awk \
-        /usr/share/man/man1/compile_et.1 ; do
-            start_cmd rm ${D}/${i}
-    done
-}
+#mee_install() {
+#    bee_install
+#}
 ## by default this may be 'make install DESTDIR="${D}"'
 
 ###############################################################################
@@ -82,7 +68,7 @@ mee_install() {
 ## The name of this bee-file should follow the following naming convention:
 ##     pkgname-pkgversion-pkgrevision.bee
 ##
-## You may remove all comments as long as SRCURL[0]="" is set.
+## You may remove all comments as long as SRCURL[0] is set.
 ##
 ## Everything in this file will be executed in a bash environment.
 ##

From 67c99a5e2249f8260149b3ccb005f275cda64a1e Mon Sep 17 00:00:00 2001
From: Donald Buczek <buczek@molgen.mpg.de>
Date: Sun, 9 Dec 2018 00:20:49 +0100
Subject: [PATCH 2/2] krb5: Use embeedded libverto

When we update krb5 the build system might find libverto in the system
from the previous installation, link agains it and does't include its
own library.

Now when we update krb5, we'd remove the revision with the embedded
library and install a revision, which uses the library but doesn't
include it:

  krb5kdc: error while loading shared libraries:
    libverto.so.0: cannot open shared object file: No such file or directory

Add configure flag --without-system-verto so that we use and install the
build in version of libverto.
---
 krb5.be0 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/krb5.be0 b/krb5.be0
index 246d0535b..f38eced35 100755
--- a/krb5.be0
+++ b/krb5.be0
@@ -49,7 +49,8 @@ sourcesubdir_append src
 
 mee_configure() {
     bee_configure \
-      --with-system-et
+      --with-system-et \
+      --without-system-verto
 }
 
 #mee_build() {