On Sat, Sep 08, 2018 at 08:36:29AM +0200, Rafael Sadowski wrote: > Hi All. > > please find below a simple diff to update ZSH to the latest stable > version. This release includes security fixes: CVE-2018-0502, > CVE-2018-13259.
zsh 5.6.1 will be out soon (it's tagged and built; just not announced). It fixes the error which (I suspect) is why you switched to gmake. > Notable port changes: > > - Use configure elements instead of post-install tasks. > -- Avoid version in path name. I don't see any reasons for that, I only > provide one ZSH version. This is the upstream default, and I don't see a compelling reason to deviate from it. Patch for 5.6.1 below. It was rolled a bit over an hour ago, so not well tested yet. Obviously we should wait until it's officially announced. There's one test error over what 5.5.1 had which I haven't had time to look at yet. - Matthew Martin diff --git Makefile Makefile index 20667f23baa..3899ee3cacc 100644 --- Makefile +++ Makefile @@ -2,7 +2,7 @@ COMMENT= Z shell, Bourne shell-compatible -V= 5.5.1 +V= 5.6.1 DISTNAME= zsh-$V CATEGORIES= shells @@ -13,6 +13,8 @@ HOMEPAGE= https://www.zsh.org/ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=zsh/} MASTER_SITES+= http://www.zsh.org/pub/ +EXTRACT_SUFX= .tar.xz + # BSD PERMIT_PACKAGE_CDROM= Yes @@ -23,8 +25,8 @@ LIB_DEPENDS= converters/libiconv \ AUTOCONF_VERSION=2.69 CONFIGURE_STYLE=autoconf -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_ARGS= --enable-zsh-mem \ --enable-zsh-secure-free \ --enable-maildir-support \ diff --git distinfo distinfo index bdf3045f919..5a51ac13acb 100644 --- distinfo +++ distinfo @@ -1,2 +1,2 @@ -SHA256 (zsh-5.5.1.tar.gz) = d0yqieeupfM8MDPL/9k+KHB/crpRSceXCeSObC0u4IA= -SIZE (zsh-5.5.1.tar.gz) = 4578700 +SHA256 (zsh-5.6.1.tar.xz) = lWZ1PzF9MbgItrY6ViLHHyXUc6a1/qXDWrHH7Zb7s+g= +SIZE (zsh-5.6.1.tar.xz) = 3076732 diff --git pkg/PLIST pkg/PLIST index a8a8d95aba0..023edfca087 100644 --- pkg/PLIST +++ pkg/PLIST @@ -96,7 +96,6 @@ share/zsh/${V}/functions/VCS_INFO_maxexports share/zsh/${V}/functions/VCS_INFO_nvcsformats share/zsh/${V}/functions/VCS_INFO_patch2subject share/zsh/${V}/functions/VCS_INFO_quilt -share/zsh/${V}/functions/VCS_INFO_realpath share/zsh/${V}/functions/VCS_INFO_reposub share/zsh/${V}/functions/VCS_INFO_set share/zsh/${V}/functions/VCS_INFO_set-patch-format @@ -105,6 +104,7 @@ share/zsh/${V}/functions/_a2ps share/zsh/${V}/functions/_a2utils share/zsh/${V}/functions/_aap share/zsh/${V}/functions/_absolute_command_paths +share/zsh/${V}/functions/_ack share/zsh/${V}/functions/_acpi share/zsh/${V}/functions/_acpitool share/zsh/${V}/functions/_acroread @@ -143,7 +143,9 @@ share/zsh/${V}/functions/_auto-apt share/zsh/${V}/functions/_autocd share/zsh/${V}/functions/_awk share/zsh/${V}/functions/_axi-cache +share/zsh/${V}/functions/_base64 share/zsh/${V}/functions/_basename +share/zsh/${V}/functions/_bash share/zsh/${V}/functions/_bash_completions share/zsh/${V}/functions/_baudrates share/zsh/${V}/functions/_baz @@ -190,6 +192,7 @@ share/zsh/${V}/functions/_chflags share/zsh/${V}/functions/_chkconfig share/zsh/${V}/functions/_chmod share/zsh/${V}/functions/_chown +share/zsh/${V}/functions/_chroot share/zsh/${V}/functions/_chrt share/zsh/${V}/functions/_chsh share/zsh/${V}/functions/_cksum @@ -224,6 +227,7 @@ share/zsh/${V}/functions/_cp share/zsh/${V}/functions/_cpio share/zsh/${V}/functions/_cplay share/zsh/${V}/functions/_cpupower +share/zsh/${V}/functions/_crontab share/zsh/${V}/functions/_cryptsetup share/zsh/${V}/functions/_cscope share/zsh/${V}/functions/_cssh @@ -261,6 +265,7 @@ share/zsh/${V}/functions/_debdiff share/zsh/${V}/functions/_debfoster share/zsh/${V}/functions/_deborphan share/zsh/${V}/functions/_debsign +share/zsh/${V}/functions/_debuild share/zsh/${V}/functions/_default share/zsh/${V}/functions/_defaults share/zsh/${V}/functions/_delimiters @@ -273,6 +278,7 @@ share/zsh/${V}/functions/_dhcpinfo share/zsh/${V}/functions/_dict share/zsh/${V}/functions/_dict_words share/zsh/${V}/functions/_diff +share/zsh/${V}/functions/_diff3 share/zsh/${V}/functions/_diff_options share/zsh/${V}/functions/_diffstat share/zsh/${V}/functions/_dig @@ -283,6 +289,7 @@ share/zsh/${V}/functions/_dirs share/zsh/${V}/functions/_disable share/zsh/${V}/functions/_dispatch share/zsh/${V}/functions/_django +share/zsh/${V}/functions/_dkms share/zsh/${V}/functions/_dladm share/zsh/${V}/functions/_dlocate share/zsh/${V}/functions/_dmesg @@ -301,15 +308,18 @@ share/zsh/${V}/functions/_dput share/zsh/${V}/functions/_drill share/zsh/${V}/functions/_dsh share/zsh/${V}/functions/_dtrace +share/zsh/${V}/functions/_dtruss share/zsh/${V}/functions/_du share/zsh/${V}/functions/_dumpadm share/zsh/${V}/functions/_dumper share/zsh/${V}/functions/_dupload share/zsh/${V}/functions/_dvi share/zsh/${V}/functions/_dynamic_directory_name +share/zsh/${V}/functions/_e2label share/zsh/${V}/functions/_ecasound share/zsh/${V}/functions/_echotc share/zsh/${V}/functions/_echoti +share/zsh/${V}/functions/_ed share/zsh/${V}/functions/_elfdump share/zsh/${V}/functions/_elinks share/zsh/${V}/functions/_elm @@ -319,6 +329,7 @@ share/zsh/${V}/functions/_enable share/zsh/${V}/functions/_enscript share/zsh/${V}/functions/_entr share/zsh/${V}/functions/_env +share/zsh/${V}/functions/_eog share/zsh/${V}/functions/_equal share/zsh/${V}/functions/_espeak share/zsh/${V}/functions/_etags @@ -357,6 +368,7 @@ share/zsh/${V}/functions/_fmt share/zsh/${V}/functions/_fold share/zsh/${V}/functions/_fortune share/zsh/${V}/functions/_freebsd-update +share/zsh/${V}/functions/_fs_usage share/zsh/${V}/functions/_fsh share/zsh/${V}/functions/_fstat share/zsh/${V}/functions/_functions @@ -368,6 +380,7 @@ share/zsh/${V}/functions/_fw_update share/zsh/${V}/functions/_gcc share/zsh/${V}/functions/_gcore share/zsh/${V}/functions/_gdb +share/zsh/${V}/functions/_geany share/zsh/${V}/functions/_gem share/zsh/${V}/functions/_generic share/zsh/${V}/functions/_genisoimage @@ -377,6 +390,7 @@ share/zsh/${V}/functions/_getent share/zsh/${V}/functions/_getfacl share/zsh/${V}/functions/_getmail share/zsh/${V}/functions/_getopt +share/zsh/${V}/functions/_ghostscript share/zsh/${V}/functions/_git share/zsh/${V}/functions/_git-buildpackage share/zsh/${V}/functions/_global @@ -401,7 +415,6 @@ share/zsh/${V}/functions/_grep-excuses share/zsh/${V}/functions/_groff share/zsh/${V}/functions/_groups share/zsh/${V}/functions/_growisofs -share/zsh/${V}/functions/_gs share/zsh/${V}/functions/_gsettings share/zsh/${V}/functions/_gstat share/zsh/${V}/functions/_guard @@ -417,6 +430,7 @@ share/zsh/${V}/functions/_hg share/zsh/${V}/functions/_history share/zsh/${V}/functions/_history_complete_word share/zsh/${V}/functions/_history_modifiers +share/zsh/${V}/functions/_hostname share/zsh/${V}/functions/_hosts share/zsh/${V}/functions/_htop share/zsh/${V}/functions/_hwinfo @@ -466,6 +480,7 @@ share/zsh/${V}/functions/_kpartx share/zsh/${V}/functions/_kvno share/zsh/${V}/functions/_last share/zsh/${V}/functions/_ld_debug +share/zsh/${V}/functions/_ldap share/zsh/${V}/functions/_ldconfig share/zsh/${V}/functions/_ldd share/zsh/${V}/functions/_less @@ -500,7 +515,10 @@ share/zsh/${V}/functions/_lspv share/zsh/${V}/functions/_lsusb share/zsh/${V}/functions/_lsvg share/zsh/${V}/functions/_ltrace +share/zsh/${V}/functions/_lua +share/zsh/${V}/functions/_luarocks share/zsh/${V}/functions/_lynx +share/zsh/${V}/functions/_lz4 share/zsh/${V}/functions/_lzop share/zsh/${V}/functions/_mac_applications share/zsh/${V}/functions/_mac_files_for_application @@ -551,6 +569,7 @@ share/zsh/${V}/functions/_mt share/zsh/${V}/functions/_mtools share/zsh/${V}/functions/_mtr share/zsh/${V}/functions/_multi_parts +share/zsh/${V}/functions/_mupdf share/zsh/${V}/functions/_mutt share/zsh/${V}/functions/_mv share/zsh/${V}/functions/_my_accounts @@ -565,9 +584,11 @@ share/zsh/${V}/functions/_netcat share/zsh/${V}/functions/_netscape share/zsh/${V}/functions/_netstat share/zsh/${V}/functions/_networkmanager +share/zsh/${V}/functions/_networksetup share/zsh/${V}/functions/_newsgroups share/zsh/${V}/functions/_next_label share/zsh/${V}/functions/_next_tags +share/zsh/${V}/functions/_nginx share/zsh/${V}/functions/_ngrep share/zsh/${V}/functions/_nice share/zsh/${V}/functions/_nkf @@ -590,6 +611,7 @@ share/zsh/${V}/functions/_okular share/zsh/${V}/functions/_oldlist share/zsh/${V}/functions/_open share/zsh/${V}/functions/_openstack +share/zsh/${V}/functions/_opkg share/zsh/${V}/functions/_options share/zsh/${V}/functions/_options_set share/zsh/${V}/functions/_options_unset @@ -651,6 +673,7 @@ share/zsh/${V}/functions/_prefix share/zsh/${V}/functions/_print share/zsh/${V}/functions/_printenv share/zsh/${V}/functions/_printers +share/zsh/${V}/functions/_process_names share/zsh/${V}/functions/_procstat share/zsh/${V}/functions/_prompt share/zsh/${V}/functions/_prove @@ -682,6 +705,7 @@ share/zsh/${V}/functions/_rdesktop share/zsh/${V}/functions/_read share/zsh/${V}/functions/_read_comp share/zsh/${V}/functions/_readelf +share/zsh/${V}/functions/_readlink share/zsh/${V}/functions/_readshortcut share/zsh/${V}/functions/_rebootin share/zsh/${V}/functions/_redirect @@ -696,6 +720,7 @@ share/zsh/${V}/functions/_retrieve_mac_apps share/zsh/${V}/functions/_ri share/zsh/${V}/functions/_rlogin share/zsh/${V}/functions/_rm +share/zsh/${V}/functions/_rmdir share/zsh/${V}/functions/_route share/zsh/${V}/functions/_rpm share/zsh/${V}/functions/_rpmbuild @@ -709,11 +734,13 @@ share/zsh/${V}/functions/_sablotron share/zsh/${V}/functions/_samba share/zsh/${V}/functions/_savecore share/zsh/${V}/functions/_say +share/zsh/${V}/functions/_sc_usage share/zsh/${V}/functions/_sccs share/zsh/${V}/functions/_sched share/zsh/${V}/functions/_schedtool share/zsh/${V}/functions/_schroot share/zsh/${V}/functions/_scl +share/zsh/${V}/functions/_scons share/zsh/${V}/functions/_screen share/zsh/${V}/functions/_script share/zsh/${V}/functions/_scselect @@ -731,7 +758,9 @@ share/zsh/${V}/functions/_setopt share/zsh/${V}/functions/_setup share/zsh/${V}/functions/_setxkbmap share/zsh/${V}/functions/_sh +share/zsh/${V}/functions/_shasum share/zsh/${V}/functions/_showmount +share/zsh/${V}/functions/_shuf share/zsh/${V}/functions/_shutdown share/zsh/${V}/functions/_signals share/zsh/${V}/functions/_signify @@ -785,6 +814,7 @@ share/zsh/${V}/functions/_sysrc share/zsh/${V}/functions/_sysstat share/zsh/${V}/functions/_systat share/zsh/${V}/functions/_system_profiler +share/zsh/${V}/functions/_tac share/zsh/${V}/functions/_tags share/zsh/${V}/functions/_tail share/zsh/${V}/functions/_tar @@ -793,6 +823,7 @@ share/zsh/${V}/functions/_tardy share/zsh/${V}/functions/_tcpdump share/zsh/${V}/functions/_tcpsys share/zsh/${V}/functions/_tcptraceroute +share/zsh/${V}/functions/_tee share/zsh/${V}/functions/_telnet share/zsh/${V}/functions/_terminals share/zsh/${V}/functions/_tex @@ -840,6 +871,7 @@ share/zsh/${V}/functions/_unison share/zsh/${V}/functions/_units share/zsh/${V}/functions/_update-alternatives share/zsh/${V}/functions/_update-rc.d +share/zsh/${V}/functions/_uptime share/zsh/${V}/functions/_urls share/zsh/${V}/functions/_urpmi share/zsh/${V}/functions/_urxvt @@ -864,7 +896,7 @@ share/zsh/${V}/functions/_vmstat share/zsh/${V}/functions/_vnc share/zsh/${V}/functions/_volume_groups share/zsh/${V}/functions/_vorbis -share/zsh/${V}/functions/_vorbiscomment +share/zsh/${V}/functions/_vpnc share/zsh/${V}/functions/_vserver share/zsh/${V}/functions/_vux share/zsh/${V}/functions/_w @@ -936,12 +968,14 @@ share/zsh/${V}/functions/_yodl share/zsh/${V}/functions/_yp share/zsh/${V}/functions/_yum share/zsh/${V}/functions/_zargs +share/zsh/${V}/functions/_zathura share/zsh/${V}/functions/_zattr share/zsh/${V}/functions/_zcalc share/zsh/${V}/functions/_zcalc_line share/zsh/${V}/functions/_zcat share/zsh/${V}/functions/_zcompile share/zsh/${V}/functions/_zdump +share/zsh/${V}/functions/_zeal share/zsh/${V}/functions/_zed share/zsh/${V}/functions/_zfs share/zsh/${V}/functions/_zfs_dataset