Re: UPDATE: databases/sqlcipher

On Mon, Nov 01, 2021 at 09:07:48AM +0100, Tim van der Molen wrote:
> Here is an update to sqlcipher 4.5.0. Announcement:
>
> https://www.zetetic.net/blog/2021/10/28/sqlcipher-4.5.0-release/
>
> OK?
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/databases/sqlcipher/Makefile,v
> retrieving revision 1.1.1.1
> diff -p -u -r1.1.1.1 Makefile
> --- Makefile 21 Mar 2021 12:04:26 -0000 1.1.1.1
> +++ Makefile 31 Oct 2021 20:25:59 -0000
> @@ -4,9 +4,9 @@ COMMENT = encrypted SQLite database
>
> GH_ACCOUNT = sqlcipher
> GH_PROJECT = sqlcipher
> -GH_TAGNAME = v4.4.3
> +GH_TAGNAME = v4.5.0
>
> -SHARED_LIBS += sqlcipher 0.0 # 8.6
> +SHARED_LIBS += sqlcipher 0.1 # 8.6
>
> CATEGORIES = databases
>
> @@ -16,7 +16,7 @@ MAINTAINER = Tom Murphy <openbsd@pertho.
> # PD and BSD
> PERMIT_PACKAGE = Yes
>
> -WANTLIB += c crypto curses pthread readline z
> +WANTLIB += c crypto curses m pthread readline z
>
> CONFIGURE_STYLE = gnu
>
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/databases/sqlcipher/distinfo,v
> retrieving revision 1.1.1.1
> diff -p -u -r1.1.1.1 distinfo
> --- distinfo 21 Mar 2021 12:04:26 -0000 1.1.1.1
> +++ distinfo 31 Oct 2021 20:25:59 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (sqlcipher-4.4.3.tar.gz) = uN9puZjAQs5/ipnwfPEfRd/r5REQ75LelfFyg1iFMTM=
> -SIZE (sqlcipher-4.4.3.tar.gz) = 17639967
> +SHA256 (sqlcipher-4.5.0.tar.gz) = IMRqhVxH1aChWf3KqEkex726pwanNO5SvHYYi5Ka+xQ=
> +SIZE (sqlcipher-4.5.0.tar.gz) = 17982431
> Index: patches/patch-configure
> ===================================================================
> RCS file: patches/patch-configure
> diff -N patches/patch-configure
> --- patches/patch-configure 21 Mar 2021 12:04:26 -0000 1.1.1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,50 +0,0 @@
> -$OpenBSD: patch-configure,v 1.1.1.1 2021/03/21 12:04:26 tim Exp $
> -
> -Fix bashisms. Should be fixed in next release.
> -
> -https://github.com/sqlcipher/sqlcipher/issues/382
> -
> -Index: configure
> ---- configure.orig
> -+++ configure
> -@@ -11997,14 +11997,14 @@ if test "$crypto_lib" = "none"; then
> - $as_echo "none" >&6; }
> - else
> - if test "$crypto_lib" = "commoncrypto"; then
> -- CFLAGS+=" -DSQLCIPHER_CRYPTO_CC"
> -- BUILD_CFLAGS+=" -DSQLCIPHER_CRYPTO_CC"
> -+ CFLAGS="$CFLAGS -DSQLCIPHER_CRYPTO_CC"
> -+ BUILD_CFLAGS="$BUILD_CFLAGS -DSQLCIPHER_CRYPTO_CC"
> - { $as_echo "$as_me:${as_lineno-$LINENO}: result: commoncrypto" >&5
> - $as_echo "commoncrypto" >&6; }
> - else
> - if test "$crypto_lib" = "libtomcrypt"; then
> -- CFLAGS+=" -DSQLCIPHER_CRYPTO_LIBTOMCRYPT"
> -- BUILD_CFLAGS+=" -DSQLCIPHER_CRYPTO_LIBTOMCRYPT"
> -+ CFLAGS="$CFLAGS -DSQLCIPHER_CRYPTO_LIBTOMCRYPT"
> -+ BUILD_CFLAGS="$BUILD_CFLAGS -DSQLCIPHER_CRYPTO_LIBTOMCRYPT"
> - { $as_echo "$as_me:${as_lineno-$LINENO}: result: libtomcrypt" >&5
> - $as_echo "libtomcrypt" >&6; }
> - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for register_cipher in -ltomcrypt" >&5
> -@@ -12056,8 +12056,8 @@ fi
> -
> - else
> - if test "$crypto_lib" = "nss"; then
> -- CFLAGS+=" -DSQLCIPHER_CRYPTO_NSS"
> -- BUILD_CFLAGS+=" -DSQLCIPHER_CRYPTO_NSS"
> -+ CFLAGS="$CFLAGS -DSQLCIPHER_CRYPTO_NSS"
> -+ BUILD_CFLAGS="$BUILD_CFLAGS -DSQLCIPHER_CRYPTO_NSS"
> - { $as_echo "$as_me:${as_lineno-$LINENO}: result: nss3" >&5
> - $as_echo "nss3" >&6; }
> - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PK11_Decrypt in -lnss3" >&5
> -@@ -12108,8 +12108,8 @@ else
> - fi
> -
> - else
> -- CFLAGS+=" -DSQLCIPHER_CRYPTO_OPENSSL"
> -- BUILD_CFLAGS+=" -DSQLCIPHER_CRYPTO_OPENSSL"
> -+ CFLAGS="$CFLAGS -DSQLCIPHER_CRYPTO_OPENSSL"
> -+ BUILD_CFLAGS="$BUILD_CFLAGS -DSQLCIPHER_CRYPTO_OPENSSL"
> - { $as_echo "$as_me:${as_lineno-$LINENO}: result: openssl" >&5
> - $as_echo "openssl" >&6; }
> - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for HMAC_Init_ex in -lcrypto" >&5
> Index: patches/patch-src_crypto_impl_c
> ===================================================================
> RCS file: patches/patch-src_crypto_impl_c
> diff -N patches/patch-src_crypto_impl_c
> --- patches/patch-src_crypto_impl_c 21 Mar 2021 12:04:26 -0000 1.1.1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,24 +0,0 @@
> -$OpenBSD: patch-src_crypto_impl_c,v 1.1.1.1 2021/03/21 12:04:26 tim Exp $
> -
> -Fix build with -DOMIT_MEMLOCK. Should be fixed in next release.
> -
> -https://github.com/sqlcipher/sqlcipher/issues/384
> -
> -Index: src/crypto_impl.c
> ---- src/crypto_impl.c.orig
> -+++ src/crypto_impl.c
> -@@ -35,10 +35,10 @@
> - #include "crypto.h"
> - #ifndef OMIT_MEMLOCK
> - #if defined(__unix__) || defined(__APPLE__) || defined(_AIX)
> --#include <errno.h>
> --#include <unistd.h>
> --#include <sys/resource.h>
> --#include <sys/mman.h>
> -+#include <errno.h> /* amalgamator: dontcache */
> -+#include <unistd.h> /* amalgamator: dontcache */
> -+#include <sys/resource.h> /* amalgamator: dontcache */
> -+#include <sys/mman.h> /* amalgamator: dontcache */
> - #elif defined(_WIN32)
> - #include <windows.h>
> -