On Thu, 23 Oct 2014 13:16:52 +0200 Theo Buehler <t...@math.ethz.ch> wrote:
> On Wed, Oct 22, 2014 at 04:45:26PM +0200, Pierre-Emmanuel André wrote:
> > Hi,
> >
> > Small diff to update zsh to it's latest version.
> > Tested on @amd64.
> >
> > Comments, ok ?
> > Regards,
> >
> This looks good to me (also amd64). I've been running the updated
> shell for about a day now and didn't encounter any issues.
>
> Two comments:
>
> 1. I went through the entire list on the ports testing guide and
> almost everything seems to be fine. There still is this spurious
> failure of ``make test'' which ends with
>
> **************************************
> 42 successful test scripts, 1 failure, 0 skipped
> **************************************
> *** Error 1 in Test (Makefile:204 'check')
> *** Error 1 in /usr/obj/ports/zsh-5.0.7/zsh-5.0.7 (Makefile:265
> 'check') *** Error 1 in .
> (/usr/ports/infrastructure/mk/bsd.port.mk:2801
> '/usr/obj/ports/zsh-5.0.7/.test_done') *** Error 1
> in /usr/ports/shells/zsh
> (/usr/ports/infrastructure/mk/bsd.port.mk:2492 'test')
>
> after indicating that _all_ tests passed successfully. This bizarre
> brekage has been around for a while now.
>
>
> 2. The following simple patch fixes a compiler warning in
> Src/Modules/langinfo.c
Hi,
below you find a diff with the compiler warning fix included. I'm ok
with committing Pierre's original diff with or without this fix.
Christopher
Index: Makefile
===================================================================
RCS file: /cvs/ports/shells/zsh/Makefile,v
retrieving revision 1.71
diff -u -p -r1.71 Makefile
--- Makefile 20 Apr 2014 21:26:51 -0000 1.71
+++ Makefile 28 Mar 2015 11:01:59 -0000
@@ -2,9 +2,8 @@
COMMENT= Z shell, Bourne shell-compatible
-V= 5.0.5
+V= 5.0.7
DISTNAME= zsh-$V
-REVISION= 0
CATEGORIES= shells
MAINTAINER= Pierre-Emmanuel Andre <p...@openbsd.org>
Index: distinfo
===================================================================
RCS file: /cvs/ports/shells/zsh/distinfo,v
retrieving revision 1.19
diff -u -p -r1.19 distinfo
--- distinfo 17 Apr 2014 12:12:20 -0000 1.19
+++ distinfo 28 Mar 2015 11:01:59 -0000
@@ -1,2 +1,2 @@
-SHA256 (zsh-5.0.5.tar.gz) = s1zxnkpro5/QPGNyuKh2CkkcwuLkq6PRUCP/KRwolLQ=
-SIZE (zsh-5.0.5.tar.gz) = 3919129
+SHA256 (zsh-5.0.7.tar.gz) = Q/CkwXnvebuMkVNXVoX39F8oo2FcjPljRfUD1bnnuRk=
+SIZE (zsh-5.0.7.tar.gz) = 4004964
Index: patches/patch-Completion_Unix_Command__pgrep
===================================================================
RCS file: patches/patch-Completion_Unix_Command__pgrep
diff -N patches/patch-Completion_Unix_Command__pgrep
--- patches/patch-Completion_Unix_Command__pgrep 21 Dec 2011 15:01:56
-0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,42 +0,0 @@
-$OpenBSD: patch-Completion_Unix_Command__pgrep,v 1.1 2011/12/21 15:01:56 pea
Exp $
---- Completion/Unix/Command/_pgrep.orig Thu Dec 15 11:46:32 2011
-+++ Completion/Unix/Command/_pgrep Thu Dec 15 11:48:21 2011
-@@ -45,7 +45,7 @@ case $state in
-
- local -a used sid
- used=(${(s:,:)IPREFIX})
-- sid=(${(uon)$(ps -A o sid=)})
-+ sid=(${(uon)$(ps -ax -o pid)})
-
- _wanted sid expl 'session id' compadd -S ',' -q -F used $sid
- ;;
-@@ -55,7 +55,7 @@ case $state in
-
- local -a used ppid
- used=(${(s:,:)IPREFIX})
-- ppid=(${(uon)$(ps -A o ppid=)})
-+ ppid=(${(uon)$(ps -ax -o ppid)})
-
- _wanted ppid expl 'parent process id' compadd -S ',' -q -F used $ppid
- ;;
-@@ -65,7 +65,7 @@ case $state in
-
- local -a used pgid
- used=(${(s:,:)IPREFIX})
-- pgid=(${(uon)$(ps -A o pgid=)})
-+ pgid=(${(uon)$(ps -ax -o pgid)})
-
- _wanted pgid expl 'process group id' compadd -S ',' -q -F used $pgid
- ;;
-@@ -78,9 +78,9 @@ case $state in
- fi
- if (( ${+opt_args[-f]} ))
- then
-- _wanted pname expl $ispat'process command line' compadd ${(u)${(f)"$(ps
-A o cmd=)"}}
-+ _wanted pname expl $ispat'process command line' compadd ${(u)${(f)"$(ps
-ax -o command)"}}
- else
-- _wanted pname expl $ispat'process name' compadd ${(u)${(f)"$(ps -A co
cmd=)"}}
-+ _wanted pname expl $ispat'process name' compadd ${(u)${(f)"$(ps -ax -co
command)"}}
- fi
- ;;
-
Index: patches/patch-Doc_zsh_texi
===================================================================
RCS file: /cvs/ports/shells/zsh/patches/patch-Doc_zsh_texi,v
retrieving revision 1.7
diff -u -p -r1.7 patch-Doc_zsh_texi
--- patches/patch-Doc_zsh_texi 17 Apr 2014 12:12:20 -0000 1.7
+++ patches/patch-Doc_zsh_texi 28 Mar 2015 11:01:59 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-Doc_zsh_texi,v 1.7 2014/04/17 12:12:20 jasper Exp $
---- Doc/zsh.texi.orig Sun Jan 5 19:22:46 2014
-+++ Doc/zsh.texi Mon Apr 14 18:10:09 2014
+--- Doc/zsh.texi.orig Tue Oct 7 20:09:19 2014
++++ Doc/zsh.texi Sat Mar 28 11:55:00 2015
@@ -7,6 +7,10 @@
@end iftex
@setfilename zsh.info
@@ -12,7 +12,7 @@ $OpenBSD: patch-Doc_zsh_texi,v 1.7 2014/
@c %**end of header
@ifinfo
-@@ -3924,7 +3928,7 @@ you may see in your prompt (see
+@@ -4074,7 +4078,7 @@ you may see in your prompt (see
A history expansion begins with the first character of the @t{histchars}
parameter, which is `@t{!}' by default, and may occur anywhere on the
command line; history expansions do not nest. The `@t{!}' can be escaped
@@ -21,7 +21,7 @@ $OpenBSD: patch-Doc_zsh_texi,v 1.7 2014/
to suppress its special meaning. Double quotes will @emph{not} work for
this. Following this history character is an optional event designator
(@ref{Event Designators}) and then an optional word
-@@ -10233,7 +10237,7 @@ For example,
+@@ -10526,7 +10530,7 @@ For example,
@example
unsetopt localtraps
trap - INT
@@ -30,7 +30,7 @@ $OpenBSD: patch-Doc_zsh_texi,v 1.7 2014/
@end example
@noindent
-@@ -20012,7 +20016,7 @@ zstyle ':completion:*:default' list-colors $@{(s.:.)LS
+@@ -20418,7 +20422,7 @@ zstyle ':completion:*:default' list-colors $@{(s.:.)LS
@noindent
The default colors are the same as for the GNU @t{ls} command and can be
@@ -39,7 +39,7 @@ $OpenBSD: patch-Doc_zsh_texi,v 1.7 2014/
@kindex list-dirs-first, completion style
@item @t{list-dirs-first}
-@@ -20145,7 +20149,7 @@ generates no matches, case-insensitive completion:
+@@ -20551,7 +20555,7 @@ generates no matches, case-insensitive completion:
@noindent
@example
@@ -48,7 +48,7 @@ $OpenBSD: patch-Doc_zsh_texi,v 1.7 2014/
@end example
@noindent
-@@ -20169,7 +20173,7 @@ case-insensitive completion with @t{_complete}:
+@@ -20577,7 +20581,7 @@ case-insensitive completion only with @t{_complete}:
@example
zstyle ':completion:*' completer _complete _prefix
zstyle ':completion:*:complete:*' matcher-list \
@@ -57,7 +57,7 @@ $OpenBSD: patch-Doc_zsh_texi,v 1.7 2014/
@end example
@noindent
-@@ -23701,7 +23705,7 @@ generates at least one match. E.g.:
+@@ -24141,7 +24145,7 @@ generates at least one match. E.g.:
@noindent
@example
@@ -66,7 +66,7 @@ $OpenBSD: patch-Doc_zsh_texi,v 1.7 2014/
@end example
@noindent
-@@ -23913,7 +23917,7 @@ use is
+@@ -24353,7 +24357,7 @@ use is
@noindent
@example
@@ -75,7 +75,7 @@ $OpenBSD: patch-Doc_zsh_texi,v 1.7 2014/
@end example
@noindent
-@@ -24001,7 +24005,7 @@ performed on the first word in the range. For example
+@@ -24441,7 +24445,7 @@ performed on the first word in the range. For example
@noindent
@example
Index: patches/patch-Src_Modules_langinfo_c
===================================================================
RCS file: patches/patch-Src_Modules_langinfo_c
diff -N patches/patch-Src_Modules_langinfo_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-Src_Modules_langinfo_c 28 Mar 2015 11:01:59 -0000
@@ -0,0 +1,13 @@
+$OpenBSD$
+--- Src/Modules/langinfo.c.orig Sat Mar 28 11:55:39 2015
++++ Src/Modules/langinfo.c Sat Mar 28 11:56:37 2015
+@@ -395,7 +395,8 @@ liitem(const char *name)
+ static HashNode
+ getlanginfo(UNUSED(HashTable ht), const char *name)
+ {
+- int len, *elem;
++ nl_item *elem;
++ int len;
+ char *listr, *nameu;
+ Param pm = NULL;
+
Index: patches/patch-configure_ac
===================================================================
RCS file: patches/patch-configure_ac
diff -N patches/patch-configure_ac
--- patches/patch-configure_ac 12 May 2014 15:22:40 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,18 +0,0 @@
-$OpenBSD: patch-configure_ac,v 1.3 2014/05/12 15:22:40 jasper Exp $
-
-From 315c60744598616ae3cb585a3523ae74f118d7b6 Mon Sep 17 00:00:00 2001
-From: Jasper Lievisse Adriaanse <jas...@openbsd.org>
-Date: Thu, 17 Apr 2014 15:46:16 +0200
-Subject: [PATCH] 32558: _XOPEN_SOURCE_EXTENDED now OK on OpenBSD
-
---- configure.ac.orig Wed Nov 27 20:00:20 2013
-+++ configure.ac Mon Apr 14 18:10:09 2014
-@@ -756,7 +756,7 @@ AH_TEMPLATE([ZSH_NO_XOPEN],
- AC_CACHE_CHECK(if _XOPEN_SOURCE_EXTENDED should not be defined,
- zsh_cv_no_xopen,
- [[case "$host_os" in
-- *openbsd*|*freebsd5*|*freebsd6.[012]*|*aix*)
-+ *freebsd5*|*freebsd6.[012]*|*aix*)
- zsh_cv_no_xopen=yes
- ;;
- *)
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/shells/zsh/pkg/PLIST,v
retrieving revision 1.39
diff -u -p -r1.39 PLIST
--- pkg/PLIST 20 Apr 2014 21:26:51 -0000 1.39
+++ pkg/PLIST 28 Mar 2015 11:02:00 -0000
@@ -59,7 +59,7 @@ 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/_SuSEconfig
+share/zsh/${V}/functions/_SUSEconfig
share/zsh/${V}/functions/_a2ps
share/zsh/${V}/functions/_a2utils
share/zsh/${V}/functions/_aap
@@ -93,6 +93,7 @@ share/zsh/${V}/functions/_arrays
share/zsh/${V}/functions/_assign
share/zsh/${V}/functions/_at
share/zsh/${V}/functions/_attr
+share/zsh/${V}/functions/_augeas
share/zsh/${V}/functions/_auto-apt
share/zsh/${V}/functions/_autocd
share/zsh/${V}/functions/_awk
@@ -106,6 +107,7 @@ share/zsh/${V}/functions/_bindkey
share/zsh/${V}/functions/_bison
share/zsh/${V}/functions/_bittorrent
share/zsh/${V}/functions/_bogofilter
+share/zsh/${V}/functions/_bpython
share/zsh/${V}/functions/_brace_parameter
share/zsh/${V}/functions/_brctl
share/zsh/${V}/functions/_bsd_pkg
@@ -134,6 +136,7 @@ share/zsh/${V}/functions/_chkconfig
share/zsh/${V}/functions/_chmod
share/zsh/${V}/functions/_chown
share/zsh/${V}/functions/_chrt
+share/zsh/${V}/functions/_chsh
share/zsh/${V}/functions/_clay
share/zsh/${V}/functions/_combination
share/zsh/${V}/functions/_comm
@@ -207,6 +210,7 @@ share/zsh/${V}/functions/_django
share/zsh/${V}/functions/_dladm
share/zsh/${V}/functions/_dlocate
share/zsh/${V}/functions/_dmidecode
+share/zsh/${V}/functions/_docker
share/zsh/${V}/functions/_domains
share/zsh/${V}/functions/_dpatch-edit-patch
share/zsh/${V}/functions/_dpkg
@@ -215,6 +219,7 @@ share/zsh/${V}/functions/_dpkg-cross
share/zsh/${V}/functions/_dpkg-repack
share/zsh/${V}/functions/_dpkg_source
share/zsh/${V}/functions/_dput
+share/zsh/${V}/functions/_dsh
share/zsh/${V}/functions/_dtrace
share/zsh/${V}/functions/_du
share/zsh/${V}/functions/_dumpadm
@@ -239,6 +244,7 @@ share/zsh/${V}/functions/_ethtool
share/zsh/${V}/functions/_expand
share/zsh/${V}/functions/_expand_alias
share/zsh/${V}/functions/_expand_word
+share/zsh/${V}/functions/_extensions
share/zsh/${V}/functions/_fakeroot
share/zsh/${V}/functions/_fc
share/zsh/${V}/functions/_feh
@@ -411,6 +417,7 @@ share/zsh/${V}/functions/_module_math_fu
share/zsh/${V}/functions/_modutils
share/zsh/${V}/functions/_mondo
share/zsh/${V}/functions/_monotone
+share/zsh/${V}/functions/_moosic
share/zsh/${V}/functions/_mosh
share/zsh/${V}/functions/_most_recent_file
share/zsh/${V}/functions/_mount
@@ -446,6 +453,7 @@ share/zsh/${V}/functions/_notmuch
share/zsh/${V}/functions/_npm
share/zsh/${V}/functions/_nslookup
share/zsh/${V}/functions/_object_classes
+share/zsh/${V}/functions/_od
share/zsh/${V}/functions/_okular
share/zsh/${V}/functions/_oldlist
share/zsh/${V}/functions/_open
@@ -558,6 +566,7 @@ share/zsh/${V}/functions/_schroot
share/zsh/${V}/functions/_screen
share/zsh/${V}/functions/_sed
share/zsh/${V}/functions/_sep_parts
+share/zsh/${V}/functions/_sequence
share/zsh/${V}/functions/_service
share/zsh/${V}/functions/_services
share/zsh/${V}/functions/_set
@@ -581,6 +590,7 @@ share/zsh/${V}/functions/_source
share/zsh/${V}/functions/_spamassassin
share/zsh/${V}/functions/_sqlite
share/zsh/${V}/functions/_sqsh
+share/zsh/${V}/functions/_ss
share/zsh/${V}/functions/_ssh
share/zsh/${V}/functions/_sshfs
share/zsh/${V}/functions/_stat
@@ -603,6 +613,8 @@ share/zsh/${V}/functions/_svcs
share/zsh/${V}/functions/_svcs_fmri
share/zsh/${V}/functions/_svn-buildpackage
share/zsh/${V}/functions/_sysctl
+share/zsh/${V}/functions/_sysstat
+share/zsh/${V}/functions/_system_profiler
share/zsh/${V}/functions/_systemd
share/zsh/${V}/functions/_tags
share/zsh/${V}/functions/_tar
@@ -648,7 +660,6 @@ share/zsh/${V}/functions/_unhash
share/zsh/${V}/functions/_uniq
share/zsh/${V}/functions/_unison
share/zsh/${V}/functions/_units
-share/zsh/${V}/functions/_unsetopt
share/zsh/${V}/functions/_update-alternatives
share/zsh/${V}/functions/_update-rc.d
share/zsh/${V}/functions/_urls
@@ -795,6 +806,7 @@ share/zsh/${V}/functions/delete-whole-wo
share/zsh/${V}/functions/down-case-word-match
share/zsh/${V}/functions/down-line-or-beginning-search
share/zsh/${V}/functions/edit-command-line
+share/zsh/${V}/functions/expand-absolute-path
share/zsh/${V}/functions/forward-word-match
share/zsh/${V}/functions/getjobs
share/zsh/${V}/functions/harden
@@ -843,6 +855,7 @@ share/zsh/${V}/functions/quote-and-compl
share/zsh/${V}/functions/read-from-minibuffer
share/zsh/${V}/functions/regexp-replace
share/zsh/${V}/functions/relative
+share/zsh/${V}/functions/replace-argument
share/zsh/${V}/functions/replace-string
share/zsh/${V}/functions/replace-string-again
share/zsh/${V}/functions/run-help
@@ -892,6 +905,7 @@ share/zsh/${V}/functions/which-command
share/zsh/${V}/functions/xtermctl
share/zsh/${V}/functions/zargs
share/zsh/${V}/functions/zcalc
+share/zsh/${V}/functions/zcalc-auto-insert
share/zsh/${V}/functions/zed
share/zsh/${V}/functions/zed-set-file-name
share/zsh/${V}/functions/zfanon
--
http://gmerlin.de
OpenPGP: http://gmerlin.de/christopher.pub
F190 D013 8F01 AA53 E080 3F3C F17F B0A1 D44E 4FEE
pgpSlusLQq2W8.pgp
Description: OpenPGP digital signature
