From 6c33836cad42d4ec8b5dac52d2dd03dec95ef499 Mon Sep 17 00:00:00 2001 From: Lucio Andrés Illanes Albornoz Date: Dec 31 2019 10:52:20 +0000 Subject: vars/build.vars:less: updated to v551 (via Redfoxmoon.) vars/build.vars:openssh: updated to v8.1p1 (via Redfoxmoon.) vars/build.vars:weechat: updated to v2.7 (via Redfoxmoon.) patches/weechat-2.{4,7}.local.patch: via Redfoxmoon. --- diff --git a/patches/weechat-2.4.local.patch b/patches/weechat-2.4.local.patch deleted file mode 100644 index 2b08df5..0000000 --- a/patches/weechat-2.4.local.patch +++ /dev/null @@ -1,43 +0,0 @@ ---- weechat-2.1/configure.orig 2017-11-28 13:45:00.520000000 +0000 -+++ weechat-2.1/configure 2017-11-28 13:46:29.676000000 +0000 -@@ -22487,7 +22487,6 @@ - # pkg-config - # ------------------------------------------------------------------------------ - --PKGCONFIG="" - for ac_prog in pkg-config - do - # Extract the first word of "$ac_prog", so it can be a program name with args. -@@ -24277,8 +24276,8 @@ - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 - $as_echo "yes" >&6; } -- GCRYPT_CFLAGS=`libgcrypt-config --cflags` -- GCRYPT_LFLAGS=`libgcrypt-config --libs` -+ GCRYPT_CFLAGS=`$LIBGCRYPT_CONFIG --cflags` -+ GCRYPT_LFLAGS=`$LIBGCRYPT_CONFIG --libs` - - - fi -@@ -24355,8 +24354,8 @@ - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 - $as_echo "yes" >&6; } -- GNUTLS_CFLAGS=`pkg-config gnutls --cflags` -- GNUTLS_LFLAGS=`pkg-config gnutls --libs` -+ GNUTLS_CFLAGS=`$PKG_CONFIG gnutls --cflags` -+ GNUTLS_LFLAGS=`$PKG_CONFIG gnutls --libs` - - - $as_echo "#define HAVE_GNUTLS 1" >>confdefs.h -@@ -24567,8 +24566,8 @@ - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 - $as_echo "yes" >&6; } -- ZLIB_CFLAGS=`pkg-config zlib --cflags` -- ZLIB_LFLAGS=`pkg-config zlib --libs` -+ ZLIB_CFLAGS=`$PKG_CONFIG zlib --cflags` -+ ZLIB_LFLAGS=`$PKG_CONFIG zlib --libs` - - - fi diff --git a/patches/weechat-2.7.local.patch b/patches/weechat-2.7.local.patch new file mode 100644 index 0000000..2b08df5 --- /dev/null +++ b/patches/weechat-2.7.local.patch @@ -0,0 +1,43 @@ +--- weechat-2.1/configure.orig 2017-11-28 13:45:00.520000000 +0000 ++++ weechat-2.1/configure 2017-11-28 13:46:29.676000000 +0000 +@@ -22487,7 +22487,6 @@ + # pkg-config + # ------------------------------------------------------------------------------ + +-PKGCONFIG="" + for ac_prog in pkg-config + do + # Extract the first word of "$ac_prog", so it can be a program name with args. +@@ -24277,8 +24276,8 @@ + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } +- GCRYPT_CFLAGS=`libgcrypt-config --cflags` +- GCRYPT_LFLAGS=`libgcrypt-config --libs` ++ GCRYPT_CFLAGS=`$LIBGCRYPT_CONFIG --cflags` ++ GCRYPT_LFLAGS=`$LIBGCRYPT_CONFIG --libs` + + + fi +@@ -24355,8 +24354,8 @@ + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } +- GNUTLS_CFLAGS=`pkg-config gnutls --cflags` +- GNUTLS_LFLAGS=`pkg-config gnutls --libs` ++ GNUTLS_CFLAGS=`$PKG_CONFIG gnutls --cflags` ++ GNUTLS_LFLAGS=`$PKG_CONFIG gnutls --libs` + + + $as_echo "#define HAVE_GNUTLS 1" >>confdefs.h +@@ -24567,8 +24566,8 @@ + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } +- ZLIB_CFLAGS=`pkg-config zlib --cflags` +- ZLIB_LFLAGS=`pkg-config zlib --libs` ++ ZLIB_CFLAGS=`$PKG_CONFIG zlib --cflags` ++ ZLIB_LFLAGS=`$PKG_CONFIG zlib --libs` + + + fi diff --git a/vars/build.vars b/vars/build.vars index 8ef09f3..9862d17 100644 --- a/vars/build.vars +++ b/vars/build.vars @@ -1657,8 +1657,8 @@ fi; : ${PKG_JOHN_IN_TREE:=1}; : ${PKG_JOHN_INSTALL_FILES:="../john-${PKG_JOHN_VERSION}/run/john=bin/ ../john-${PKG_JOHN_VERSION}/run/mailer=bin/ ../john-${PKG_JOHN_VERSION}/run/makechr=bin/ ../john-${PKG_JOHN_VERSION}/run/relbench=bin/ ../john-${PKG_JOHN_VERSION}/run/unafs=bin/ ../john-${PKG_JOHN_VERSION}/run/unique=bin/ ../john-${PKG_JOHN_VERSION}/run/unshadow=bin/ /=share/john ../john-${PKG_JOHN_VERSION}/run/ascii.chr=share/john/ ../john-${PKG_JOHN_VERSION}/run/digits.chr=share/john/ ../john-${PKG_JOHN_VERSION}/run/john.conf=share/john/ ../john-${PKG_JOHN_VERSION}/run/lm_ascii.chr=share/john/ ../john-${PKG_JOHN_VERSION}/run/password.lst=share/john/"}; : ${PKG_JOHN_MAKEFLAGS_BUILD_EXTRA:="-C src midipix-x86-64"}; -: ${PKG_LESS_SHA256SUM:=503f91ab0af4846f34f0444ab71c4b286123f0044a4964f1ae781486c617f2e2}; -: ${PKG_LESS_VERSION:=530}; +: ${PKG_LESS_SHA256SUM:=ff165275859381a63f19135a8f1f6c5a194d53ec3187f94121ecd8ef0795fe3d}; +: ${PKG_LESS_VERSION:=551}; : ${PKG_LESS_URL:=http://www.greenwoodsoftware.com/less/less-${PKG_LESS_VERSION}.tar.gz}; : ${PKG_LIBREDWG_SHA256SUM:=954f74753860315eb313a3bbb83bf7e5ad03e84bd10408cc629ff2e4e4b3fd46}; : ${PKG_LIBREDWG_VERSION:=0.9}; @@ -1870,8 +1870,8 @@ mailutils mtr mutt microsocks nginx openlitespeed openssh pacman rsync socat tht : ${PKG_OPENLITESPEED_DISABLED:=1}; : ${PKG_OPENLITESPEED_MAKEFLAGS_BUILD:=-j1}; : ${PKG_OPENLITESPEED_PREFIX:=${PREFIX_NATIVE}/lsws}; -: ${PKG_OPENSSH_SHA256SUM:=bd943879e69498e8031eb6b7f44d08cdc37d59a7ab689aa0b437320c3481fd68}; -: ${PKG_OPENSSH_VERSION:=8.0p1}; +: ${PKG_OPENSSH_SHA256SUM:=02f5dbef3835d0753556f973cd57b4c19b6b1f6cd24c03445e23ac77ca1b93ff}; +: ${PKG_OPENSSH_VERSION:=8.1p1}; : ${PKG_OPENSSH_URL:=http://artfiles.org/openbsd/OpenSSH/portable/openssh-${PKG_OPENSSH_VERSION}.tar.gz}; : ${PKG_OPENSSH_DEBUG_CONFIGURE_ARGS_EXTRA:=--disable-strip}; : ${PKG_OPENSSH_INSTALL_TARGET:=install-nokeys}; @@ -1895,8 +1895,8 @@ mailutils mtr mutt microsocks nginx openlitespeed openssh pacman rsync socat tht : ${PKG_THTTPD_IN_TREE:=1}; : ${PKG_THTTPD_MAKE_INSTALL_VNAME:=prefix}; : ${PKG_THTTPD_MAKEFLAGS_BUILD_EXTRA:=-j1}; -: ${PKG_WEECHAT_SHA256SUM:=963fecddf55c4c8d6c96938d1a907e448679817706e7d20bc6af24797085a74c}; -: ${PKG_WEECHAT_VERSION:=2.4}; +: ${PKG_WEECHAT_SHA256SUM:=5038a47c6e87e56fcd937acc159d89f76845a4128923c100700abaa7c5db7aed}; +: ${PKG_WEECHAT_VERSION:=2.7}; : ${PKG_WEECHAT_URL:=https://weechat.org/files/src/weechat-${PKG_WEECHAT_VERSION}.tar.gz}; : ${PKG_WEECHAT_CONFIGURE_ARGS_EXTRA:="--disable-aspell --disable-guile --disable-javascript --disable-lua --disable-perl --disable-python --disable-ruby --disable-tcl"}; : ${PKG_WEECHAT_LDFLAGS_CONFIGURE_EXTRA:="-Wl,--as-needed -ltinfow -Wl,--no-as-needed"};