Date: Tuesday, March 21, 2017 @ 09:43:30
Author: bpiotrowski
Revision: 291145
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
zsh/repos/extra-i686/40285.patch
(from rev 291144, zsh/trunk/40285.patch)
zsh/repos/extra-i686/PKGBUILD
(from rev 291144, zsh/trunk/PKGBUILD)
zsh/repos/extra-i686/zprofile
(from rev 291144, zsh/trunk/zprofile)
zsh/repos/extra-i686/zsh.install
(from rev 291144, zsh/trunk/zsh.install)
zsh/repos/extra-x86_64/40285.patch
(from rev 291144, zsh/trunk/40285.patch)
zsh/repos/extra-x86_64/PKGBUILD
(from rev 291144, zsh/trunk/PKGBUILD)
zsh/repos/extra-x86_64/zprofile
(from rev 291144, zsh/trunk/zprofile)
zsh/repos/extra-x86_64/zsh.install
(from rev 291144, zsh/trunk/zsh.install)
Deleted:
zsh/repos/extra-i686/PKGBUILD
zsh/repos/extra-i686/zprofile
zsh/repos/extra-i686/zsh.install
zsh/repos/extra-x86_64/PKGBUILD
zsh/repos/extra-x86_64/zprofile
zsh/repos/extra-x86_64/zsh.install
--------------------------+
/PKGBUILD | 180 +++++++++++++++++++++++++++++++++++++++++++++
/zprofile | 2
/zsh.install | 24 ++++++
extra-i686/40285.patch | 66 ++++++++++++++++
extra-i686/PKGBUILD | 87 ---------------------
extra-i686/zprofile | 1
extra-i686/zsh.install | 12 ---
extra-x86_64/40285.patch | 66 ++++++++++++++++
extra-x86_64/PKGBUILD | 87 ---------------------
extra-x86_64/zprofile | 1
extra-x86_64/zsh.install | 12 ---
11 files changed, 338 insertions(+), 200 deletions(-)
Copied: zsh/repos/extra-i686/40285.patch (from rev 291144,
zsh/trunk/40285.patch)
===================================================================
--- extra-i686/40285.patch (rev 0)
+++ extra-i686/40285.patch 2017-03-21 09:43:30 UTC (rev 291145)
@@ -0,0 +1,66 @@
+From 48cadf48ff9c61ce09e826ad9a58e250e999a262 Mon Sep 17 00:00:00 2001
+From: Peter Stephenson <[email protected]>
+Date: Fri, 6 Jan 2017 17:42:13 +0000
+Subject: [PATCH] 40285: Be more careful with pattern allocation in history
+ isearch.
+
+If there are ZLE hooks to be called, they may use patterns, in
+which case it's not safe to allocate the isearch pattern in the
+static buffer.
+---
+ Src/Zle/zle_hist.c | 11 +++++++----
+ 1 file changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/Src/Zle/zle_hist.c b/Src/Zle/zle_hist.c
+index abd6e17..434735d 100644
+--- a/Src/Zle/zle_hist.c
++++ b/Src/Zle/zle_hist.c
+@@ -1220,13 +1220,12 @@ doisearch(char **args, int dir, int pattern)
+ char *patbuf = ztrdup(sbuf);
+ char *patstring;
+ /*
+- * Use static pattern buffer since we don't need
+- * to maintain it and won't call other pattern functions
+- * meanwhile.
++ * Do not use static pattern buffer (PAT_STATIC) since we call
zle hooks,
++ * which might call other pattern functions. Use PAT_ZDUP
instead.
+ * Use PAT_NOANCH because we don't need the match
+ * anchored to the end, even if it is at the start.
+ */
+- int patflags = PAT_STATIC|PAT_NOANCH;
++ int patflags = PAT_ZDUP|PAT_NOANCH;
+ if (sbuf[0] == '^') {
+ /*
+ * We'll handle the anchor later when
+@@ -1521,6 +1520,7 @@ doisearch(char **args, int dir, int pattern)
+ if (only_one || !top_spot || old_sbptr != sbptr)
+ break;
+ }
++ freepatprog(patprog);
+ patprog = NULL;
+ nosearch = 1;
+ skip_pos = 0;
+@@ -1632,6 +1632,7 @@ doisearch(char **args, int dir, int pattern)
+ }
+ strcpy(sbuf + sbptr, paste);
+ sbptr += pastelen;
++ freepatprog(patprog);
+ patprog = NULL;
+ free(paste);
+ } else if (cmd == Th(z_acceptsearch)) {
+@@ -1682,6 +1683,7 @@ doisearch(char **args, int dir, int pattern)
+ * always valid at this point.
+ */
+ sbptr += zlecharasstring(LASTFULLCHAR, sbuf + sbptr);
++ freepatprog(patprog);
+ patprog = NULL;
+ }
+ if (feep)
+@@ -1702,6 +1704,7 @@ doisearch(char **args, int dir, int pattern)
+ zsfree(okeymap);
+ if (matchlist)
+ freematchlist(matchlist);
++ freepatprog(patprog);
+ isearch_active = 0;
+ /*
+ * Don't allow unused characters provided as a string to the
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2017-03-21 09:43:20 UTC (rev 291144)
+++ extra-i686/PKGBUILD 2017-03-21 09:43:30 UTC (rev 291145)
@@ -1,87 +0,0 @@
-# $Id$
-# Maintainer: Pierre Schmitz <[email protected]>
-
-pkgbase=zsh
-pkgname=('zsh' 'zsh-doc')
-pkgver=5.3.1
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.zsh.org/'
-license=('custom')
-makedepends=('pcre' 'libcap' 'gdbm')
-source=("https://www.zsh.org/pub/zsh-${pkgver}"{,-doc}".tar.xz"{,.asc}
- 'zprofile')
-md5sums=('67d3e5ed99de68340c16aef613b0ecf7'
- 'SKIP'
- '6b908409528e77e00a26b7283f1f425d'
- 'SKIP'
- '24a9335edf77252a7b5f52e079f7aef7')
-validpgpkeys=('F7B2754C7DE2830914661F0EA71D9A9D4BDB27B3')
-
-prepare() {
- cd "${srcdir}/${pkgbase}-${pkgver}"
-
- # Set correct keymap path
- sed -i 's#/usr/share/keymaps#/usr/share/kbd/keymaps#g'
Completion/Unix/Command/_loadkeys
-
- # Fix usb.ids path
- sed -i 's#/usr/share/misc/usb.ids#/usr/share/hwdata/usb.ids#g'
Completion/Linux/Command/_lsusb
-
- # Remove unneeded and conflicting completion scripts
- for _fpath in AIX BSD Cygwin Darwin Debian Mandriva openSUSE Redhat
Solaris; do
- rm -rf Completion/$_fpath
- sed "s#\s*Completion/$_fpath/\*/\*##g" -i Src/Zle/complete.mdd
- done
- rm Completion/Linux/Command/_{pkgtool,rpmbuild}
-}
-
-build() {
- cd "${srcdir}/${pkgbase}-${pkgver}"
-
- ./configure --prefix=/usr \
- --docdir=/usr/share/doc/zsh \
- --htmldir=/usr/share/doc/zsh/html \
- --enable-etcdir=/etc/zsh \
- --enable-zshenv=/etc/zsh/zshenv \
- --enable-zlogin=/etc/zsh/zlogin \
- --enable-zlogout=/etc/zsh/zlogout \
- --enable-zprofile=/etc/zsh/zprofile \
- --enable-zshrc=/etc/zsh/zshrc \
- --enable-maildir-support \
- --with-term-lib='ncursesw' \
- --enable-multibyte \
- --enable-function-subdirs \
- --enable-fndir=/usr/share/zsh/functions \
- --enable-scriptdir=/usr/share/zsh/scripts \
- --with-tcsetpgrp \
- --enable-pcre \
- --enable-cap \
- --enable-zsh-secure-free
- make
-}
-
-check() {
- cd "${srcdir}/${pkgbase}-${pkgver}"
- HOME="${srcdir}" make check
-}
-
-package_zsh() {
- pkgdesc='A very advanced and programmable command interpreter (shell)
for UNIX'
- depends=('pcre' 'libcap' 'gdbm')
- backup=('etc/zsh/zprofile')
- install=zsh.install
-
- cd "${srcdir}/${pkgbase}-${pkgver}"
- make DESTDIR="${pkgdir}/" install
- install -D -m644 "${srcdir}/zprofile" "${pkgdir}/etc/zsh/zprofile"
- install -D -m644 LICENCE
"${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
-
-package_zsh-doc() {
- pkgdesc='Info, HTML and PDF format of the ZSH documentation'
-
- cd "${srcdir}/${pkgbase}-${pkgver}"
- make DESTDIR="${pkgdir}/" install.info install.html
- install -D -m644 Doc/zsh.pdf "${pkgdir}/usr/share/doc/zsh/zsh.pdf"
- install -D -m644 LICENCE
"${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
Copied: zsh/repos/extra-i686/PKGBUILD (from rev 291144, zsh/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2017-03-21 09:43:30 UTC (rev 291145)
@@ -0,0 +1,90 @@
+# $Id$
+# Maintainer: Pierre Schmitz <[email protected]>
+
+pkgbase=zsh
+pkgname=('zsh' 'zsh-doc')
+pkgver=5.3.1
+pkgrel=2
+arch=('i686' 'x86_64')
+url='http://www.zsh.org/'
+license=('custom')
+makedepends=('pcre' 'libcap' 'gdbm')
+source=("https://www.zsh.org/pub/zsh-${pkgver}"{,-doc}".tar.xz"{,.asc}
+ 'zprofile'
+ '40285.patch')
+md5sums=('67d3e5ed99de68340c16aef613b0ecf7'
+ 'SKIP'
+ '6b908409528e77e00a26b7283f1f425d'
+ 'SKIP'
+ '24a9335edf77252a7b5f52e079f7aef7'
+ 'fed5d393aa5b6ea51e873fa0605796ac')
+validpgpkeys=('F7B2754C7DE2830914661F0EA71D9A9D4BDB27B3')
+
+prepare() {
+ cd "${srcdir}/${pkgbase}-${pkgver}"
+ patch -p1 -i "${srcdir}/40285.patch"
+
+ # Set correct keymap path
+ sed -i 's#/usr/share/keymaps#/usr/share/kbd/keymaps#g'
Completion/Unix/Command/_loadkeys
+
+ # Fix usb.ids path
+ sed -i 's#/usr/share/misc/usb.ids#/usr/share/hwdata/usb.ids#g'
Completion/Linux/Command/_lsusb
+
+ # Remove unneeded and conflicting completion scripts
+ for _fpath in AIX BSD Cygwin Darwin Debian Mandriva openSUSE Redhat
Solaris; do
+ rm -rf Completion/$_fpath
+ sed "s#\s*Completion/$_fpath/\*/\*##g" -i Src/Zle/complete.mdd
+ done
+ rm Completion/Linux/Command/_{pkgtool,rpmbuild}
+}
+
+build() {
+ cd "${srcdir}/${pkgbase}-${pkgver}"
+
+ ./configure --prefix=/usr \
+ --docdir=/usr/share/doc/zsh \
+ --htmldir=/usr/share/doc/zsh/html \
+ --enable-etcdir=/etc/zsh \
+ --enable-zshenv=/etc/zsh/zshenv \
+ --enable-zlogin=/etc/zsh/zlogin \
+ --enable-zlogout=/etc/zsh/zlogout \
+ --enable-zprofile=/etc/zsh/zprofile \
+ --enable-zshrc=/etc/zsh/zshrc \
+ --enable-maildir-support \
+ --with-term-lib='ncursesw' \
+ --enable-multibyte \
+ --enable-function-subdirs \
+ --enable-fndir=/usr/share/zsh/functions \
+ --enable-scriptdir=/usr/share/zsh/scripts \
+ --with-tcsetpgrp \
+ --enable-pcre \
+ --enable-cap \
+ --enable-zsh-secure-free
+ make
+}
+
+check() {
+ cd "${srcdir}/${pkgbase}-${pkgver}"
+ HOME="${srcdir}" make check
+}
+
+package_zsh() {
+ pkgdesc='A very advanced and programmable command interpreter (shell)
for UNIX'
+ depends=('pcre' 'libcap' 'gdbm')
+ backup=('etc/zsh/zprofile')
+ install=zsh.install
+
+ cd "${srcdir}/${pkgbase}-${pkgver}"
+ make DESTDIR="${pkgdir}/" install
+ install -D -m644 "${srcdir}/zprofile" "${pkgdir}/etc/zsh/zprofile"
+ install -D -m644 LICENCE
"${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
+
+package_zsh-doc() {
+ pkgdesc='Info, HTML and PDF format of the ZSH documentation'
+
+ cd "${srcdir}/${pkgbase}-${pkgver}"
+ make DESTDIR="${pkgdir}/" install.info install.html
+ install -D -m644 Doc/zsh.pdf "${pkgdir}/usr/share/doc/zsh/zsh.pdf"
+ install -D -m644 LICENCE
"${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
Deleted: extra-i686/zprofile
===================================================================
--- extra-i686/zprofile 2017-03-21 09:43:20 UTC (rev 291144)
+++ extra-i686/zprofile 2017-03-21 09:43:30 UTC (rev 291145)
@@ -1 +0,0 @@
-emulate sh -c 'source /etc/profile'
Copied: zsh/repos/extra-i686/zprofile (from rev 291144, zsh/trunk/zprofile)
===================================================================
--- extra-i686/zprofile (rev 0)
+++ extra-i686/zprofile 2017-03-21 09:43:30 UTC (rev 291145)
@@ -0,0 +1 @@
+emulate sh -c 'source /etc/profile'
Deleted: extra-i686/zsh.install
===================================================================
--- extra-i686/zsh.install 2017-03-21 09:43:20 UTC (rev 291144)
+++ extra-i686/zsh.install 2017-03-21 09:43:30 UTC (rev 291145)
@@ -1,12 +0,0 @@
-post_install() {
- grep -qe '^/bin/zsh$' etc/shells || echo '/bin/zsh' >> etc/shells
- grep -qe '^/usr/bin/zsh$' etc/shells || echo '/usr/bin/zsh' >>
etc/shells
-}
-
-post_upgrade() {
- post_install
-}
-
-pre_remove() {
- sed -i -r '/^(\/usr)?\/bin\/zsh$/d' etc/shells
-}
Copied: zsh/repos/extra-i686/zsh.install (from rev 291144,
zsh/trunk/zsh.install)
===================================================================
--- extra-i686/zsh.install (rev 0)
+++ extra-i686/zsh.install 2017-03-21 09:43:30 UTC (rev 291145)
@@ -0,0 +1,12 @@
+post_install() {
+ grep -qe '^/bin/zsh$' etc/shells || echo '/bin/zsh' >> etc/shells
+ grep -qe '^/usr/bin/zsh$' etc/shells || echo '/usr/bin/zsh' >>
etc/shells
+}
+
+post_upgrade() {
+ post_install
+}
+
+pre_remove() {
+ sed -i -r '/^(\/usr)?\/bin\/zsh$/d' etc/shells
+}
Copied: zsh/repos/extra-x86_64/40285.patch (from rev 291144,
zsh/trunk/40285.patch)
===================================================================
--- extra-x86_64/40285.patch (rev 0)
+++ extra-x86_64/40285.patch 2017-03-21 09:43:30 UTC (rev 291145)
@@ -0,0 +1,66 @@
+From 48cadf48ff9c61ce09e826ad9a58e250e999a262 Mon Sep 17 00:00:00 2001
+From: Peter Stephenson <[email protected]>
+Date: Fri, 6 Jan 2017 17:42:13 +0000
+Subject: [PATCH] 40285: Be more careful with pattern allocation in history
+ isearch.
+
+If there are ZLE hooks to be called, they may use patterns, in
+which case it's not safe to allocate the isearch pattern in the
+static buffer.
+---
+ Src/Zle/zle_hist.c | 11 +++++++----
+ 1 file changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/Src/Zle/zle_hist.c b/Src/Zle/zle_hist.c
+index abd6e17..434735d 100644
+--- a/Src/Zle/zle_hist.c
++++ b/Src/Zle/zle_hist.c
+@@ -1220,13 +1220,12 @@ doisearch(char **args, int dir, int pattern)
+ char *patbuf = ztrdup(sbuf);
+ char *patstring;
+ /*
+- * Use static pattern buffer since we don't need
+- * to maintain it and won't call other pattern functions
+- * meanwhile.
++ * Do not use static pattern buffer (PAT_STATIC) since we call
zle hooks,
++ * which might call other pattern functions. Use PAT_ZDUP
instead.
+ * Use PAT_NOANCH because we don't need the match
+ * anchored to the end, even if it is at the start.
+ */
+- int patflags = PAT_STATIC|PAT_NOANCH;
++ int patflags = PAT_ZDUP|PAT_NOANCH;
+ if (sbuf[0] == '^') {
+ /*
+ * We'll handle the anchor later when
+@@ -1521,6 +1520,7 @@ doisearch(char **args, int dir, int pattern)
+ if (only_one || !top_spot || old_sbptr != sbptr)
+ break;
+ }
++ freepatprog(patprog);
+ patprog = NULL;
+ nosearch = 1;
+ skip_pos = 0;
+@@ -1632,6 +1632,7 @@ doisearch(char **args, int dir, int pattern)
+ }
+ strcpy(sbuf + sbptr, paste);
+ sbptr += pastelen;
++ freepatprog(patprog);
+ patprog = NULL;
+ free(paste);
+ } else if (cmd == Th(z_acceptsearch)) {
+@@ -1682,6 +1683,7 @@ doisearch(char **args, int dir, int pattern)
+ * always valid at this point.
+ */
+ sbptr += zlecharasstring(LASTFULLCHAR, sbuf + sbptr);
++ freepatprog(patprog);
+ patprog = NULL;
+ }
+ if (feep)
+@@ -1702,6 +1704,7 @@ doisearch(char **args, int dir, int pattern)
+ zsfree(okeymap);
+ if (matchlist)
+ freematchlist(matchlist);
++ freepatprog(patprog);
+ isearch_active = 0;
+ /*
+ * Don't allow unused characters provided as a string to the
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2017-03-21 09:43:20 UTC (rev 291144)
+++ extra-x86_64/PKGBUILD 2017-03-21 09:43:30 UTC (rev 291145)
@@ -1,87 +0,0 @@
-# $Id$
-# Maintainer: Pierre Schmitz <[email protected]>
-
-pkgbase=zsh
-pkgname=('zsh' 'zsh-doc')
-pkgver=5.3.1
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.zsh.org/'
-license=('custom')
-makedepends=('pcre' 'libcap' 'gdbm')
-source=("https://www.zsh.org/pub/zsh-${pkgver}"{,-doc}".tar.xz"{,.asc}
- 'zprofile')
-md5sums=('67d3e5ed99de68340c16aef613b0ecf7'
- 'SKIP'
- '6b908409528e77e00a26b7283f1f425d'
- 'SKIP'
- '24a9335edf77252a7b5f52e079f7aef7')
-validpgpkeys=('F7B2754C7DE2830914661F0EA71D9A9D4BDB27B3')
-
-prepare() {
- cd "${srcdir}/${pkgbase}-${pkgver}"
-
- # Set correct keymap path
- sed -i 's#/usr/share/keymaps#/usr/share/kbd/keymaps#g'
Completion/Unix/Command/_loadkeys
-
- # Fix usb.ids path
- sed -i 's#/usr/share/misc/usb.ids#/usr/share/hwdata/usb.ids#g'
Completion/Linux/Command/_lsusb
-
- # Remove unneeded and conflicting completion scripts
- for _fpath in AIX BSD Cygwin Darwin Debian Mandriva openSUSE Redhat
Solaris; do
- rm -rf Completion/$_fpath
- sed "s#\s*Completion/$_fpath/\*/\*##g" -i Src/Zle/complete.mdd
- done
- rm Completion/Linux/Command/_{pkgtool,rpmbuild}
-}
-
-build() {
- cd "${srcdir}/${pkgbase}-${pkgver}"
-
- ./configure --prefix=/usr \
- --docdir=/usr/share/doc/zsh \
- --htmldir=/usr/share/doc/zsh/html \
- --enable-etcdir=/etc/zsh \
- --enable-zshenv=/etc/zsh/zshenv \
- --enable-zlogin=/etc/zsh/zlogin \
- --enable-zlogout=/etc/zsh/zlogout \
- --enable-zprofile=/etc/zsh/zprofile \
- --enable-zshrc=/etc/zsh/zshrc \
- --enable-maildir-support \
- --with-term-lib='ncursesw' \
- --enable-multibyte \
- --enable-function-subdirs \
- --enable-fndir=/usr/share/zsh/functions \
- --enable-scriptdir=/usr/share/zsh/scripts \
- --with-tcsetpgrp \
- --enable-pcre \
- --enable-cap \
- --enable-zsh-secure-free
- make
-}
-
-check() {
- cd "${srcdir}/${pkgbase}-${pkgver}"
- HOME="${srcdir}" make check
-}
-
-package_zsh() {
- pkgdesc='A very advanced and programmable command interpreter (shell)
for UNIX'
- depends=('pcre' 'libcap' 'gdbm')
- backup=('etc/zsh/zprofile')
- install=zsh.install
-
- cd "${srcdir}/${pkgbase}-${pkgver}"
- make DESTDIR="${pkgdir}/" install
- install -D -m644 "${srcdir}/zprofile" "${pkgdir}/etc/zsh/zprofile"
- install -D -m644 LICENCE
"${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
-
-package_zsh-doc() {
- pkgdesc='Info, HTML and PDF format of the ZSH documentation'
-
- cd "${srcdir}/${pkgbase}-${pkgver}"
- make DESTDIR="${pkgdir}/" install.info install.html
- install -D -m644 Doc/zsh.pdf "${pkgdir}/usr/share/doc/zsh/zsh.pdf"
- install -D -m644 LICENCE
"${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
Copied: zsh/repos/extra-x86_64/PKGBUILD (from rev 291144, zsh/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2017-03-21 09:43:30 UTC (rev 291145)
@@ -0,0 +1,90 @@
+# $Id$
+# Maintainer: Pierre Schmitz <[email protected]>
+
+pkgbase=zsh
+pkgname=('zsh' 'zsh-doc')
+pkgver=5.3.1
+pkgrel=2
+arch=('i686' 'x86_64')
+url='http://www.zsh.org/'
+license=('custom')
+makedepends=('pcre' 'libcap' 'gdbm')
+source=("https://www.zsh.org/pub/zsh-${pkgver}"{,-doc}".tar.xz"{,.asc}
+ 'zprofile'
+ '40285.patch')
+md5sums=('67d3e5ed99de68340c16aef613b0ecf7'
+ 'SKIP'
+ '6b908409528e77e00a26b7283f1f425d'
+ 'SKIP'
+ '24a9335edf77252a7b5f52e079f7aef7'
+ 'fed5d393aa5b6ea51e873fa0605796ac')
+validpgpkeys=('F7B2754C7DE2830914661F0EA71D9A9D4BDB27B3')
+
+prepare() {
+ cd "${srcdir}/${pkgbase}-${pkgver}"
+ patch -p1 -i "${srcdir}/40285.patch"
+
+ # Set correct keymap path
+ sed -i 's#/usr/share/keymaps#/usr/share/kbd/keymaps#g'
Completion/Unix/Command/_loadkeys
+
+ # Fix usb.ids path
+ sed -i 's#/usr/share/misc/usb.ids#/usr/share/hwdata/usb.ids#g'
Completion/Linux/Command/_lsusb
+
+ # Remove unneeded and conflicting completion scripts
+ for _fpath in AIX BSD Cygwin Darwin Debian Mandriva openSUSE Redhat
Solaris; do
+ rm -rf Completion/$_fpath
+ sed "s#\s*Completion/$_fpath/\*/\*##g" -i Src/Zle/complete.mdd
+ done
+ rm Completion/Linux/Command/_{pkgtool,rpmbuild}
+}
+
+build() {
+ cd "${srcdir}/${pkgbase}-${pkgver}"
+
+ ./configure --prefix=/usr \
+ --docdir=/usr/share/doc/zsh \
+ --htmldir=/usr/share/doc/zsh/html \
+ --enable-etcdir=/etc/zsh \
+ --enable-zshenv=/etc/zsh/zshenv \
+ --enable-zlogin=/etc/zsh/zlogin \
+ --enable-zlogout=/etc/zsh/zlogout \
+ --enable-zprofile=/etc/zsh/zprofile \
+ --enable-zshrc=/etc/zsh/zshrc \
+ --enable-maildir-support \
+ --with-term-lib='ncursesw' \
+ --enable-multibyte \
+ --enable-function-subdirs \
+ --enable-fndir=/usr/share/zsh/functions \
+ --enable-scriptdir=/usr/share/zsh/scripts \
+ --with-tcsetpgrp \
+ --enable-pcre \
+ --enable-cap \
+ --enable-zsh-secure-free
+ make
+}
+
+check() {
+ cd "${srcdir}/${pkgbase}-${pkgver}"
+ HOME="${srcdir}" make check
+}
+
+package_zsh() {
+ pkgdesc='A very advanced and programmable command interpreter (shell)
for UNIX'
+ depends=('pcre' 'libcap' 'gdbm')
+ backup=('etc/zsh/zprofile')
+ install=zsh.install
+
+ cd "${srcdir}/${pkgbase}-${pkgver}"
+ make DESTDIR="${pkgdir}/" install
+ install -D -m644 "${srcdir}/zprofile" "${pkgdir}/etc/zsh/zprofile"
+ install -D -m644 LICENCE
"${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
+
+package_zsh-doc() {
+ pkgdesc='Info, HTML and PDF format of the ZSH documentation'
+
+ cd "${srcdir}/${pkgbase}-${pkgver}"
+ make DESTDIR="${pkgdir}/" install.info install.html
+ install -D -m644 Doc/zsh.pdf "${pkgdir}/usr/share/doc/zsh/zsh.pdf"
+ install -D -m644 LICENCE
"${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
Deleted: extra-x86_64/zprofile
===================================================================
--- extra-x86_64/zprofile 2017-03-21 09:43:20 UTC (rev 291144)
+++ extra-x86_64/zprofile 2017-03-21 09:43:30 UTC (rev 291145)
@@ -1 +0,0 @@
-emulate sh -c 'source /etc/profile'
Copied: zsh/repos/extra-x86_64/zprofile (from rev 291144, zsh/trunk/zprofile)
===================================================================
--- extra-x86_64/zprofile (rev 0)
+++ extra-x86_64/zprofile 2017-03-21 09:43:30 UTC (rev 291145)
@@ -0,0 +1 @@
+emulate sh -c 'source /etc/profile'
Deleted: extra-x86_64/zsh.install
===================================================================
--- extra-x86_64/zsh.install 2017-03-21 09:43:20 UTC (rev 291144)
+++ extra-x86_64/zsh.install 2017-03-21 09:43:30 UTC (rev 291145)
@@ -1,12 +0,0 @@
-post_install() {
- grep -qe '^/bin/zsh$' etc/shells || echo '/bin/zsh' >> etc/shells
- grep -qe '^/usr/bin/zsh$' etc/shells || echo '/usr/bin/zsh' >>
etc/shells
-}
-
-post_upgrade() {
- post_install
-}
-
-pre_remove() {
- sed -i -r '/^(\/usr)?\/bin\/zsh$/d' etc/shells
-}
Copied: zsh/repos/extra-x86_64/zsh.install (from rev 291144,
zsh/trunk/zsh.install)
===================================================================
--- extra-x86_64/zsh.install (rev 0)
+++ extra-x86_64/zsh.install 2017-03-21 09:43:30 UTC (rev 291145)
@@ -0,0 +1,12 @@
+post_install() {
+ grep -qe '^/bin/zsh$' etc/shells || echo '/bin/zsh' >> etc/shells
+ grep -qe '^/usr/bin/zsh$' etc/shells || echo '/usr/bin/zsh' >>
etc/shells
+}
+
+post_upgrade() {
+ post_install
+}
+
+pre_remove() {
+ sed -i -r '/^(\/usr)?\/bin\/zsh$/d' etc/shells
+}
