March 2019 - crux-commits

ports/opt (3.5): thunderbird-bin: updated to 60.6.1
by crux＠crux.nu 25 Mar '19

25 Mar '19

commit 0ac2fe4e48e74226f6d5eb81734c256fdc7665d5 Author: Fredrik Rinnestam <fredrik(a)crux.nu> Date: Mon Mar 25 20:43:36 2019 +0100 thunderbird-bin: updated to 60.6.1 diff --git a/thunderbird-bin/.signature b/thunderbird-bin/.signature index 987731347..ee2b2d8cf 100644 --- a/thunderbird-bin/.signature +++ b/thunderbird-bin/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/SwXDQ1k4owfA3Oquw3cCsKHashts05cNfzv6f+oiitLmzpB4W/z1p1aOCTKHZQVMaY006xRks+Owny2eM38xgk= -SHA256 (Pkgfile) = 47135b35ecdffc2af05c4908e316680c8c9d67146f76a3b6fbc044b7919e6f04 +RWSE3ohX2g5d/ZmTrQ9kXa1qnYB4+x7Piwg4NTm+7tRW7pN021+iM2jObirCKFATVBehwA6nC6MpvutI3aEFSDTNdeynkZM5VwY= +SHA256 (Pkgfile) = cfc1d1044dcde644210adc271a628bfeb021efb25e2d828f269fc261757d5f07 SHA256 (.footprint) = 1fedb65da9712fdc6f4f8a6d54fd71d22d58ce881022492f5d647d71a052351e -SHA256 (thunderbird-60.6.0.tar.bz2) = 29f4d09e67e750111c09476a8dd3d4681b54694cdf24f80f098f40c1beccd092 +SHA256 (thunderbird-60.6.1.tar.bz2) = d2eb057c50f096314453a34cb0645a057ee8be0e045d89ec02455284739b0ad0 diff --git a/thunderbird-bin/Pkgfile b/thunderbird-bin/Pkgfile index 1908e2a78..2c65b5c86 100644 --- a/thunderbird-bin/Pkgfile +++ b/thunderbird-bin/Pkgfile @@ -4,8 +4,8 @@ # Depends on: gtk3, dbus-glib name=thunderbird-bin -version=60.6.0 -release=2 +version=60.6.1 +release=1 source=(http://ftp.mozilla.org/pub/thunderbird/releases/$version/linux-x86_… build() {

1 0

ports/opt (3.5): freerdp: fix dependencies, build with newer ffmpeg
by crux＠crux.nu 25 Mar '19

25 Mar '19

commit 6d16b98a9cab97fb2dffd6a6df22f079ff614013 Author: Alan Mizrahi <alan+crux(a)mizrahi.com.ve> Date: Tue Mar 26 03:53:56 2019 +0900 freerdp: fix dependencies, build with newer ffmpeg diff --git a/freerdp/.signature b/freerdp/.signature index 0d6217039..cc6e8e108 100644 --- a/freerdp/.signature +++ b/freerdp/.signature @@ -1,6 +1,6 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/bBOrB9E0hj+3Z1ofYrSU8gHit0dUHAzvEEo0xB8vva5lBADZ3UvpWOSweMsB+doke8lcQu/bO2biBVfYzNV/A8= -SHA256 (Pkgfile) = ada0c4b97a79ca5378c75b3608f004764bac6e360c4d8232c32a6968037c70d9 +RWSE3ohX2g5d/fnCDMGQLrJGZftVx6djQI6OHSHyWeJx6+01y3fv+eAEtBwVnAVxEcNzBS4fO87nc6H35VzC5qubm3VjOoze2Ao= +SHA256 (Pkgfile) = aa6313ab07a0baed029b491b801e4262f00cf52982e78cdf68d81bd71d09f63c SHA256 (.footprint) = 403f893c0b2f2d9ae8ee84962779d0a786ae9a2ee89916a58bf3f134f88054bf SHA256 (freerdp-1.0.2.tar.gz) = d519f2dca794366a15825b8c9f751dfd06018fd4fa3890840f3f6c6e0bcfe9d5 SHA256 (ffmpeg.patch) = b144699f853d757344470555ac029e3e93c68104595734ba66871986ca449be9 diff --git a/freerdp/Pkgfile b/freerdp/Pkgfile index e62253a2e..789eb4783 100644 --- a/freerdp/Pkgfile +++ b/freerdp/Pkgfile @@ -1,7 +1,7 @@ # Description: Remote desktop protocol implementation # URL: http://www.freerdp.com/ # Maintainer: Alan Mizrahi, alan at mizrahi dot com dot ve -# Depends on: xorg-libx11 xorg-libxrender xorg-libxcursor xorg-libxext +# Depends on: cmake xorg-libx11 xorg-libxrender xorg-libxcursor xorg-libxext # Optional: ffmpeg alsa-lib cups directfb neon pulseaudio xmlto name=freerdp @@ -11,7 +11,12 @@ source=(http://pub.freerdp.com/releases/freerdp-$version.tar.gz ffmpeg.patch) build() { # fix build with different versions of ffmpeg - patch -p1 -i $SRC/ffmpeg.patch -d $name-$version + patch -p0 -i $SRC/ffmpeg.patch + + # fix for even newer ffmpeg + sed -ri \ + 's/([^a-zA-Z_+])(CODEC_CAP_TRUNCATED|CODEC_FLAG_TRUNCATED|CODEC_FLAG_LOOP_FILTER)/\1AV_\2/g' \ + $name-$version/channels/drdynvc/tsmf/ffmpeg/tsmf_ffmpeg.c mkdir build; cd build @@ -20,6 +25,11 @@ build() { -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_SKIP_RPATH=ON \ -DWITH_PULSEAUDIO=$([ -f /usr/include/pulse/pulseaudio.h ] && echo "ON" || echo "OFF") \ + -DWITH_CUPS=$([ -f /usr/include/cups/cups.h ] && echo "ON" || echo "OFF") \ + -DWITH_ALSA=$([ -f /usr/include/alsa/version.h ] && echo "ON" || echo "OFF") \ + -DWITH_FFMPEG=$([ -f /usr/include/libavcodec/avcodec.h ] && echo "ON" || echo "OFF") \ + -DWITH_SSE2=$(grep -q '\bsse2\b' /proc/cpuinfo && echo ON || echo OFF) \ + -DWITH_SSE2_TARGET=$(grep -q '\bsse2\b' /proc/cpuinfo && echo ON || echo OFF) \ -DWITH_SERVER=OFF \ -DWITH_CLIENT=ON make

1 0

ports/opt (3.5): nano: update to 4.0
by crux＠crux.nu 25 Mar '19

25 Mar '19

commit 0417d01337fd16cce788e4fd85952e268435ffc7 Author: Juergen Daubert <jue(a)jue.li> Date: Mon Mar 25 13:18:21 2019 +0100 nano: update to 4.0 diff --git a/nano/.signature b/nano/.signature index 38d612240..f5f39cb12 100644 --- a/nano/.signature +++ b/nano/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/WpwZ0QCr0SmDo8W5V/fwqkZh7eLFmY9lOH61MAj37lbI/SdHrAP+cNC1+88R81ZRUWXE91v1gElmB0EsTIN2wE= -SHA256 (Pkgfile) = bb93f914ef51c2db2798ef52cdf1c89bd84cd8f6e5b809dde097e4e1e083b3a4 +RWSE3ohX2g5d/ZzQ2frV0yAhOv0U34G3EWiRJhFT2hB+VI7t0CIDptkUF3huS2Olb0xX6rCEuDfKJp5chMsLf2VYGYUvp7MSFwY= +SHA256 (Pkgfile) = 94ef2a8ce3f88ca7b15064f7fb41deb24b34f304f4c4e46f32980b455c90fe97 SHA256 (.footprint) = 6e65065e8bbaadfad31d89a3ec1820c7408848209b67edc34c5d1643df89ac1e -SHA256 (nano-3.2.tar.xz) = d12773af3589994b2e4982c5792b07c6240da5b86c5aef2103ab13b401fe6349 +SHA256 (nano-4.0.tar.xz) = 1e2fcfea35784624a7d86785768b772d58bb3995d1aec9176a27a113b1e9bac3 diff --git a/nano/Pkgfile b/nano/Pkgfile index d35f478c1..6e39f5eef 100644 --- a/nano/Pkgfile +++ b/nano/Pkgfile @@ -5,7 +5,7 @@ # Depends on: file ncurses name=nano -version=3.2 +version=4.0 release=1 source=(http://www.nano-editor.org/dist/v${version%.*}/$name-$version.tar.x…

1 0

ports/opt (3.5): dropbear: add patch to fix regression where TTY modes weren't reset
by crux＠crux.nu 25 Mar '19

25 Mar '19

commit 9da27ccc27f74f940b4c3bbc88bdaa346449b301 Author: Juergen Daubert <jue(a)jue.li> Date: Mon Mar 25 13:17:34 2019 +0100 dropbear: add patch to fix regression where TTY modes weren't reset diff --git a/dropbear/.signature b/dropbear/.signature index 26581ff7c..74630d0a4 100644 --- a/dropbear/.signature +++ b/dropbear/.signature @@ -1,6 +1,7 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/bmUi4dEvvHreEEmnrNqHfVnQz/fylF4X1PWxRg+PcNmfkvY+Ec8RrBbXFy9lXnF97Rjl1cJ/ALhYPh2h8kReQc= -SHA256 (Pkgfile) = 97d2294889f187b318f337da97af42e0efbd970269ceaedd429946e1d0cb988f +RWSE3ohX2g5d/eP8G/FELsWyMIunkv/sWCi+4YXZ1qk+d1JHRy9P786fn+XiXH3AZTp3zFoeW48uBKgVQtTC09r7EKbdAVjSLwA= +SHA256 (Pkgfile) = 55e5e63211fa11393a7388c75313f31a28a0e48745392a4af26330937b9633f5 SHA256 (.footprint) = 62bfe7191a20fcd5f6ec3511c951dee47aefdae734f7d616302e6bfc3a0c1923 SHA256 (dropbear-2019.77.tar.bz2) = d91f78ebe633be1d071fd1b7e5535b9693794048b019e9f4bea257e1992b458d SHA256 (dropbear) = def8d4ebda5759a3bc55055957235fa47f7e40216badf07830f487f05e7fbd42 +SHA256 (reset-tty-modes.patch) = 2fd8beca361dc5859fa996a28651c4748bd741c763587d828ede0ea634af0ed2 diff --git a/dropbear/Pkgfile b/dropbear/Pkgfile index ee2b15df4..5ba3b22e6 100644 --- a/dropbear/Pkgfile +++ b/dropbear/Pkgfile @@ -7,11 +7,13 @@ name=dropbear version=2019.77 release=2 source=(http://matt.ucc.asn.au/$name/releases/$name-$version.tar.bz2 \ - $name) + $name reset-tty-modes.patch) build () { cd $name-$version + patch -p1 -i $SRC/reset-tty-modes.patch + echo '#define SFTPSERVER_PATH "/usr/lib/ssh/sftp-server"' > localoptions.h ./configure --prefix=/usr diff --git a/dropbear/reset-tty-modes.patch b/dropbear/reset-tty-modes.patch new file mode 100644 index 000000000..cd2f086a5 --- /dev/null +++ b/dropbear/reset-tty-modes.patch @@ -0,0 +1,51 @@ + +# HG changeset patch +# User Matt Johnston <matt(a)ucc.asn.au> +# Date 1553431262 -28800 +# Node ID 4b01f4826a29a2837e971197d4f72b7cb376745a +# Parent 48c6e54f7281aaf89fbc8b2b99ca4a9cd62969af +Fix regression where TTY modes weren't reset for client + +diff -r 48c6e54f7281 -r 4b01f4826a29 cli-chansession.c +--- a/cli-chansession.c Sat Mar 23 21:54:23 2019 +0800 ++++ b/cli-chansession.c Sun Mar 24 20:41:02 2019 +0800 +@@ -35,7 +35,7 @@ + #include "chansession.h" + #include "agentfwd.h" + +-static void cli_cleanupchansess(const struct Channel *channel); ++static void cli_closechansess(const struct Channel *channel); + static int cli_initchansess(struct Channel *channel); + static void cli_chansessreq(struct Channel *channel); + static void send_chansess_pty_req(const struct Channel *channel); +@@ -51,8 +51,8 @@ + cli_initchansess, /* inithandler */ + NULL, /* checkclosehandler */ + cli_chansessreq, /* reqhandler */ +- NULL, /* closehandler */ +- cli_cleanupchansess, /* cleanup */ ++ cli_closechansess, /* closehandler */ ++ NULL, /* cleanup */ + }; + + static void cli_chansessreq(struct Channel *channel) { +@@ -84,7 +84,7 @@ + + + /* If the main session goes, we close it up */ +-static void cli_cleanupchansess(const struct Channel *UNUSED(channel)) { ++static void cli_closechansess(const struct Channel *UNUSED(channel)) { + cli_tty_cleanup(); /* Restore tty modes etc */ + + /* This channel hasn't gone yet, so we have > 1 */ +@@ -388,8 +388,8 @@ + cli_init_netcat, /* inithandler */ + NULL, + NULL, ++ cli_closechansess, + NULL, +- cli_cleanupchansess + }; + + void cli_send_netcat_request() { +

1 0

ports/opt (3.5): libaio: update to 0.3.112
by crux＠crux.nu 25 Mar '19

25 Mar '19

commit 8dd198debeb067c0011a709a0cad56d593aa40fd Author: Juergen Daubert <jue(a)jue.li> Date: Sun Mar 24 11:41:12 2019 +0100 libaio: update to 0.3.112 diff --git a/libaio/.signature b/libaio/.signature index 35de303f4..2df89d228 100644 --- a/libaio/.signature +++ b/libaio/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/XTnFO0iL69tFlQU2GamsBdyWqB4+6IcabYiWYJNwh+XtypAWbKQI3t4TGBauohmNNJHVTRrcVJOKSjyDXqyoAM= -SHA256 (Pkgfile) = e06bdc73c2ee992a35eb8f56bfd1497d4154f65d490de9bfc5ffcec4d0a66de8 +RWSE3ohX2g5d/VFx2HP81DXmOMawdj4W0bGdcRJ50/tai7D/lN4W+T9cGzj9TtNy1aPoMBl4wwZlUc/sj87hfo6jhg7jI23xuQI= +SHA256 (Pkgfile) = fb3c56cd99ddbc5fe03937b27c3bcce1b7b52977479e1eb8ad0ba8843a5d5786 SHA256 (.footprint) = 3bae7380ca6a1df19da1fb9cb47ebd0ebecb88221115e67f35fba1c491e83776 -SHA256 (libaio_0.3.111.orig.tar.gz) = 62cf871ad8fd09eb3418f00aca7a7d449299b8e1de31c65f28bf6a2ef1fa502a +SHA256 (libaio_0.3.112.orig.tar.xz) = f69e5800425f4ea957426693ac09f9896bb993db5490fa021644454adcc72a32 diff --git a/libaio/Pkgfile b/libaio/Pkgfile index 7638385ce..1aa0c9cf5 100644 --- a/libaio/Pkgfile +++ b/libaio/Pkgfile @@ -3,9 +3,9 @@ # Maintainer: Juergen Daubert, jue at crux dot nu name=libaio -version=0.3.111 -release=2 -source=(http://http.debian.net/debian/pool/main/liba/$name/${name}_${version}.orig.tar.gz) +version=0.3.112 +release=1 +source=(http://http.debian.net/debian/pool/main/liba/$name/${name}_${version}.orig.tar.xz) build() { cd $name-$version

1 0

ports/opt (3.5): dropbear: update to 2019.77
by crux＠crux.nu 25 Mar '19

25 Mar '19

commit 5e64ca7110665511fbe3ab69de3a9861ed4acec5 Author: Juergen Daubert <jue(a)jue.li> Date: Sun Mar 24 11:35:46 2019 +0100 dropbear: update to 2019.77 diff --git a/dropbear/.signature b/dropbear/.signature index 704c6c267..26581ff7c 100644 --- a/dropbear/.signature +++ b/dropbear/.signature @@ -1,7 +1,6 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/fYoSjOlXrVgdVZjSJWCm9ISaxGKVH365kFEj0OWUVRz5fTnuy3CfkroLhr8DzWaVMFqavELeCW0PE2EXJhHpwc= -SHA256 (Pkgfile) = 6e5947b4c0a75449ab2677121757588e436f4420278b90f2427ddf43f2a338f2 +RWSE3ohX2g5d/bmUi4dEvvHreEEmnrNqHfVnQz/fylF4X1PWxRg+PcNmfkvY+Ec8RrBbXFy9lXnF97Rjl1cJ/ALhYPh2h8kReQc= +SHA256 (Pkgfile) = 97d2294889f187b318f337da97af42e0efbd970269ceaedd429946e1d0cb988f SHA256 (.footprint) = 62bfe7191a20fcd5f6ec3511c951dee47aefdae734f7d616302e6bfc3a0c1923 -SHA256 (dropbear-2018.76.tar.bz2) = f2fb9167eca8cf93456a5fc1d4faf709902a3ab70dd44e352f3acbc3ffdaea65 +SHA256 (dropbear-2019.77.tar.bz2) = d91f78ebe633be1d071fd1b7e5535b9693794048b019e9f4bea257e1992b458d SHA256 (dropbear) = def8d4ebda5759a3bc55055957235fa47f7e40216badf07830f487f05e7fbd42 -SHA256 (CVE-2018-15599.diff) = 42b5720cf6c888638cfb84fdd862fc0d323b2e023cbe5f9ccdaa2e0c35b6873e diff --git a/dropbear/CVE-2018-15599.diff b/dropbear/CVE-2018-15599.diff deleted file mode 100644 index 963ed35bb..000000000 --- a/dropbear/CVE-2018-15599.diff +++ /dev/null @@ -1,222 +0,0 @@ - -# HG changeset patch -# User Matt Johnston <matt(a)ucc.asn.au> -# Date 1535038992 -28800 -# Node ID 5d2d1021ca0006337af58859c861f2349715b73b -# Parent cd23631dab5c653c66fe697e24f026aefbfcecb3 -Wait to fail invalid usernames - -diff -r cd23631dab5c -r 5d2d1021ca00 auth.h ---- a/auth.h Thu Aug 23 22:10:07 2018 +0800 -+++ b/auth.h Thu Aug 23 23:43:12 2018 +0800 -@@ -37,9 +37,9 @@ - void send_msg_userauth_failure(int partial, int incrfail); - void send_msg_userauth_success(void); - void send_msg_userauth_banner(const buffer *msg); --void svr_auth_password(void); --void svr_auth_pubkey(void); --void svr_auth_pam(void); -+void svr_auth_password(int valid_user); -+void svr_auth_pubkey(int valid_user); -+void svr_auth_pam(int valid_user); - - #if DROPBEAR_SVR_PUBKEY_OPTIONS_BUILT - int svr_pubkey_allows_agentfwd(void); -diff -r cd23631dab5c -r 5d2d1021ca00 svr-auth.c ---- a/svr-auth.c Thu Aug 23 22:10:07 2018 +0800 -+++ b/svr-auth.c Thu Aug 23 23:43:12 2018 +0800 -@@ -149,10 +149,8 @@ - if (methodlen == AUTH_METHOD_PASSWORD_LEN && - strncmp(methodname, AUTH_METHOD_PASSWORD, - AUTH_METHOD_PASSWORD_LEN) == 0) { -- if (valid_user) { -- svr_auth_password(); -- goto out; -- } -+ svr_auth_password(valid_user); -+ goto out; - } - } - #endif -@@ -164,10 +162,8 @@ - if (methodlen == AUTH_METHOD_PASSWORD_LEN && - strncmp(methodname, AUTH_METHOD_PASSWORD, - AUTH_METHOD_PASSWORD_LEN) == 0) { -- if (valid_user) { -- svr_auth_pam(); -- goto out; -- } -+ svr_auth_pam(valid_user); -+ goto out; - } - } - #endif -@@ -177,12 +173,7 @@ - if (methodlen == AUTH_METHOD_PUBKEY_LEN && - strncmp(methodname, AUTH_METHOD_PUBKEY, - AUTH_METHOD_PUBKEY_LEN) == 0) { -- if (valid_user) { -- svr_auth_pubkey(); -- } else { -- /* pubkey has no failure delay */ -- send_msg_userauth_failure(0, 0); -- } -+ svr_auth_pubkey(valid_user); - goto out; - } - #endif -diff -r cd23631dab5c -r 5d2d1021ca00 svr-authpam.c ---- a/svr-authpam.c Thu Aug 23 22:10:07 2018 +0800 -+++ b/svr-authpam.c Thu Aug 23 23:43:12 2018 +0800 -@@ -178,13 +178,14 @@ - * Keyboard interactive would be a lot nicer, but since PAM is synchronous, it - * gets very messy trying to send the interactive challenges, and read the - * interactive responses, over the network. */ --void svr_auth_pam() { -+void svr_auth_pam(int valid_user) { - - struct UserDataS userData = {NULL, NULL}; - struct pam_conv pamConv = { - pamConvFunc, - &userData /* submitted to pamvConvFunc as appdata_ptr */ - }; -+ const char* printable_user = NULL; - - pam_handle_t* pamHandlep = NULL; - -@@ -204,12 +205,23 @@ - - password = buf_getstring(ses.payload, &passwordlen); - -+ /* We run the PAM conversation regardless of whether the username is valid -+ in case the conversation function has an inherent delay. -+ Use ses.authstate.username rather than ses.authstate.pw_name. -+ After PAM succeeds we then check the valid_user flag too */ -+ - /* used to pass data to the PAM conversation function - don't bother with - * strdup() etc since these are touched only by our own conversation - * function (above) which takes care of it */ -- userData.user = ses.authstate.pw_name; -+ userData.user = ses.authstate.username; - userData.passwd = password; - -+ if (ses.authstate.pw_name) { -+ printable_user = ses.authstate.pw_name; -+ } else { -+ printable_user = "<invalid username>"; -+ } -+ - /* Init pam */ - if ((rc = pam_start("sshd", NULL, &pamConv, &pamHandlep)) != PAM_SUCCESS) { - dropbear_log(LOG_WARNING, "pam_start() failed, rc=%d, %s", -@@ -242,7 +254,7 @@ - rc, pam_strerror(pamHandlep, rc)); - dropbear_log(LOG_WARNING, - "Bad PAM password attempt for '%s' from %s", -- ses.authstate.pw_name, -+ printable_user, - svr_ses.addrstring); - send_msg_userauth_failure(0, 1); - goto cleanup; -@@ -253,12 +265,18 @@ - rc, pam_strerror(pamHandlep, rc)); - dropbear_log(LOG_WARNING, - "Bad PAM password attempt for '%s' from %s", -- ses.authstate.pw_name, -+ printable_user, - svr_ses.addrstring); - send_msg_userauth_failure(0, 1); - goto cleanup; - } - -+ if (!valid_user) { -+ /* PAM auth succeeded but the username isn't allowed in for another reason -+ (checkusername() failed) */ -+ send_msg_userauth_failure(0, 1); -+ } -+ - /* successful authentication */ - dropbear_log(LOG_NOTICE, "PAM password auth succeeded for '%s' from %s", - ses.authstate.pw_name, -diff -r cd23631dab5c -r 5d2d1021ca00 svr-authpasswd.c ---- a/svr-authpasswd.c Thu Aug 23 22:10:07 2018 +0800 -+++ b/svr-authpasswd.c Thu Aug 23 23:43:12 2018 +0800 -@@ -48,22 +48,14 @@ - - /* Process a password auth request, sending success or failure messages as - * appropriate */ --void svr_auth_password() { -+void svr_auth_password(int valid_user) { - - char * passwdcrypt = NULL; /* the crypt from /etc/passwd or /etc/shadow */ - char * testcrypt = NULL; /* crypt generated from the user's password sent */ -- char * password; -+ char * password = NULL; - unsigned int passwordlen; -- - unsigned int changepw; - -- passwdcrypt = ses.authstate.pw_passwd; -- --#ifdef DEBUG_HACKCRYPT -- /* debugging crypt for non-root testing with shadows */ -- passwdcrypt = DEBUG_HACKCRYPT; --#endif -- - /* check if client wants to change password */ - changepw = buf_getbool(ses.payload); - if (changepw) { -@@ -73,12 +65,21 @@ - } - - password = buf_getstring(ses.payload, &passwordlen); -- -- /* the first bytes of passwdcrypt are the salt */ -- testcrypt = crypt(password, passwdcrypt); -+ if (valid_user) { -+ /* the first bytes of passwdcrypt are the salt */ -+ passwdcrypt = ses.authstate.pw_passwd; -+ testcrypt = crypt(password, passwdcrypt); -+ } - m_burn(password, passwordlen); - m_free(password); - -+ /* After we have got the payload contents we can exit if the username -+ is invalid. Invalid users have already been logged. */ -+ if (!valid_user) { -+ send_msg_userauth_failure(0, 1); -+ return; -+ } -+ - if (testcrypt == NULL) { - /* crypt() with an invalid salt like "!!" */ - dropbear_log(LOG_WARNING, "User account '%s' is locked", -diff -r cd23631dab5c -r 5d2d1021ca00 svr-authpubkey.c ---- a/svr-authpubkey.c Thu Aug 23 22:10:07 2018 +0800 -+++ b/svr-authpubkey.c Thu Aug 23 23:43:12 2018 +0800 -@@ -79,7 +79,7 @@ - - /* process a pubkey auth request, sending success or failure message as - * appropriate */ --void svr_auth_pubkey() { -+void svr_auth_pubkey(int valid_user) { - - unsigned char testkey; /* whether we're just checking if a key is usable */ - char* algo = NULL; /* pubkey algo */ -@@ -102,6 +102,15 @@ - keybloblen = buf_getint(ses.payload); - keyblob = buf_getptr(ses.payload, keybloblen); - -+ if (!valid_user) { -+ /* Return failure once we have read the contents of the packet -+ required to validate a public key. -+ Avoids blind user enumeration though it isn't possible to prevent -+ testing for user existence if the public key is known */ -+ send_msg_userauth_failure(0, 0); -+ goto out; -+ } -+ - /* check if the key is valid */ - if (checkpubkey(algo, algolen, keyblob, keybloblen) == DROPBEAR_FAILURE) { - send_msg_userauth_failure(0, 0); - diff --git a/dropbear/Pkgfile b/dropbear/Pkgfile index 2315df8f0..ee2b15df4 100644 --- a/dropbear/Pkgfile +++ b/dropbear/Pkgfile @@ -4,16 +4,14 @@ # Depends on: zlib name=dropbear -version=2018.76 +version=2019.77 release=2 source=(http://matt.ucc.asn.au/$name/releases/$name-$version.tar.bz2 \ - $name CVE-2018-15599.diff) + $name) build () { cd $name-$version - patch -p1 -i $SRC/CVE-2018-15599.diff - echo '#define SFTPSERVER_PATH "/usr/lib/ssh/sftp-server"' > localoptions.h ./configure --prefix=/usr

1 0

ports/opt (3.4): thunderbird-bin: updated to 60.6.1
by crux＠crux.nu 25 Mar '19

25 Mar '19

commit 0ac2fe4e48e74226f6d5eb81734c256fdc7665d5 Author: Fredrik Rinnestam <fredrik(a)crux.nu> Date: Mon Mar 25 20:43:36 2019 +0100 thunderbird-bin: updated to 60.6.1 diff --git a/thunderbird-bin/.signature b/thunderbird-bin/.signature index 987731347..ee2b2d8cf 100644 --- a/thunderbird-bin/.signature +++ b/thunderbird-bin/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/SwXDQ1k4owfA3Oquw3cCsKHashts05cNfzv6f+oiitLmzpB4W/z1p1aOCTKHZQVMaY006xRks+Owny2eM38xgk= -SHA256 (Pkgfile) = 47135b35ecdffc2af05c4908e316680c8c9d67146f76a3b6fbc044b7919e6f04 +RWSE3ohX2g5d/ZmTrQ9kXa1qnYB4+x7Piwg4NTm+7tRW7pN021+iM2jObirCKFATVBehwA6nC6MpvutI3aEFSDTNdeynkZM5VwY= +SHA256 (Pkgfile) = cfc1d1044dcde644210adc271a628bfeb021efb25e2d828f269fc261757d5f07 SHA256 (.footprint) = 1fedb65da9712fdc6f4f8a6d54fd71d22d58ce881022492f5d647d71a052351e -SHA256 (thunderbird-60.6.0.tar.bz2) = 29f4d09e67e750111c09476a8dd3d4681b54694cdf24f80f098f40c1beccd092 +SHA256 (thunderbird-60.6.1.tar.bz2) = d2eb057c50f096314453a34cb0645a057ee8be0e045d89ec02455284739b0ad0 diff --git a/thunderbird-bin/Pkgfile b/thunderbird-bin/Pkgfile index 1908e2a78..2c65b5c86 100644 --- a/thunderbird-bin/Pkgfile +++ b/thunderbird-bin/Pkgfile @@ -4,8 +4,8 @@ # Depends on: gtk3, dbus-glib name=thunderbird-bin -version=60.6.0 -release=2 +version=60.6.1 +release=1 source=(http://ftp.mozilla.org/pub/thunderbird/releases/$version/linux-x86_… build() {

1 0

ports/opt (3.4): freerdp: fix dependencies, build with newer ffmpeg
by crux＠crux.nu 25 Mar '19

25 Mar '19

commit 6d16b98a9cab97fb2dffd6a6df22f079ff614013 Author: Alan Mizrahi <alan+crux(a)mizrahi.com.ve> Date: Tue Mar 26 03:53:56 2019 +0900 freerdp: fix dependencies, build with newer ffmpeg diff --git a/freerdp/.signature b/freerdp/.signature index 0d6217039..cc6e8e108 100644 --- a/freerdp/.signature +++ b/freerdp/.signature @@ -1,6 +1,6 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/bBOrB9E0hj+3Z1ofYrSU8gHit0dUHAzvEEo0xB8vva5lBADZ3UvpWOSweMsB+doke8lcQu/bO2biBVfYzNV/A8= -SHA256 (Pkgfile) = ada0c4b97a79ca5378c75b3608f004764bac6e360c4d8232c32a6968037c70d9 +RWSE3ohX2g5d/fnCDMGQLrJGZftVx6djQI6OHSHyWeJx6+01y3fv+eAEtBwVnAVxEcNzBS4fO87nc6H35VzC5qubm3VjOoze2Ao= +SHA256 (Pkgfile) = aa6313ab07a0baed029b491b801e4262f00cf52982e78cdf68d81bd71d09f63c SHA256 (.footprint) = 403f893c0b2f2d9ae8ee84962779d0a786ae9a2ee89916a58bf3f134f88054bf SHA256 (freerdp-1.0.2.tar.gz) = d519f2dca794366a15825b8c9f751dfd06018fd4fa3890840f3f6c6e0bcfe9d5 SHA256 (ffmpeg.patch) = b144699f853d757344470555ac029e3e93c68104595734ba66871986ca449be9 diff --git a/freerdp/Pkgfile b/freerdp/Pkgfile index e62253a2e..789eb4783 100644 --- a/freerdp/Pkgfile +++ b/freerdp/Pkgfile @@ -1,7 +1,7 @@ # Description: Remote desktop protocol implementation # URL: http://www.freerdp.com/ # Maintainer: Alan Mizrahi, alan at mizrahi dot com dot ve -# Depends on: xorg-libx11 xorg-libxrender xorg-libxcursor xorg-libxext +# Depends on: cmake xorg-libx11 xorg-libxrender xorg-libxcursor xorg-libxext # Optional: ffmpeg alsa-lib cups directfb neon pulseaudio xmlto name=freerdp @@ -11,7 +11,12 @@ source=(http://pub.freerdp.com/releases/freerdp-$version.tar.gz ffmpeg.patch) build() { # fix build with different versions of ffmpeg - patch -p1 -i $SRC/ffmpeg.patch -d $name-$version + patch -p0 -i $SRC/ffmpeg.patch + + # fix for even newer ffmpeg + sed -ri \ + 's/([^a-zA-Z_+])(CODEC_CAP_TRUNCATED|CODEC_FLAG_TRUNCATED|CODEC_FLAG_LOOP_FILTER)/\1AV_\2/g' \ + $name-$version/channels/drdynvc/tsmf/ffmpeg/tsmf_ffmpeg.c mkdir build; cd build @@ -20,6 +25,11 @@ build() { -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_SKIP_RPATH=ON \ -DWITH_PULSEAUDIO=$([ -f /usr/include/pulse/pulseaudio.h ] && echo "ON" || echo "OFF") \ + -DWITH_CUPS=$([ -f /usr/include/cups/cups.h ] && echo "ON" || echo "OFF") \ + -DWITH_ALSA=$([ -f /usr/include/alsa/version.h ] && echo "ON" || echo "OFF") \ + -DWITH_FFMPEG=$([ -f /usr/include/libavcodec/avcodec.h ] && echo "ON" || echo "OFF") \ + -DWITH_SSE2=$(grep -q '\bsse2\b' /proc/cpuinfo && echo ON || echo OFF) \ + -DWITH_SSE2_TARGET=$(grep -q '\bsse2\b' /proc/cpuinfo && echo ON || echo OFF) \ -DWITH_SERVER=OFF \ -DWITH_CLIENT=ON make

1 0

ports/opt (3.4): nano: update to 4.0
by crux＠crux.nu 25 Mar '19

25 Mar '19

commit 0417d01337fd16cce788e4fd85952e268435ffc7 Author: Juergen Daubert <jue(a)jue.li> Date: Mon Mar 25 13:18:21 2019 +0100 nano: update to 4.0 diff --git a/nano/.signature b/nano/.signature index 38d612240..f5f39cb12 100644 --- a/nano/.signature +++ b/nano/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/WpwZ0QCr0SmDo8W5V/fwqkZh7eLFmY9lOH61MAj37lbI/SdHrAP+cNC1+88R81ZRUWXE91v1gElmB0EsTIN2wE= -SHA256 (Pkgfile) = bb93f914ef51c2db2798ef52cdf1c89bd84cd8f6e5b809dde097e4e1e083b3a4 +RWSE3ohX2g5d/ZzQ2frV0yAhOv0U34G3EWiRJhFT2hB+VI7t0CIDptkUF3huS2Olb0xX6rCEuDfKJp5chMsLf2VYGYUvp7MSFwY= +SHA256 (Pkgfile) = 94ef2a8ce3f88ca7b15064f7fb41deb24b34f304f4c4e46f32980b455c90fe97 SHA256 (.footprint) = 6e65065e8bbaadfad31d89a3ec1820c7408848209b67edc34c5d1643df89ac1e -SHA256 (nano-3.2.tar.xz) = d12773af3589994b2e4982c5792b07c6240da5b86c5aef2103ab13b401fe6349 +SHA256 (nano-4.0.tar.xz) = 1e2fcfea35784624a7d86785768b772d58bb3995d1aec9176a27a113b1e9bac3 diff --git a/nano/Pkgfile b/nano/Pkgfile index d35f478c1..6e39f5eef 100644 --- a/nano/Pkgfile +++ b/nano/Pkgfile @@ -5,7 +5,7 @@ # Depends on: file ncurses name=nano -version=3.2 +version=4.0 release=1 source=(http://www.nano-editor.org/dist/v${version%.*}/$name-$version.tar.x…

1 0

ports/opt (3.4): dropbear: add patch to fix regression where TTY modes weren't reset
by crux＠crux.nu 25 Mar '19

25 Mar '19

commit 9da27ccc27f74f940b4c3bbc88bdaa346449b301 Author: Juergen Daubert <jue(a)jue.li> Date: Mon Mar 25 13:17:34 2019 +0100 dropbear: add patch to fix regression where TTY modes weren't reset diff --git a/dropbear/.signature b/dropbear/.signature index 26581ff7c..74630d0a4 100644 --- a/dropbear/.signature +++ b/dropbear/.signature @@ -1,6 +1,7 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/bmUi4dEvvHreEEmnrNqHfVnQz/fylF4X1PWxRg+PcNmfkvY+Ec8RrBbXFy9lXnF97Rjl1cJ/ALhYPh2h8kReQc= -SHA256 (Pkgfile) = 97d2294889f187b318f337da97af42e0efbd970269ceaedd429946e1d0cb988f +RWSE3ohX2g5d/eP8G/FELsWyMIunkv/sWCi+4YXZ1qk+d1JHRy9P786fn+XiXH3AZTp3zFoeW48uBKgVQtTC09r7EKbdAVjSLwA= +SHA256 (Pkgfile) = 55e5e63211fa11393a7388c75313f31a28a0e48745392a4af26330937b9633f5 SHA256 (.footprint) = 62bfe7191a20fcd5f6ec3511c951dee47aefdae734f7d616302e6bfc3a0c1923 SHA256 (dropbear-2019.77.tar.bz2) = d91f78ebe633be1d071fd1b7e5535b9693794048b019e9f4bea257e1992b458d SHA256 (dropbear) = def8d4ebda5759a3bc55055957235fa47f7e40216badf07830f487f05e7fbd42 +SHA256 (reset-tty-modes.patch) = 2fd8beca361dc5859fa996a28651c4748bd741c763587d828ede0ea634af0ed2 diff --git a/dropbear/Pkgfile b/dropbear/Pkgfile index ee2b15df4..5ba3b22e6 100644 --- a/dropbear/Pkgfile +++ b/dropbear/Pkgfile @@ -7,11 +7,13 @@ name=dropbear version=2019.77 release=2 source=(http://matt.ucc.asn.au/$name/releases/$name-$version.tar.bz2 \ - $name) + $name reset-tty-modes.patch) build () { cd $name-$version + patch -p1 -i $SRC/reset-tty-modes.patch + echo '#define SFTPSERVER_PATH "/usr/lib/ssh/sftp-server"' > localoptions.h ./configure --prefix=/usr diff --git a/dropbear/reset-tty-modes.patch b/dropbear/reset-tty-modes.patch new file mode 100644 index 000000000..cd2f086a5 --- /dev/null +++ b/dropbear/reset-tty-modes.patch @@ -0,0 +1,51 @@ + +# HG changeset patch +# User Matt Johnston <matt(a)ucc.asn.au> +# Date 1553431262 -28800 +# Node ID 4b01f4826a29a2837e971197d4f72b7cb376745a +# Parent 48c6e54f7281aaf89fbc8b2b99ca4a9cd62969af +Fix regression where TTY modes weren't reset for client + +diff -r 48c6e54f7281 -r 4b01f4826a29 cli-chansession.c +--- a/cli-chansession.c Sat Mar 23 21:54:23 2019 +0800 ++++ b/cli-chansession.c Sun Mar 24 20:41:02 2019 +0800 +@@ -35,7 +35,7 @@ + #include "chansession.h" + #include "agentfwd.h" + +-static void cli_cleanupchansess(const struct Channel *channel); ++static void cli_closechansess(const struct Channel *channel); + static int cli_initchansess(struct Channel *channel); + static void cli_chansessreq(struct Channel *channel); + static void send_chansess_pty_req(const struct Channel *channel); +@@ -51,8 +51,8 @@ + cli_initchansess, /* inithandler */ + NULL, /* checkclosehandler */ + cli_chansessreq, /* reqhandler */ +- NULL, /* closehandler */ +- cli_cleanupchansess, /* cleanup */ ++ cli_closechansess, /* closehandler */ ++ NULL, /* cleanup */ + }; + + static void cli_chansessreq(struct Channel *channel) { +@@ -84,7 +84,7 @@ + + + /* If the main session goes, we close it up */ +-static void cli_cleanupchansess(const struct Channel *UNUSED(channel)) { ++static void cli_closechansess(const struct Channel *UNUSED(channel)) { + cli_tty_cleanup(); /* Restore tty modes etc */ + + /* This channel hasn't gone yet, so we have > 1 */ +@@ -388,8 +388,8 @@ + cli_init_netcat, /* inithandler */ + NULL, + NULL, ++ cli_closechansess, + NULL, +- cli_cleanupchansess + }; + + void cli_send_netcat_request() { +

1 0