update: shells/zsh-syntax-highlighting
Release today. I've been running the moral equivalent of the release for a month or so, so don't anticipate any issues. diff --git Makefile Makefile index b4e34f0af24..8cabaa8e673 100644 --- Makefile +++ Makefile @@ -1,8 +1,6 @@ COMMENT = fish like syntax highlighting for zsh -GH_ACCOUNT = zsh-users -GH_PROJECT = zsh-syntax-highlighting -GH_TAGNAME = 0.7.1 +DIST_TUPLE = github zsh-users zsh-syntax-highlighting 0.8.0 . CATEGORIES = shells diff --git distinfo distinfo index 61e99291e5b..3dd511a82d0 100644 --- distinfo +++ distinfo @@ -1,2 +1,2 @@ -SHA256 (zsh-syntax-highlighting-0.7.1.tar.gz) = 9QRCZu4ZhGixvOyIGlbmOZ4gllfW7Z+m0hF1vHav3vo= -SIZE (zsh-syntax-highlighting-0.7.1.tar.gz) = 133554 +SHA256 (zsh-users-zsh-syntax-highlighting-0.8.0.tar.gz) = WYHBnrqrAn41b+HuUoT3oCG4nUQFzFPchLR2w67pzDI= +SIZE (zsh-users-zsh-syntax-highlighting-0.8.0.tar.gz) = 155914
Update devel/mercurial to 6.2
Not a mercurial user, but passes a few quick checks. Tests fail in the
same way as they did for 5.8. Shell completers are installed correctly
now.
diff --git Makefile Makefile
index 28ad010a64c..022cc404225 100644
--- Makefile
+++ Makefile
@@ -1,12 +1,10 @@
COMMENT-main = fast, lightweight source control management
COMMENT-x11 = graphical tooling for mercurial
-MODPY_EGG_VERSION =5.8
+MODPY_EGG_VERSION =6.2
DISTNAME = mercurial-${MODPY_EGG_VERSION}
CATEGORIES = devel
-REVISION = 1
-
HOMEPAGE = https://www.mercurial-scm.org
# GPLv2
@@ -36,8 +34,7 @@ RUN_DEPENDS-x11 +=${BASE_PKGPATH},-main \
FILES =hgeditor hgweb.cgi
-CONTRIBFILES = bash_completion mercurial.el \
- tcsh_completion zsh_completion \
+CONTRIBFILES = mercurial.el tcsh_completion \
mq.el
CONTRIBDIRS = hgsh vim
diff --git distinfo distinfo
index a6fabe184d2..9a10d621347 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (mercurial-5.8.tar.gz) = /F1qj2R42I74PN0Ktthq1o7nIrvfSWTmoLR8PGulMJ8=
-SIZE (mercurial-5.8.tar.gz) = 7985326
+SHA256 (mercurial-6.2.tar.gz) = 04K14/q4kxEmATIBcxQWV0s1roV4dAS7KggZ9Bu4iXI=
+SIZE (mercurial-6.2.tar.gz) = 8053713
diff --git pkg/PLIST-main pkg/PLIST-main
index 72a6120b1c1..a0a03f97dd9 100644
--- pkg/PLIST-main
+++ pkg/PLIST-main
@@ -5,10 +5,8 @@ lib/python${MODPY_VERSION}/site-packages/hgdemandimport/
lib/python${MODPY_VERSION}/site-packages/hgdemandimport/__init__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/hgdemandimport/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/hgdemandimport/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/hgdemandimport/${MODPY_PYCACHE}demandimportpy2.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/hgdemandimport/${MODPY_PYCACHE}demandimportpy3.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/hgdemandimport/${MODPY_PYCACHE}tracing.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/hgdemandimport/demandimportpy2.py
lib/python${MODPY_VERSION}/site-packages/hgdemandimport/demandimportpy3.py
lib/python${MODPY_VERSION}/site-packages/hgdemandimport/tracing.py
lib/python${MODPY_VERSION}/site-packages/hgext/
@@ -377,12 +375,12 @@
lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}diffhelper.${
lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}diffutil.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}dirstate.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}dirstateguard.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}dirstatemap.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}discovery.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}dispatch.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}encoding.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}error.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}exchange.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}exchangev2.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}extensions.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}exthelper.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}fancyopts.${MODPY_PYC_MAGIC_TAG}pyc
@@ -491,8 +489,6 @@
lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}wireprotoserv
lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}wireprototypes.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}wireprotov1peer.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}wireprotov1server.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}wireprotov2peer.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}wireprotov2server.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}worker.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/__version__.py
lib/python${MODPY_VERSION}/site-packages/mercurial/ancestor.py
@@ -554,13 +550,23 @@
lib/python${MODPY_VERSION}/site-packages/mercurial/diffhelper.py
lib/python${MODPY_VERSION}/site-packages/mercurial/diffutil.py
lib/python${MODPY_VERSION}/site-packages/mercurial/dirstate.py
login_krb5 build failure
I don't use login_krb5, but the error looks simple enough.
cc -o login_krb5 login.o login_krb5.o
$(/usr/local/heimdal/bin/krb5-config --deps --libs) -lutil
ld: error: duplicate symbol: __progname
>>> defined at /usr/lib/crt0.o:(__progname)
diff --git patches/patch-login_krb5_login_krb5_c
patches/patch-login_krb5_login_krb5_c
new file mode 100644
index 000..4cf196d5fbf
--- /dev/null
+++ patches/patch-login_krb5_login_krb5_c
@@ -0,0 +1,21 @@
+Index: login_krb5/login_krb5.c
+--- login_krb5/login_krb5.c.orig
login_krb5/login_krb5.c
+@@ -35,8 +35,6 @@ krb5_context context;
+ krb5_ccache ccache;
+ krb5_principal princ;
+
+-char *__progname;
+-
+ static void
+ krb5_syslog(krb5_context context, int level, krb5_error_code code, char *fmt,
...)
+ {
+@@ -98,7 +96,7 @@ krb5_login(char *username, char *invokinguser, char *p
+ if (username == NULL || password == NULL)
+ return (AUTH_FAILED);
+
+- if (strcmp(__progname, "-krb5-or-pwd") == 0 &&
++ if (strcmp(getprogname(), "-krb5-or-pwd") == 0 &&
+ strcmp(username,"root") == 0 && invokinguser[0] == '\0')
+ return (AUTH_FAILED);
+
Re: Fix build of shells/zsh for sparc64
On Mon, May 30, 2022 at 04:45:16PM -0400, Kurt Mosiejczuk wrote: > The patches for the 5.9 update which works fine for clang, but not for > either base-gcc or ports-gcc. The patch to zpty.c uses #elifdef which > clang knows, but wasn't introduced to gcc until 12.x. > > Better to use #elif defined, which works even on base-gcc. Sorry, I've changed it in my local tree so it'll be correct when upstreamed. One nit below. > ok? > > (cc maintainer and last person who submitted an update) > > --Kurt > > Index: patches/patch-Src_Modules_zpty_c > === > RCS file: /cvs/ports/shells/zsh/patches/patch-Src_Modules_zpty_c,v > retrieving revision 1.1 > diff -u -p -r1.1 patch-Src_Modules_zpty_c > --- patches/patch-Src_Modules_zpty_c 26 May 2022 07:44:43 - 1.1 > +++ patches/patch-Src_Modules_zpty_c 30 May 2022 20:25:22 - > @@ -42,7 +42,7 @@ Index: Src/Modules/zpty.c > +return 0; > +} > + > -+#elifdef USE_DEV_PTMX > ++#elif defined USE_DEV_PTMX I'd prefer #elif defined(USE_DEV_PTMX) to match the rest of the file. > + > #ifdef HAVE_SYS_STROPTS_H > #include > Index: patches/patch-configure_ac > === > RCS file: /cvs/ports/shells/zsh/patches/patch-configure_ac,v > retrieving revision 1.5 > diff -u -p -r1.5 patch-configure_ac > --- patches/patch-configure_ac26 May 2022 07:44:43 - 1.5 > +++ patches/patch-configure_ac30 May 2022 20:25:22 - > @@ -1,7 +1,7 @@ > Index: configure.ac > --- configure.ac.orig > +++ configure.ac > -@@ -2401,6 +2401,37 @@ dnl --- > +@@ -2460,6 +2460,37 @@ dnl --- > zsh_CHECK_SOCKLEN_T > > dnl ---
Re: shells/zsh: Update to 5.9
ping; still running without issues here
On Mon, May 16, 2022 at 07:46:20AM -0500, Matthew Martin wrote:
> zsh 5.9 was just announced[1]. I've been running the below for about
> a day and the prior release candidate for about a week before that
> without issues.
>
> This update is a bit larger than usual. I finally tracked down the
> occasionally failing test in V08zpty. If you open a terminal to run make
> test, open and then close a separate terminal, and then run the tests
> without the below patch, tests that use zpty will hang because getpty
> cannot open the corresponding /dev/tty. The below patch uses openpty(3)
> instead which fixes the hang. The open and close a terminal is needed so
> the next available /dev/pty,tty pair are owned by your user.
>
> I found this too close to the release to include in 5.9, but assuming it
> looks good and there's no fallout, will work to get it upstreamed.
> Since configure.ac is changed, need to run Util/preconfig to regenerate
> the configure script. This should all go away next release. The other
> test failure is known and because regexec(3) is not unicode aware.
>
> - Matthew Martin
>
> 1: https://www.zsh.org/mla/announce/msg00134.html
>
diff --git Makefile Makefile
index 376e8298c38..b6ee32c4dfc 100644
--- Makefile
+++ Makefile
@@ -1,6 +1,6 @@
COMMENT= Z shell, Bourne shell-compatible
-V= 5.8.1
+V= 5.9
DISTNAME= zsh-$V
CATEGORIES=shells
@@ -21,7 +21,7 @@ WANTLIB= c curses iconv m pcre
LIB_DEPENDS= converters/libiconv \
devel/pcre
-CONFIGURE_STYLE=gnu
+CONFIGURE_STYLE=autoconf
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
@@ -34,6 +34,8 @@ CONFIGURE_ARGS= --disable-zsh-mem \
--disable-gdbm \
--with-tcsetpgrp
+AUTOCONF_VERSION= 2.71
+
SUBST_VARS=V
EXTFILES= Calendar/calendar_add Example/cat Example/zless \
@@ -43,6 +45,7 @@ EXTFILES= Calendar/calendar_add Example/cat Example/zless
\
Misc/zed Misc/zkbd
pre-configure:
+ cd ${WRKSRC} && ./Util/preconfig
.for i in ${EXTFILES}
sed -i -e "s,/bin/zsh,${TRUEPREFIX}/bin/zsh,g" \
${WRKSRC}/Functions/${i}
diff --git distinfo distinfo
index 62b4cf054d1..c5db9957732 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (zsh-5.8.1.tar.xz) = tpc1ILrOYAtHeSACabHl155fUFrElSBYwRrVu/DdmRk=
-SIZE (zsh-5.8.1.tar.xz) = 3200540
+SHA256 (zsh-5.9.tar.xz) = m40ezt1bXoH78ZGOh2dSp92UjgXBoNuhCrhjhC1FrNU=
+SIZE (zsh-5.9.tar.xz) = 3332400
diff --git patches/patch-Src_Modules_zpty_c patches/patch-Src_Modules_zpty_c
new file mode 100644
index 000..4e2b3a70377
--- /dev/null
+++ patches/patch-Src_Modules_zpty_c
@@ -0,0 +1,63 @@
+Index: Src/Modules/zpty.c
+--- Src/Modules/zpty.c.orig
Src/Modules/zpty.c
+@@ -37,6 +37,15 @@
+ #endif
+ #endif
+
++#ifdef HAVE_OPENPTY
++#ifdef OPENPTY_REQUIRES_PTY
++#include
++#elif defined(OPENPTY_REQUIRES_UTIL)
++#include
++#include
++#endif
++#endif
++
+ /* The number of bytes we normally read when given no pattern and the
+ * upper bound on the number of bytes we read (even if we are give a
+ * pattern). */
+@@ -161,9 +170,27 @@ getptycmd(char *name)
+ return NULL;
+ }
+
+-/* posix_openpt() seems to have some problem on OpenBSD */
+-#if defined(USE_DEV_PTMX) && !defined(__OpenBSD__)
++#ifdef HAVE_OPENPTY
+
++static int
++get_pty(int master, int *retfd)
++{
++static int mfd, sfd;
++
++if (master) {
++ if (openpty(, , NULL, NULL, NULL) == -1) {
++ return 1;
++ }
++ *retfd = mfd;
++ return 0;
++}
++
++*retfd = sfd;
++return 0;
++}
++
++#elifdef USE_DEV_PTMX
++
+ #ifdef HAVE_SYS_STROPTS_H
+ #include
+ #endif
+@@ -261,12 +288,7 @@ get_pty(int master, int *retfd)
+ #elif defined(__FreeBSD__) || defined(__DragonFly__)
+ static char char1[] = "pqrsPQRS";
+ static char char2[] = "0123456789abcdefghijklmnopqrstuv";
+-#elif defined(__OpenBSD__)
+-static char char1[] = "pqrstuvwxyzPQRST";
+-static char char2[] = "0123456789"
+- "abcdefghijklmnopqrstuvwxyz"
+- "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+-#else /* __FreeBSD__ || __DragonFly__ || __OpenBSD*/
++#else /* __FreeBSD__ || __DragonFly__ */
+ static char char1[] = "pqrstuvwxyzPQRST";
+ static char char2[] = "0123456789abcdef";
+ #endif
diff --git patches/patch-configure_ac patches/patch-configure_ac
new file mode 100644
index 000..939be0046a2
--- /dev/null
+++ patches/patch-configure_ac
@@ -0,0 +1,41 @@
+Index: configure.ac
+--- configure.ac.orig
configure.ac
+@@ -2401,6 +2401,37 @@ dnl ---
+ zsh_CHECK_SOCKLEN_T
+
+ dnl ---
++dnl Check for openpty support
++dnl
shells/zsh: Update to 5.9
zsh 5.9 was just announced[1]. I've been running the below for about
a day and the prior release candidate for about a week before that
without issues.
This update is a bit larger than usual. I finally tracked down the
occasionally failing test in V08zpty. If you open a terminal to run make
test, open and then close a separate terminal, and then run the tests
without the below patch, tests that use zpty will hang because getpty
cannot open the corresponding /dev/tty. The below patch uses openpty(3)
instead which fixes the hang. The open and close a terminal is needed so
the next available /dev/pty,tty pair are owned by your user.
I found this too close to the release to include in 5.9, but assuming it
looks good and there's no fallout, will work to get it upstreamed.
Since configure.ac is changed, need to run Util/preconfig to regenerate
the configure script. This should all go away next release. The other
test failure is known and because regexec(3) is not unicode aware.
- Matthew Martin
1: https://www.zsh.org/mla/announce/msg00134.html
diff --git Makefile Makefile
index 376e8298c38..b6ee32c4dfc 100644
--- Makefile
+++ Makefile
@@ -1,6 +1,6 @@
COMMENT= Z shell, Bourne shell-compatible
-V= 5.8.1
+V= 5.9
DISTNAME= zsh-$V
CATEGORIES=shells
@@ -21,7 +21,7 @@ WANTLIB= c curses iconv m pcre
LIB_DEPENDS= converters/libiconv \
devel/pcre
-CONFIGURE_STYLE=gnu
+CONFIGURE_STYLE=autoconf
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
@@ -34,6 +34,8 @@ CONFIGURE_ARGS= --disable-zsh-mem \
--disable-gdbm \
--with-tcsetpgrp
+AUTOCONF_VERSION= 2.71
+
SUBST_VARS=V
EXTFILES= Calendar/calendar_add Example/cat Example/zless \
@@ -43,6 +45,7 @@ EXTFILES= Calendar/calendar_add Example/cat Example/zless
\
Misc/zed Misc/zkbd
pre-configure:
+ cd ${WRKSRC} && ./Util/preconfig
.for i in ${EXTFILES}
sed -i -e "s,/bin/zsh,${TRUEPREFIX}/bin/zsh,g" \
${WRKSRC}/Functions/${i}
diff --git distinfo distinfo
index 62b4cf054d1..c5db9957732 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (zsh-5.8.1.tar.xz) = tpc1ILrOYAtHeSACabHl155fUFrElSBYwRrVu/DdmRk=
-SIZE (zsh-5.8.1.tar.xz) = 3200540
+SHA256 (zsh-5.9.tar.xz) = m40ezt1bXoH78ZGOh2dSp92UjgXBoNuhCrhjhC1FrNU=
+SIZE (zsh-5.9.tar.xz) = 3332400
diff --git patches/patch-Src_Modules_zpty_c patches/patch-Src_Modules_zpty_c
new file mode 100644
index 000..4e2b3a70377
--- /dev/null
+++ patches/patch-Src_Modules_zpty_c
@@ -0,0 +1,63 @@
+Index: Src/Modules/zpty.c
+--- Src/Modules/zpty.c.orig
Src/Modules/zpty.c
+@@ -37,6 +37,15 @@
+ #endif
+ #endif
+
++#ifdef HAVE_OPENPTY
++#ifdef OPENPTY_REQUIRES_PTY
++#include
++#elif defined(OPENPTY_REQUIRES_UTIL)
++#include
++#include
++#endif
++#endif
++
+ /* The number of bytes we normally read when given no pattern and the
+ * upper bound on the number of bytes we read (even if we are give a
+ * pattern). */
+@@ -161,9 +170,27 @@ getptycmd(char *name)
+ return NULL;
+ }
+
+-/* posix_openpt() seems to have some problem on OpenBSD */
+-#if defined(USE_DEV_PTMX) && !defined(__OpenBSD__)
++#ifdef HAVE_OPENPTY
+
++static int
++get_pty(int master, int *retfd)
++{
++static int mfd, sfd;
++
++if (master) {
++ if (openpty(, , NULL, NULL, NULL) == -1) {
++ return 1;
++ }
++ *retfd = mfd;
++ return 0;
++}
++
++*retfd = sfd;
++return 0;
++}
++
++#elifdef USE_DEV_PTMX
++
+ #ifdef HAVE_SYS_STROPTS_H
+ #include
+ #endif
+@@ -261,12 +288,7 @@ get_pty(int master, int *retfd)
+ #elif defined(__FreeBSD__) || defined(__DragonFly__)
+ static char char1[] = "pqrsPQRS";
+ static char char2[] = "0123456789abcdefghijklmnopqrstuv";
+-#elif defined(__OpenBSD__)
+-static char char1[] = "pqrstuvwxyzPQRST";
+-static char char2[] = "0123456789"
+- "abcdefghijklmnopqrstuvwxyz"
+- "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+-#else /* __FreeBSD__ || __DragonFly__ || __OpenBSD*/
++#else /* __FreeBSD__ || __DragonFly__ */
+ static char char1[] = "pqrstuvwxyzPQRST";
+ static char char2[] = "0123456789abcdef";
+ #endif
diff --git patches/patch-configure_ac patches/patch-configure_ac
new file mode 100644
index 000..939be0046a2
--- /dev/null
+++ patches/patch-configure_ac
@@ -0,0 +1,41 @@
+Index: configure.ac
+--- configure.ac.orig
configure.ac
+@@ -2401,6 +2401,37 @@ dnl ---
+ zsh_CHECK_SOCKLEN_T
+
+ dnl ---
++dnl Check for openpty support
++dnl ---
++AH_TEMPLATE([HAVE_OPENPTY],
++ [Define to 1 if you have the `openpty' function.])
++AH_TEMPLATE([OPENPTY_REQUIRES_PTY],
++ [Define to 1 if the `openpty' function requires pty.h.])
++AH_TEMPLATE([OPEN
shells/zsh and _pbuild can't open /dev/ttyxx
zsh is nearing a release and since OpenBSD is too, I thought I'd get
some early testing in. (Though at this point the timing won't work out.)
A pty test has been failing for a while, but a newly added test is now
hanging on [1]
ret = read(master, , 1);
I believe the root cause basically boils down to opening /dev/ptyxx for
some xx and then opening the corresponding /dev/ttyxx fails for _pbuild
but not as my user. The below code runs for me, but fails when run under
_pbuild.
Normally I'd try to dig further, but I don't know if I'll have time
before it's too late for the release.
1:
https://github.com/zsh-users/zsh/blob/29f97c1f9447335c8f088f1cf809d90004e78053/Src/Modules/zpty.c#L473
% ./a.out
3: /dev/ptyp5
4: /dev/ttyp5
% doas -u _pbuild ./a.out
3: /dev/ptyp5
a.out: open: Permission denied
#include
#include
#include
#include
#include
static int
get_pty(char *path) {
const char char1[] = "pqrstuvwxyzPQRST";
const char char2[] = "0123456789"
"abcdefghijklmnopqrstuvwxyz"
"ABCDEFGHIJKLMNOPQRSTUVWXYZ";
const char *p1, *p2;
int fd;
strcpy(path, "/dev/ptyxx");
for (p1 = char1; *p1; p1++) {
path[8] = *p1;
for (p2 = char2; *p2; p2++) {
path[9] = *p2;
if ((fd = open(path, O_RDWR|O_NOCTTY)) >= 0) {
return fd;
}
}
}
return -1;
}
int
main() {
char path[11];
int ptyfd, ttyfd;
if ((ptyfd = get_pty(path)) == -1) {
err(1, "get_pty");
}
printf("%d: %s\n", ptyfd, path);
path[5] = 't';
if ((ttyfd = open(path, O_RDWR|O_NOCTTY)) == -1) {
err(1, "open");
}
printf("%d: %s\n", ttyfd, path);
}
shells/zsh: Update to 5.8.1 for CVE-2021-45444
zsh 5.8.1 was released today. make test fails in the same way it did for 5.8. This is a stable security release with a few bug fixes, including one for CVE-2021-45444, a vulnerability in prompt expansion which could be exploited through e.g. VCS_Info to execute arbitrary shell commands without a user's knowledge. All sites are encouraged to update from zsh 5.8. A partial work-around which can be applied within a running shell is provided in the source distribution for those who are unable to update their shell binaries. https://www.zsh.org/mla/announce/msg00133.html diff --git Makefile Makefile index 7d9cee17bd6..20323e17b30 100644 --- Makefile +++ Makefile @@ -2,8 +2,7 @@ COMMENT= Z shell, Bourne shell-compatible -V= 5.8 -REVISION = 0 +V= 5.8.1 DISTNAME= zsh-$V CATEGORIES=shells diff --git distinfo distinfo index 3c4b1f7fa0f..62b4cf054d1 100644 --- distinfo +++ distinfo @@ -1,2 +1,2 @@ -SHA256 (zsh-5.8.tar.xz) = 3MS1TMVWVnCmVYF2AmHBY9cgmR8NBkhtph+Ng5tS3ic= -SIZE (zsh-5.8.tar.xz) = 3193284 +SHA256 (zsh-5.8.1.tar.xz) = tpc1ILrOYAtHeSACabHl155fUFrElSBYwRrVu/DdmRk= +SIZE (zsh-5.8.1.tar.xz) = 3200540
devel/ninja: Fix shell completion
Install the zsh completion function to site-functions. From other ports
share/bash-completion/completions seems to be the right location, but
someone should double check me on that.
diff --git Makefile Makefile
index 7c5972e0079..527dc13ef33 100644
--- Makefile
+++ Makefile
@@ -10,7 +10,7 @@ COMMENT = small build system with a focus on speed
GH_ACCOUNT = ninja-build
GH_PROJECT = ninja
GH_TAGNAME = v1.10.2
-REVISION = 0
+REVISION = 1
CATEGORIES = devel
@@ -48,13 +48,15 @@ do-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ninja
${INSTALL_DATA} ${WRKSRC}/doc/manual.asciidoc ${PREFIX}/share/doc/ninja
${INSTALL_DATA_DIR} ${PREFIX}/share/ninja
- ${INSTALL_DATA} ${WRKSRC}/misc/bash-completion ${PREFIX}/share/ninja
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/bash-completion/completions
+ ${INSTALL_DATA} ${WRKSRC}/misc/bash-completion
${PREFIX}/share/bash-completion/completions/ninja
${INSTALL_DATA} ${WRKSRC}/misc/ninja-mode.el ${PREFIX}/share/ninja
${INSTALL_DATA} ${WRKSRC}/misc/ninja.vim ${PREFIX}/share/ninja
${INSTALL_DATA} ${WRKSRC}/misc/ninja_syntax.py ${PREFIX}/share/ninja
${INSTALL_DATA} ${WRKSRC}/misc/write_fake_manifests.py
${PREFIX}/share/ninja
${INSTALL_DATA} ${WRKSRC}/misc/measure.py ${PREFIX}/share/ninja
- ${INSTALL_DATA} ${WRKSRC}/misc/zsh-completion ${PREFIX}/share/ninja
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/zsh/site-functions
+ ${INSTALL_DATA} ${WRKSRC}/misc/zsh-completion
${PREFIX}/share/zsh/site-functions/_ninja
do-test:
@cd ${WRKSRC} && ${SETENV} ${ALL_TEST_ENV} ./ninja ninja_test \
diff --git pkg/PLIST pkg/PLIST
index a51ca80a2cd..ffa4fa99ff3 100644
--- pkg/PLIST
+++ pkg/PLIST
@@ -1,12 +1,16 @@
@comment $OpenBSD: PLIST,v 1.3 2017/09/20 07:30:19 giovanni Exp $
@bin bin/ninja
+share/bash-completion/
+share/bash-completion/completions/
+share/bash-completion/completions/ninja
share/doc/ninja/
share/doc/ninja/manual.asciidoc
share/ninja/
-share/ninja/bash-completion
share/ninja/measure.py
share/ninja/ninja-mode.el
share/ninja/ninja.vim
share/ninja/ninja_syntax.py
share/ninja/write_fake_manifests.py
-share/ninja/zsh-completion
+share/zsh/
+share/zsh/site-functions/
+share/zsh/site-functions/_ninja
audio/pulseaudio: Fix zsh completion
Third party zsh completers should be installed to zsh/site-functions[1].
Since that's what pulseaudio does by default, just remove the flag.
1: https://github.com/zsh-users/zsh/blob/master/INSTALL#L257
diff --git Makefile Makefile
index a1863c1ee46..2eb0f4eccc5 100644
--- Makefile
+++ Makefile
@@ -5,6 +5,7 @@ COMMENT=cross-platform networked sound server
VERSION= 15.0
DISTNAME= pulseaudio-${VERSION}
EXTRACT_SUFX= .tar.xz
+REVISION= 0
SHARED_LIBS += pulse 7.2 # 0.24.0
SHARED_LIBS += pulse-simple 1.2 # 0.1.1
@@ -67,7 +68,6 @@ CONFIGURE_ARGS= -Ddoxygen=false \
-Ddatabase=tdb \
-Datomic-arm-linux-helpers=false \
-Dbashcompletiondir=${PREFIX}/share/bash-completion/completions \
-
-Dzshcompletiondir=${PREFIX}/share/zsh/vendor-completions \
-Dalsa=disabled \
-Dasyncns=disabled \
-Davahi=disabled \
diff --git pkg/PLIST pkg/PLIST
index c5b8d9e969c..146c104d87b 100644
--- pkg/PLIST
+++ pkg/PLIST
@@ -238,5 +238,5 @@ share/vala/vapi/libpulse-simple.vapi
share/vala/vapi/libpulse.deps
share/vala/vapi/libpulse.vapi
share/zsh/
-share/zsh/vendor-completions/
-share/zsh/vendor-completions/_pulseaudio
+share/zsh/site-functions/
+share/zsh/site-functions/_pulseaudio
Re: shells/zsh: Keep $OSTYPE up to date
On Sat, Mar 27, 2021 at 09:36:24PM +0100, Christian Weisgerber wrote: > Matthew Martin: > > > A while back [1] it was noted zsh's $OSTYPE is out of sync with the OS > > version. > > > > 1: https://marc.info/?l=openbsd-ports=160940571013139=2 > > I don't think there's a problem to solve. > > OSTYPE describes the operating system this instance of zsh (or bash) > was compiled on. There are all sorts of programs that include this > information, e.g. mutt -v. In practice OSTYPE is used to determine the operating system on which the script is running. For example completers will consult OSTYPE to determine which options a utility supports; some completers will match against the version number to further refine the completions provided. However, there are no completers for OpenBSD which depend on the version number at present and I at least only target -current when adding or updating completers. I see it as a matter of correctness, and at least one user has noticed the discrepancy. I would be happy to send in REVISION bump patches each -beta crank if that's acceptable; though I also understand not wanting the churn.
shells/zsh: Keep $OSTYPE up to date
A while back [1] it was noted zsh's $OSTYPE is out of sync with the OS version. The below patch uses $(OSrev) to automatically bump REVISION when the OS version changes. In the case a normal REVISION bump is needed, the constant can be decremented. When updated to a new release, the constant should be updated to the current OSrev value (which means REVISION will start at 0 not blank, but that seems fairly unimportant.) Thoughts or other suggestions? 1: https://marc.info/?l=openbsd-ports=160940571013139=2 diff --git Makefile Makefile index 7d9cee17bd6..02b28a7bb19 100644 --- Makefile +++ Makefile @@ -3,7 +3,8 @@ COMMENT= Z shell, Bourne shell-compatible V= 5.8 -REVISION = 0 +# Keep $OSTYPE up to date +REVISION !=expr $(OSrev) - 68 DISTNAME= zsh-$V CATEGORIES=shells
Re: quirks botched commit
On Thu, Feb 25, 2021 at 10:16:03AM +, Mikolaj Kucharski wrote:
> On Thu, Feb 25, 2021 at 11:04:06AM +0100, Marc Espie wrote:
> > On Thu, Feb 25, 2021 at 09:53:04AM +0100, Marc Espie wrote:
> > > next time, please remember to build it.
> > > there's a reason do-build checks the syntax of those perl files.
> >
> > morning brainfart, of course it built. Which begs the question how come the
> > syntax check didn't get it
> >
>
> $ find files/ -type f -name \*.pm -print -exec /usr/bin/false \;
> files/Quirks.pm
> files/Quirks/ghc.pm
>
> $ echo $?
> 0
A non-zero exit for -exec ...\; is not propagated to find's exit status
as it's just a filter. A non-zero exit for -exec ...+ is however.
Since perl -c doesn't seem to support checking multiple files at once,
a simple s/\\;/+/ doesn't work, but this does.
diff --git Makefile Makefile
index 02d43cc077f..d4ef43c0b39 100644
--- Makefile
+++ Makefile
@@ -15,7 +15,7 @@ PERMIT_PACKAGE = Yes
PERLDIR = ${PREFIX}/libdata/perl5/site_perl
do-build:
- @find ${FILESDIR} -type f -name \*.pm -exec perl -c {} \;
+ @find ${FILESDIR} -type f -name \*.pm ! -exec perl -c {} \; -exec false
{} +
do-install:
${INSTALL_DATA_DIR} ${PERLDIR}/OpenBSD/Quirks
Re: [update] devel/libtermkey
On Sun, May 31, 2020 at 10:12:47PM +0100, Edd Barrett wrote: > Hi Matthew, > > On Sun, May 31, 2020 at 11:11:59AM -0500, Matthew Martin wrote: > > ping > > This and you unibilium diff look fine to me. One small comment below > (applicable to both). > > > > No change in symbols and the diff doesn't seem to touch any public > > > functions. Only bumped minor because upstream did. > > ^ Sounds like it may not strictly be necessary ABI-wise, but I'd be > tempted to leave your bump in anyway. > > Did you check the public types as well as the functions? unibilium.h and termkey.h are unchanged in the updates save for a bump to TERMKEY_VERSION_MINOR in the latter.
New: devel/libtickit
libtermkey is deprecated for new applications in favor of libtickit; however, currently nothing in the ports tree will use it. I'm using libtickit for a personal project, but can maintain it in my tree until neovim or another port uses it. This library provides an abstracted mechanism for building interactive full-screen terminal programs. It provides a full set of output drawing functions, and handles keyboard and mouse input events. libtickit.tgz Description: application/tar-gz
Re: [update] devel/libtermkey
ping
On Sat, May 23, 2020 at 08:12:11PM -0500, Matthew Martin wrote:
> No change in symbols and the diff doesn't seem to touch any public
> functions. Only bumped minor because upstream did.
>
> neovim and vis run fine with this. The new patch allows the vis test
> suite to run without the TEST_ENV = TERM=${TERM} hack. I'll ask upstream
> about adding the patch, but libtermkey is deprecated in favor of
> libtickit (will send that port after the 0.4.0 release).
>
> 0.22 - changes: bugfixes for unit tests on BSD platforms
> 0.21.1 - changes: internal bugfixes, valgrind neatness
>
diff --git Makefile Makefile
index e5bd66764f9..2ea5107ffc2 100644
--- Makefile
+++ Makefile
@@ -1,10 +1,9 @@
# $OpenBSD: Makefile,v 1.4 2019/07/12 20:44:40 sthen Exp $
COMMENT = library for processing of keyboard entry from a terminal
-DISTNAME = libtermkey-0.20
-REVISION = 0
+DISTNAME = libtermkey-0.22
-SHARED_LIBS += termkey 0.1 # 15.0
+SHARED_LIBS += termkey 0.2 # 15.2
CATEGORIES = devel
HOMEPAGE = http://www.leonerd.org.uk/code/libtermkey/
diff --git distinfo distinfo
index 522108c35ed..81ce3702ceb 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (libtermkey-0.20.tar.gz) = bA2HyUq5kV527NMTuuwI3t871W3oN0PZqpI6CBk10vU=
-SIZE (libtermkey-0.20.tar.gz) = 45167
+SHA256 (libtermkey-0.22.tar.gz) = aUW9PEqqg9qD2AoEXFVj2k7dfQN0xiwNNa7AnrMBRgA=
+SIZE (libtermkey-0.22.tar.gz) = 46147
diff --git patches/patch-Makefile patches/patch-Makefile
index aee3dddc084..4ef14700525 100644
--- patches/patch-Makefile
+++ patches/patch-Makefile
@@ -3,9 +3,10 @@ $OpenBSD: patch-Makefile,v 1.1.1.1 2017/01/19 20:34:04 edd Exp
$
Don't compresss manuals and remove odd symlinking scheme to alias man pages. As
it happens mandoc is clever enough to figure out the aliases.
Makefile.orig Fri Dec 16 16:08:07 2016
-+++ Makefile Tue Jan 17 23:15:29 2017
-@@ -120,12 +120,9 @@ install-man:
+Index: Makefile
+--- Makefile.orig
Makefile
+@@ -122,12 +122,9 @@ install-man:
install -d $(DESTDIR)$(MAN3DIR)
install -d $(DESTDIR)$(MAN7DIR)
for F in man/*.3; do \
diff --git patches/patch-termkey_c patches/patch-termkey_c
new file mode 100644
index 000..a6a94f6feac
--- /dev/null
+++ patches/patch-termkey_c
@@ -0,0 +1,17 @@
+$OpenBSD$
+
+unibi_from_term requires term to be non-NULL
+
+Index: termkey.c
+--- termkey.c.orig
termkey.c
+@@ -420,6 +420,9 @@ TermKey *termkey_new(int fd, int flags)
+ termkey_set_flags(tk, flags);
+
+ const char *term = getenv("TERM");
++ if (!term) {
++term = "xterm";
++ }
+
+ if(!termkey_init(tk, term))
+ goto abort;
Re: [update] devel/unibilium
ping On Sat, May 23, 2020 at 08:11:32PM -0500, Matthew Martin wrote: > Update to unibilium. No change in symbols and the diff doesn't seem to > touch any public functions. Only bumped minor because upstream did. > > Tests pass and libtermkey (up next), neovim, and vis seem ok. > > 2.1.0 2020-02-11 > - Makefile: use "-f" with prove always (to show failed tests) (#13) > - Stop searching in further dirs on errors except ENOENT #12 > - Makefile: do not rebuild t/static_%.c with updated gen-static-test > - Add CMakeLists.txt and support for MSVC (#3) > - Relax checks for extended capability to support new format (#5) > - Makefile: use -Og with DEBUG=1 (#7) > - unibi_from_mem: fix [clang-analyzer-deadcode.DeadStores] (#8) > - Makefile: revisit regenerate-tests rule (#6) > - unibi_from_term: handle $TERMINFO as curses does #2 > diff --git Makefile Makefile index 8af2e12f4fa..25e88c9f8b4 100644 --- Makefile +++ Makefile @@ -4,9 +4,9 @@ COMMENT = very basic terminfo library GH_ACCOUNT = neovim GH_PROJECT = unibilium -GH_TAGNAME = v2.0.0 +GH_TAGNAME = v2.1.0 -SHARED_LIBS += unibilium 1.0 # 4.0 +SHARED_LIBS += unibilium 1.1 # 4.1 CATEGORIES = devel diff --git distinfo distinfo index b531af481ad..3d6bd8e15fd 100644 --- distinfo +++ distinfo @@ -1,2 +1,2 @@ -SHA256 (unibilium-2.0.0.tar.gz) = eJl9ONTIF3xg09DBqoxT/QgG6yGCW3szWxdo1xFrwcE= -SIZE (unibilium-2.0.0.tar.gz) = 112570 +SHA256 (unibilium-2.1.0.tar.gz) = Bb+X41dhXiGBJvesCG5wVqI9wBPPrHFkO1ChitOQx9Q= +SIZE (unibilium-2.1.0.tar.gz) = 121971 diff --git patches/patch-Makefile patches/patch-Makefile index 397d2e8fe7f..3a069bd7379 100644 --- patches/patch-Makefile +++ patches/patch-Makefile @@ -24,4 +24,4 @@ Index: Makefile + $(POD2MAN) $(POD2MAN_OPTS) $< > $@ - .PHONY: regenerate-tests + # Regenerate static test files, based on existing terminfo entries.
Re: New: zsh-syntax-highlighting
On Fri, May 15, 2020 at 06:57:37AM +0200, Rafael Sadowski wrote: > On Tue Apr 21, 2020 at 06:35:38AM +0200, Rafael Sadowski wrote: > > On Sat Apr 11, 2020 at 08:16:55AM +0200, Rafael Sadowski wrote: > > > On Fri Apr 10, 2020 at 09:11:25AM -0500, Matthew Martin wrote: > > > > On Fri, Apr 10, 2020 at 09:13:43AM +0200, Rafael Sadowski wrote: > > > > > On Thu Apr 09, 2020 at 09:43:36PM -0500, Matthew Martin wrote: > > > > > > Small port for zsh-syntax-highlighting. Currently have it in > > > > > > shells, but > > > > > > more than happy to move it if someone has a better suggestion. To > > > > > > test > > > > > > source > > > > > > /usr/local/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh > > > > > > after installing. > > > > > > > > > > > > DESCR: > > > > > > This package provides syntax highlighting for the shell zsh. It > > > > > > enables > > > > > > highlighting of commands whilst they are typed at a zsh prompt into > > > > > > an > > > > > > interactive terminal. This helps in reviewing commands before > > > > > > running them, > > > > > > particularly in catching syntax errors. > > > > > > > > > > Looks good and works here but do we need the following files to > > > > > install? > > > > > share/zsh-syntax-highlighting/.revision-hash > > > > > share/zsh-syntax-highlighting/.version > > > > > > > > .version is used to populate $ZSH_HIGHLIGHT_VERSION and .revision-hash > > > > for $ZSH_HIGHLIGHT_REVISION. I'll upstream a commit to skip > > > > .revision-hash for releases, but I'd prefer to avoid local patches. > > > > > > > > > > Ok for me. OK rsadowski@ if someone wants to import it. > > > > > > > Anyone else? > > > ... Friendly reminder ping; tarball reattached if that helps. zsh-syntax-highlighting.tgz Description: application/tar-gz
[update] devel/libtermkey
No change in symbols and the diff doesn't seem to touch any public
functions. Only bumped minor because upstream did.
neovim and vis run fine with this. The new patch allows the vis test
suite to run without the TEST_ENV = TERM=${TERM} hack. I'll ask upstream
about adding the patch, but libtermkey is deprecated in favor of
libtickit (will send that port after the 0.4.0 release).
0.22 - changes: bugfixes for unit tests on BSD platforms
0.21.1 - changes: internal bugfixes, valgrind neatness
diff --git Makefile Makefile
index e5bd66764f9..2ea5107ffc2 100644
--- Makefile
+++ Makefile
@@ -1,10 +1,9 @@
# $OpenBSD: Makefile,v 1.4 2019/07/12 20:44:40 sthen Exp $
COMMENT = library for processing of keyboard entry from a terminal
-DISTNAME = libtermkey-0.20
-REVISION = 0
+DISTNAME = libtermkey-0.22
-SHARED_LIBS += termkey 0.1 # 15.0
+SHARED_LIBS += termkey 0.2 # 15.2
CATEGORIES = devel
HOMEPAGE = http://www.leonerd.org.uk/code/libtermkey/
diff --git distinfo distinfo
index 522108c35ed..81ce3702ceb 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (libtermkey-0.20.tar.gz) = bA2HyUq5kV527NMTuuwI3t871W3oN0PZqpI6CBk10vU=
-SIZE (libtermkey-0.20.tar.gz) = 45167
+SHA256 (libtermkey-0.22.tar.gz) = aUW9PEqqg9qD2AoEXFVj2k7dfQN0xiwNNa7AnrMBRgA=
+SIZE (libtermkey-0.22.tar.gz) = 46147
diff --git patches/patch-Makefile patches/patch-Makefile
index aee3dddc084..4ef14700525 100644
--- patches/patch-Makefile
+++ patches/patch-Makefile
@@ -3,9 +3,10 @@ $OpenBSD: patch-Makefile,v 1.1.1.1 2017/01/19 20:34:04 edd Exp
$
Don't compresss manuals and remove odd symlinking scheme to alias man pages. As
it happens mandoc is clever enough to figure out the aliases.
Makefile.orig Fri Dec 16 16:08:07 2016
-+++ Makefile Tue Jan 17 23:15:29 2017
-@@ -120,12 +120,9 @@ install-man:
+Index: Makefile
+--- Makefile.orig
Makefile
+@@ -122,12 +122,9 @@ install-man:
install -d $(DESTDIR)$(MAN3DIR)
install -d $(DESTDIR)$(MAN7DIR)
for F in man/*.3; do \
diff --git patches/patch-termkey_c patches/patch-termkey_c
new file mode 100644
index 000..a6a94f6feac
--- /dev/null
+++ patches/patch-termkey_c
@@ -0,0 +1,17 @@
+$OpenBSD$
+
+unibi_from_term requires term to be non-NULL
+
+Index: termkey.c
+--- termkey.c.orig
termkey.c
+@@ -420,6 +420,9 @@ TermKey *termkey_new(int fd, int flags)
+ termkey_set_flags(tk, flags);
+
+ const char *term = getenv("TERM");
++ if (!term) {
++term = "xterm";
++ }
+
+ if(!termkey_init(tk, term))
+ goto abort;
[update] devel/unibilium
Update to unibilium. No change in symbols and the diff doesn't seem to touch any public functions. Only bumped minor because upstream did. Tests pass and libtermkey (up next), neovim, and vis seem ok. 2.1.0 2020-02-11 - Makefile: use "-f" with prove always (to show failed tests) (#13) - Stop searching in further dirs on errors except ENOENT #12 - Makefile: do not rebuild t/static_%.c with updated gen-static-test - Add CMakeLists.txt and support for MSVC (#3) - Relax checks for extended capability to support new format (#5) - Makefile: use -Og with DEBUG=1 (#7) - unibi_from_mem: fix [clang-analyzer-deadcode.DeadStores] (#8) - Makefile: revisit regenerate-tests rule (#6) - unibi_from_term: handle $TERMINFO as curses does #2 diff --git Makefile Makefile index 8af2e12f4fa..25e88c9f8b4 100644 --- Makefile +++ Makefile @@ -4,9 +4,9 @@ COMMENT = very basic terminfo library GH_ACCOUNT = neovim GH_PROJECT = unibilium -GH_TAGNAME = v2.0.0 +GH_TAGNAME = v2.1.0 -SHARED_LIBS += unibilium 1.0 # 4.0 +SHARED_LIBS += unibilium 1.1 # 4.1 CATEGORIES = devel diff --git distinfo distinfo index b531af481ad..3d6bd8e15fd 100644 --- distinfo +++ distinfo @@ -1,2 +1,2 @@ -SHA256 (unibilium-2.0.0.tar.gz) = eJl9ONTIF3xg09DBqoxT/QgG6yGCW3szWxdo1xFrwcE= -SIZE (unibilium-2.0.0.tar.gz) = 112570 +SHA256 (unibilium-2.1.0.tar.gz) = Bb+X41dhXiGBJvesCG5wVqI9wBPPrHFkO1ChitOQx9Q= +SIZE (unibilium-2.1.0.tar.gz) = 121971 diff --git patches/patch-Makefile patches/patch-Makefile index 397d2e8fe7f..3a069bd7379 100644 --- patches/patch-Makefile +++ patches/patch-Makefile @@ -24,4 +24,4 @@ Index: Makefile + $(POD2MAN) $(POD2MAN_OPTS) $< > $@ - .PHONY: regenerate-tests + # Regenerate static test files, based on existing terminfo entries.
Re: github mirror
On Sun, Apr 19, 2020 at 09:32:21PM +0200, Rafael Sadowski wrote: > Use your own *global* gitignore. For more details see core.excludesFile: > https://git-scm.com/docs/gitignore Rather than the global gitignore, you can use the local repo-specific $GIT_DIR/info/exclude
Re: New: zsh-syntax-highlighting
On Fri, Apr 10, 2020 at 09:13:43AM +0200, Rafael Sadowski wrote: > On Thu Apr 09, 2020 at 09:43:36PM -0500, Matthew Martin wrote: > > Small port for zsh-syntax-highlighting. Currently have it in shells, but > > more than happy to move it if someone has a better suggestion. To test > > source > > /usr/local/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh > > after installing. > > > > DESCR: > > This package provides syntax highlighting for the shell zsh. It enables > > highlighting of commands whilst they are typed at a zsh prompt into an > > interactive terminal. This helps in reviewing commands before running them, > > particularly in catching syntax errors. > > Looks good and works here but do we need the following files to install? > share/zsh-syntax-highlighting/.revision-hash > share/zsh-syntax-highlighting/.version .version is used to populate $ZSH_HIGHLIGHT_VERSION and .revision-hash for $ZSH_HIGHLIGHT_REVISION. I'll upstream a commit to skip .revision-hash for releases, but I'd prefer to avoid local patches.
New: zsh-syntax-highlighting
Small port for zsh-syntax-highlighting. Currently have it in shells, but more than happy to move it if someone has a better suggestion. To test source /usr/local/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh after installing. DESCR: This package provides syntax highlighting for the shell zsh. It enables highlighting of commands whilst they are typed at a zsh prompt into an interactive terminal. This helps in reviewing commands before running them, particularly in catching syntax errors. zsh-syntax-highlighting.tgz Description: application/tar-gz
Re: UPDATE: shells/zsh
On Sat, Mar 28, 2020 at 09:46:56AM +0100, Rafael Sadowski wrote: > On Sat Mar 14, 2020 at 04:31:00PM -0500, Matthew Martin wrote: > > On Sat, Mar 14, 2020 at 08:21:10PM +0100, Rafael Sadowski wrote: > > > "Security and bug fix release with a few user visible additions." > > > Changelog: http://zsh.sourceforge.net/releases.html > > > > > > This release fixes CVE-2019-20044. (Not tested on OpenBSD) > > > > > > OK? Should it go into -stable without the @so changes? > > > > I have the same diff locally; however, I didn't send it because make > > test hangs in V08zpty and I haven't had time to look into it yet (the > > ./V08zpty.ztst: starting. > ./V08zpty.ztst: all tests successful. > > with > > OpenBSD 6.6-current (GENERIC.MP) #80: Thu Mar 26 22:10:03 MDT 2020 > dera...@amd64.openbsd.org:/usr/src/sys/arch/amd64/compile/GENERIC.MP Same here after updating base. Runs fine as well. (Aside during testing a race in W02 turned up; but since it's reproducable in 5.7.1, I see no reason to hold up the update.)
Re: UPDATE: shells/zsh
On Sat, Mar 14, 2020 at 08:21:10PM +0100, Rafael Sadowski wrote: > "Security and bug fix release with a few user visible additions." > Changelog: http://zsh.sourceforge.net/releases.html > > This release fixes CVE-2019-20044. (Not tested on OpenBSD) > > OK? Should it go into -stable without the @so changes? I have the same diff locally; however, I didn't send it because make test hangs in V08zpty and I haven't had time to look into it yet (the failure in D07multibyte is normal on OpenBSD). Does it not hang for you? Personally I think CVE-2019-20044 and the PRIVILEGED option are dumb and one shouldn't write security critical things in shell scripts, but I'm not against backporting it.
Re: git: Adding git-prompt and bash/tcsh/zsh completions
On Mon, Feb 10, 2020 at 07:42:11PM +0100, Johannes Kastl wrote: > Hi Matthew, > > thanks for the feedback. > > On 2020-02-10 19:10 Matthew Martin wrote: > > On Mon, Feb 10, 2020 at 04:56:54PM +0100, Johannes Kastl wrote: > >> Hi all, > >> > >> I was wondering why the git port/package was missing the git-prompt.sh > >> and the completion files for bash, tcsh and zsh. > > > > Please do not install the zsh completion file. zsh includes a better > > completer by default. The one in git's tree seems to be a shim to let > > zsh use the bash completer which isn't as detailed. > > The files are only put there, if someone wants to use them. But AFAIK > this has to be done manually, as this place it not search for > completions automatically. But please correct me if I am wrong. That's correct; however, in general zsh completers ought to be installed to share/zsh/site-functions/ so that they are automatically picked up. In this case since the 3rd party completer is not as good as the one provided by zsh, it would be a net negative to install it to the correct place. I don't see any value in installing the zsh completer as it is unlikely to ever be used.
Re: git: Adding git-prompt and bash/tcsh/zsh completions
On Mon, Feb 10, 2020 at 04:56:54PM +0100, Johannes Kastl wrote: > Hi all, > > I was wondering why the git port/package was missing the git-prompt.sh > and the completion files for bash, tcsh and zsh. Please do not install the zsh completion file. zsh includes a better completer by default. The one in git's tree seems to be a shim to let zsh use the bash completer which isn't as detailed. I have no opinion on the completion files for other shells. It may be nice to have a standardized place for bash completions, but I'll leave that to people who use the shell. - Matthew Martin
Update: textproc/zathura
Builds fine. I don't use it, so I'd appreciate if a user could test it
still works for them. Requires the girara update just sent. zsh tab
completion works without fpath modification.
diff --git Makefile Makefile
index b85e1d4fdad..71df90927f6 100644
--- Makefile
+++ Makefile
@@ -1,6 +1,6 @@
# $OpenBSD: Makefile,v 1.26 2019/07/12 20:50:17 sthen Exp $
-V =0.4.3
+V =0.4.5
REVISION = 0
COMMENT = document viewer for PDF and other formats with a
vi-like UI
DISTNAME = zathura-${V}
@@ -27,7 +27,7 @@ RUN_DEPENDS = devel/desktop-file-utils \
x11/gtk+3,-guic
LIB_DEPENDS = databases/sqlite3 \
devel/libmagic \
- x11/girara>=0.3.2 \
+ x11/girara>=0.3.4 \
print/texlive/base,-synctex
COMPILER = base-clang ports-gcc
diff --git distinfo distinfo
index 22b17339d20..39e35a7ccf4 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (zathura-0.4.3.tar.xz) = fhIZRCbXCWcOD0sLEHyA3SEyKIG1fUoL+aCZmEAv/UE=
-SIZE (zathura-0.4.3.tar.xz) = 145796
+SHA256 (zathura-0.4.5.tar.xz) = DDmXqvvNqq5gpFIvIIra390nWLQyzpTqFvvO6TfLdiw=
+SIZE (zathura-0.4.5.tar.xz) = 152720
diff --git pkg/PLIST pkg/PLIST
index e25874e6b9f..13e05d783e4 100644
--- pkg/PLIST
+++ pkg/PLIST
@@ -19,6 +19,9 @@ share/bash-completion/completions/zathura
share/dbus-1/interfaces/
share/dbus-1/interfaces/org.pwmt.zathura.xml
share/doc/pkg-readmes/${PKGSTEM}
+share/fish/
+share/fish/completions/
+share/fish/completions/zathura.fish
share/icons/hicolor/128x128/apps/org.pwmt.zathura.png
share/icons/hicolor/16x16/apps/org.pwmt.zathura.png
share/icons/hicolor/256x256/apps/org.pwmt.zathura.png
@@ -27,6 +30,7 @@ share/icons/hicolor/64x64/apps/org.pwmt.zathura.png
share/icons/scalable/
share/icons/scalable/apps/
share/icons/scalable/apps/org.pwmt.zathura.svg
+share/locale/ar/LC_MESSAGES/zathura.mo
share/locale/ca/LC_MESSAGES/zathura.mo
share/locale/cs/LC_MESSAGES/zathura.mo
share/locale/de/LC_MESSAGES/zathura.mo
@@ -61,8 +65,8 @@ share/locale/uk_UA/LC_MESSAGES/zathura.mo
share/metainfo/
share/metainfo/org.pwmt.zathura.appdata.xml
share/zsh/
-share/zsh/vendor-completions/
-share/zsh/vendor-completions/_zathura
@tag gtk-update-icon-cache %D/share/icons/hicolor
@tag gtk-update-icon-cache %D/share/icons/scalable
@tag update-desktop-database
+share/zsh/site-functions/
+share/zsh/site-functions/_zathura
Update: x11/girara
Required to update zathura.
Reviewing the diff at https://git.pwmt.org/pwmt/girara/compare/0.3.2...0.3.4
there was a symbol addition (girara_xdg_open_with_working_directory) and
a few exported symbols had a pointer arg made const. I think a minor
bump suffices here. Only consumer seems to be zathura which builds fine.
diff --git Makefile Makefile
index 61a91d9c39d..b749ba0f3a3 100644
--- Makefile
+++ Makefile
@@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.21 2019/07/13 22:12:09 naddy Exp $
COMMENT = user interface library from pwmt
-DISTNAME = girara-0.3.2
+DISTNAME = girara-0.3.4
-SHARED_LIBS += girara-gtk3 1.0 # 3.1
+SHARED_LIBS += girara-gtk3 1.1 # 3.1
EXTRACT_SUFX = .tar.xz
CATEGORIES = x11
diff --git distinfo distinfo
index 8d5d7072b3b..a261da12b08 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (girara-0.3.2.tar.xz) = FwA1OhAfPFIPmyLnnXHqWyaKnsMkeWz55kd12Wuwhs0=
-SIZE (girara-0.3.2.tar.xz) = 58220
+SHA256 (girara-0.3.4.tar.xz) = UfzaWlCmj6vUYftORnod79Ux2vyk9H9oUanrVnVssjI=
+SIZE (girara-0.3.4.tar.xz) = 58708
diff --git pkg/PLIST pkg/PLIST
index 107790e4b90..52e2753df66 100644
--- pkg/PLIST
+++ pkg/PLIST
@@ -20,6 +20,7 @@ include/girara/types.h
include/girara/utils.h
@lib lib/libgirara-gtk3.so.${LIBgirara-gtk3_VERSION}
lib/pkgconfig/girara-gtk3.pc
+share/locale/ar/LC_MESSAGES/libgirara-gtk3-3.mo
share/locale/de/LC_MESSAGES/libgirara-gtk3-3.mo
share/locale/el/LC_MESSAGES/libgirara-gtk3-3.mo
share/locale/eo/LC_MESSAGES/libgirara-gtk3-3.mo
@@ -31,4 +32,5 @@ share/locale/nl/LC_MESSAGES/libgirara-gtk3-3.mo
share/locale/pl/LC_MESSAGES/libgirara-gtk3-3.mo
share/locale/pt_BR/LC_MESSAGES/libgirara-gtk3-3.mo
share/locale/ru/LC_MESSAGES/libgirara-gtk3-3.mo
+share/locale/sv/LC_MESSAGES/libgirara-gtk3-3.mo
share/locale/tr/LC_MESSAGES/libgirara-gtk3-3.mo
sysutils/exa: Fix zsh completion
With this exa completes with no fpath changes.
diff --git Makefile Makefile
index 7bead97a053..83f06082546 100644
--- Makefile
+++ Makefile
@@ -5,6 +5,7 @@ COMMENT = ls alternative written in Rust
GH_ACCOUNT = ogham
GH_PROJECT = exa
GH_TAGNAME = v0.9.0
+REVISION = 0
CATEGORIES = sysutils
@@ -101,8 +102,8 @@ post-install:
${INSTALL_MAN} ${WRKSRC}/contrib/man/exa.1 ${PREFIX}/man/man1/exa.1
${INSTALL_DATA_DIR} ${PREFIX}/share/fish/completions/
${INSTALL_DATA} ${WRKSRC}/contrib/completions.fish
${PREFIX}/share/fish/completions/exa.fish
- ${INSTALL_DATA_DIR} ${PREFIX}/share/zsh/vendor-completions/
- ${INSTALL_DATA} ${WRKSRC}/contrib/completions.zsh
${PREFIX}/share/zsh/vendor-completions/_exa
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/zsh/site-functions/
+ ${INSTALL_DATA} ${WRKSRC}/contrib/completions.zsh
${PREFIX}/share/zsh/site-functions/_exa
${INSTALL_DATA_DIR} ${PREFIX}/share/bash-completion/completions/
${INSTALL_DATA} ${WRKSRC}/contrib/completions.bash
${PREFIX}/share/bash-completion/completions/exa
diff --git pkg/PLIST pkg/PLIST
index f1aa0cfebf9..a9fff2e400f 100644
--- pkg/PLIST
+++ pkg/PLIST
@@ -8,5 +8,5 @@ share/fish/
share/fish/completions/
share/fish/completions/exa.fish
share/zsh/
-share/zsh/vendor-completions/
-share/zsh/vendor-completions/_exa
+share/zsh/site-functions/
+share/zsh/site-functions/_exa
productivity/khard: Fix zsh completion
With this khard tab completes with no fpath changes.
diff --git Makefile Makefile
index c5139bd0b9a..d477a35fdcc 100644
--- Makefile
+++ Makefile
@@ -4,6 +4,7 @@ COMMENT = console CardDAV client
MODPY_EGG_VERSION =0.15.1
DISTNAME = khard-${MODPY_EGG_VERSION}
+REVISION = 0
CATEGORIES = productivity
@@ -42,9 +43,9 @@ post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/khard
${INSTALL_DATA} ${WRKSRC}/misc/khard/khard.conf.example \
${PREFIX}/share/examples/khard
- ${INSTALL_DATA_DIR} ${PREFIX}/share/zsh/vendor-completions
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/zsh/site-functions
${INSTALL_DATA} ${WRKSRC}/misc/zsh/{_khard,_email-khard} \
- ${PREFIX}/share/zsh/vendor-completions
+ ${PREFIX}/share/zsh/site-functions
${INSTALL_DATA_DIR} ${PREFIX}/man/man1
${INSTALL_DATA} ${WRKSRC}/doc/build/man/khard.1 \
${PREFIX}/man/man1
diff --git pkg/PLIST pkg/PLIST
index fe4021b267a..3debf54d97e 100644
--- pkg/PLIST
+++ pkg/PLIST
@@ -41,6 +41,6 @@ lib/python${MODPY_VERSION}/site-packages/khard/version.py
share/examples/khard/
share/examples/khard/khard.conf.example
share/zsh/
-share/zsh/vendor-completions/
-share/zsh/vendor-completions/_email-khard
-share/zsh/vendor-completions/_khard
+share/zsh/site-functions/
+share/zsh/site-functions/_email-khard
+share/zsh/site-functions/_khard
multimedia/mpv: Fix zsh completion
mpv by default installs its zsh completer to site-functions, so just
remove the --zshdir flag. With this change mpv tab completes with no
fpath changes.
diff --git Makefile Makefile
index 9e483bde787..0e4eb3371e7 100644
--- Makefile
+++ Makefile
@@ -5,6 +5,7 @@ COMMENT = movie player based on MPlayer/mplayer2
GH_ACCOUNT = mpv-player
GH_PROJECT = mpv
GH_TAGNAME = v0.31.0
+REVISION = 0
SHARED_LIBS += mpv 0.1 # 1.106
@@ -60,7 +61,6 @@ CONFIGURE_ARGS = --confloaddir=${SYSCONFDIR}/mpv \
--confdir=${LOCALBASE}/share/examples/mpv \
--mandir=${LOCALBASE}/man \
--docdir=${LOCALBASE}/share/examples/mpv \
- --zshdir=${LOCALBASE}/share/zsh/vendor-completions \
--enable-cdda \
--enable-dvdnav \
--enable-libmpv-shared \
diff --git pkg/PLIST pkg/PLIST
index 589241e..cad3f1ef19b 100644
--- pkg/PLIST
+++ pkg/PLIST
@@ -27,5 +27,5 @@ share/icons/hicolor/symbolic/apps/mpv-symbolic.svg
@tag gtk-update-icon-cache %D/share/icons/hicolor
@tag update-desktop-database
share/zsh/
-share/zsh/vendor-completions/
-share/zsh/vendor-completions/_mpv
+share/zsh/site-functions/
+share/zsh/site-functions/_mpv
Re: sysutils/fzf: install shell support files
On Thu, Jan 16, 2020 at 05:28:49PM +, Stuart Henderson wrote: > On 2020/01/16 18:05, Paco Esteban wrote: > > Hi Edd, > > > > On Thu, 16 Jan 2020, Edd Barrett wrote: > > > > > Hi, > > > > > > This diff packages the necessary support files for for integrating fzf > > > with shells. > > > > > > With this change, enabling support in (e.g.) zsh is as simple as: > > > > > > ``` > > > export FZF_DEFAULT_OPTS="--ansi" > > > . /usr/local/share/fzf/shell/key-bindings.zsh > > > . /usr/local/share/fzf/shell/completion.zsh > > > ``` > > > > > > OK? > > > > On Nov 28, Aaron Bieber sent a patch to update fzf that included > > something similar, but it was never imported: > > > > https://marc.info/?l=openbsd-ports=157496223810600=2 > > > > I've been using it since with no issues. You may want to take a look > > (he did not put the files in the same place). > > > > Cheers, > > > > -- > > Paco Esteban. > > 5818130B8A6DBC03 > > > > We have standard locations for bash/zsh completion files, not every > port uses them but the majority do and it would probably make sense to > do the same here: > > /usr/local/share/bash-completion/completions > /usr/local/share/zsh/vendor-completions > > There's no equivalent for key-bindings though. vendor-completions is a Debianism that has escaped into upstreams. The Debian reason for the additional folder is site-functions is fully under admin control (like /usr/local for them). Likewise they prefer upstreams use site-functions (so make install'd completers end up in the user controled location) and packages should move the completer to vendor-completions. I think we should use site-functions rather than vendor-completions. This is the zsh upstream supported way. The alternative is to have patches move completers from site-functions to vendor-completions and a patch in shells/zsh to add vendor-completions to the default fpath. These patches should never be merged upstream, so I'm not a fan of it (but it's what Debian does).
Re: sysutils/fzf: install shell support files
On Thu, Jan 16, 2020 at 03:49:43PM +, Edd Barrett wrote: > Hi, > > On Thu, Jan 16, 2020 at 08:47:43AM -0600, Matthew Martin wrote: > > On Thu, Jan 16, 2020 at 03:32:36PM +0100, Klemens Nanni wrote: > > > On Thu, Jan 16, 2020 at 02:20:09PM +, Edd Barrett wrote: > > > > > > export FZF_DEFAULT_OPTS="--ansi" > > > > . /usr/local/share/fzf/shell/key-bindings.zsh > > > > . /usr/local/share/fzf/shell/completion.zsh > > > > ``` > > > The usual patterns for zsh are the following > > > > > > /usr/local/share/zsh/vendor-completions/_fzf > > > /usr/local/share/zsh/site-functions/_fzf > > > > At least for zsh /usr/local/share/zsh/site-functions/_fzf should be used > > since it's in the default fpath. Not sure where vendor-completions came > > from; it doesn't occur anywhere in the zsh source. > > It'd be good to know when to use which of these two paths. Our packages > seem to use both: Did a grep of vendor-completions in the ports tree. Some of the usages are from flags specified in the port's Makefile (mpv, khard, exa, google-cloud-sdk, and rclone) and others come from the upstream build (quodlibet, keyringer, zathura, xwallpaper). zathura has since changed to site-functions[1] but updating also requires a girara update. I'll take a look at updating both tonight and the first set of ports if no one beats me to them. 1: https://git.pwmt.org/pwmt/zathura/merge_requests/22 > As you say, only site-functions is in the default fpath... > > Also we have two fzf files to install, so do we concatenate them, or call one > _fzf_bindings and the other _fzf_completions, or does one file go in > each of the above directories? > > Do you have to do anything to have functionality loaded from fpath? I > was expecting these files to be automatically sourced, but it seems they > are not... For completers as long as the file is in fpath when compinit is called and starts with a #compdef line it will be automatically picked up and loaded when needed. Other files need to be autoloaded manually.
Re: sysutils/fzf: install shell support files
On Thu, Jan 16, 2020 at 03:32:36PM +0100, Klemens Nanni wrote: > On Thu, Jan 16, 2020 at 02:20:09PM +, Edd Barrett wrote: > > Hi, > > > > This diff packages the necessary support files for for integrating fzf > > with shells. > > > > With this change, enabling support in (e.g.) zsh is as simple as: > > > > ``` > > export FZF_DEFAULT_OPTS="--ansi" > > . /usr/local/share/fzf/shell/key-bindings.zsh > > . /usr/local/share/fzf/shell/completion.zsh > > ``` > The usual patterns for zsh are the following > > /usr/local/share/zsh/vendor-completions/_fzf > /usr/local/share/zsh/site-functions/_fzf At least for zsh /usr/local/share/zsh/site-functions/_fzf should be used since it's in the default fpath. Not sure where vendor-completions came from; it doesn't occur anywhere in the zsh source.
[patch] net/icbirc: Correct IRC parsing
Seems some icbirc users started having : prefixed nicks after updating
weechat. Even though weechat added a workaround, I think it would be
best to fix the IRC protocol parsing in icbirc to conform to the RFC.
I special cased RAWICB to bypass the correct parsing; I assumed people
manually typed those commands and I shouldn't break finger memory.
I don't use ICB, so this has only been compile tested. Once tested, this
should go upstream rather than living in the tree.
- Matthew Martin
diff --git Makefile Makefile
index d7bb3f1160b..a7b292d43da 100644
--- Makefile
+++ Makefile
@@ -3,7 +3,7 @@
COMMENT= proxy IRC client with ICB server
DISTNAME= icbirc-2.1
-REVISION= 2
+REVISION= 3
CATEGORIES=net
MASTER_SITES= http://www.benzedrine.ch/
diff --git patches/patch-irc_c patches/patch-irc_c
new file mode 100644
index 000..ceb5f0172a0
--- /dev/null
+++ patches/patch-irc_c
@@ -0,0 +1,200 @@
+$OpenBSD$
+
+Index: irc.c
+--- irc.c.orig
irc.c
+@@ -42,7 +42,7 @@ extern void scan(const char **, char *, size_t, const
+ const char *);
+ extern int sync_write(int, const char *, int);
+
+-static voidirc_cmd(const char *, int, int);
++static voidirc_cmd(char *, int, int);
+
+ static voidirc_send_pong(int, const char *);
+
+@@ -93,44 +93,55 @@ irc_recv(const char *buf, unsigned len, int client_fd,
+ }
+
+ static void
+-irc_cmd(const char *cmd, int client_fd, int server_fd)
++irc_cmd(char *cmd, int client_fd, int server_fd)
+ {
+- if (!strncasecmp(cmd, "PASS ", 5)) {
+- cmd += 5;
+- scan(, irc_pass, sizeof(irc_pass), " ", " ");
+- } else if (!strncasecmp(cmd, "USER ", 5)) {
+- cmd += 5;
+- scan(, irc_ident, sizeof(irc_ident), " ", " ");
++ if (!strncasecmp(cmd, "RAWICB ", 7)) {
++ icb_send_raw(server_fd, cmd + 7);
++ return;
++ }
++
++ char *argv[10], *p;
++ int argc = 1;
++
++ for (p = cmd, argv[0] = p; argc < 10 && (p = strchr(p, ' ')) != NULL;
++ argc++) {
++ *p = 0;
++ p++;
++ while (*p == ' ')
++ p++;
++ if (*p == ':') {
++ argv[argc] = p + 1;
++ argc++;
++ break;
++ }
++ argv[argc] = p;
++ }
++
++ if (!strcasecmp(argv[0], "PASS")) {
++ strlcpy(irc_pass, argv[1], sizeof(irc_pass));
++ } else if (!strcasecmp(argv[0], "USER")) {
++ strlcpy(irc_ident, argv[1], sizeof(irc_ident));
+ if (!icb_logged_in && irc_nick[0] && irc_ident[0])
+ icb_send_login(server_fd, irc_nick,
+ irc_ident, irc_pass);
+- } else if (!strncasecmp(cmd, "NICK ", 5)) {
+- cmd += 5;
+- scan(, irc_nick, sizeof(irc_nick), " ", " ");
++ } else if (!strcasecmp(argv[0], "NICK")) {
++ strlcpy(irc_nick, argv[1], sizeof(irc_nick));
+ if (icb_logged_in)
+ icb_send_name(server_fd, irc_nick);
+ else if (irc_nick[0] && irc_ident[0])
+ icb_send_login(server_fd, irc_nick,
+ irc_ident, irc_pass);
+- } else if (!strncasecmp(cmd, "JOIN ", 5)) {
+- char group[128];
+-
+- cmd += 5;
+- if (*cmd == '#')
+- cmd++;
+- scan(, group, sizeof(group), " ", " ");
+- icb_send_group(server_fd, group);
+- } else if (!strncasecmp(cmd, "PART ", 5)) {
++ } else if (!strcasecmp(argv[0], "JOIN")) {
++ icb_send_group(server_fd,
++ argv[1] + (argv[1][0] == '#' ? 1 : 0));
++ } else if (!strcasecmp(argv[0], "PART")) {
+ in_irc_channel = 0;
+- } else if (!strncasecmp(cmd, "PRIVMSG ", 8) ||
+- !strncasecmp(cmd, "NOTICE ", 7)) {
+- char dst[128];
++ } else if (!strcasecmp(argv[0], "PRIVMSG") ||
++ !strcasecmp(argv[0], "NOTICE")) {
+ char msg[8192];
+ unsigned i, j;
+
+- cmd += strncasecmp(cmd, "NOTICE ", 7) ? 8 : 7;
+- scan(, dst, sizeof(dst), " ", " ");
+- scan(, msg, sizeof(msg), " ", "");
++ strlcpy(msg, argv[2], sizeof(msg));
+ /* strip \001 found in CTCP messages */
+ i = 0;
+ while (msg[i]) {
+@@ -141,73 +152,52 @@ irc_cmd(const char *cmd, int client_fd, int server_fd)
+ } else
+
Re: update: shells/zsh 5.7.1
ping
On Mon, Feb 4, 2019 at 5:59 PM Matthew Martin wrote:
>
> Bump zsh to 5.7.1 (5.7 had a bug in vcs_info). Tests pass (just the
> usual failure in D07) and it's running fine here.
>
> Switch to CONFIGURE_STYLE=gnu since there are no autoconf patches
> (reverting a change from 2004). The generated configure does indeed
> match what we'd generate.
>
> Drop PORTHOME and TEST_FLAGS; the rationale from
> shells/zsh/stable/Makefile 1.8 in 2001 was "allow target regress w/o
> being root." The tests run fine without these variables now.
>
> Util/reporter and Util/check-tmux-state are not installed as can be
> check with a quick grep against PLIST. Doc/zsh.texi isn't used to
> generate docs as thankfully upstream provides generated docs. The
> remainder of EXTFILES are all in Functions and intended to be
> autoloaded. I think EXTFILES and pre-configure can be dropped, but the
> commit message in 1.67 isn't clear on why they were added.
>
> I'm unable to send emails from mutt for some reason, so the diff is
> attached as well in case gmail munges things.
>
>
> diff --git Makefile Makefile
> index 69b739e9334..098479dc707 100644
> --- Makefile
> +++ Makefile
> @@ -2,7 +2,7 @@
>
> COMMENT= Z shell, Bourne shell-compatible
>
> -V= 5.6.2
> +V= 5.7.1
> DISTNAME= zsh-$V
> CATEGORIES= shells
>
> @@ -23,8 +23,7 @@ WANTLIB= c curses iconv m pcre
> LIB_DEPENDS= converters/libiconv \
> devel/pcre
>
> -AUTOCONF_VERSION=2.69
> -CONFIGURE_STYLE=autoconf
> +CONFIGURE_STYLE=gnu
> CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
> LDFLAGS="-L${LOCALBASE}/lib"
>
> @@ -39,25 +38,16 @@ CONFIGURE_ARGS= --enable-zsh-mem \
>
> SUBST_VARS= V
>
> -# required for regression tests
> -PORTHOME= ${WRKDIR}
> -TEST_FLAGS= INSTALL_PROGRAM="install -c -s -m 555" \
> - INSTALL_DATA="install -c -m 444" \
> - INSTALL="install -c" \
> - TMPPREFIX=${WRKBUILD}/tmp \
> - TERM=xterm
> -
> -EXTFILES= Functions/Misc/checkmail Functions/Misc/run-help \
> - Functions/Misc/run-help-ip Functions/Misc/sticky-note \
> - Functions/Misc/zcalc Functions/Misc/zed Functions/Misc/zkbd \
> - Functions/Calendar/calendar_add Functions/Example/cat \
> - Functions/Example/zless Test/ztst.zsh Test/runtests.zsh \
> - Util/reporter Util/check-tmux-state Doc/zsh.texi
> +EXTFILES= Calendar/calendar_add Example/cat Example/zless \
> + Misc/checkmail Misc/run-help \
> + Misc/run-help-ip \
> + Misc/sticky-note Misc/zcalc \
> + Misc/zed Misc/zkbd
>
> pre-configure:
> .for i in ${EXTFILES}
> sed -i -e "s,/bin/zsh,${TRUEPREFIX}/bin/zsh,g" \
> - ${WRKSRC}/${i}
> + ${WRKSRC}/Functions/${i}
> .endfor
>
> .include
> diff --git distinfo distinfo
> index 9e74544bf66..94271329f48 100644
> --- distinfo
> +++ distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (zsh-5.6.2.tar.xz) = pQvWbAVX6OyjuPok6F0N5TPnddeiLfBC2pBIhiN1Lp4=
> -SIZE (zsh-5.6.2.tar.xz) = 3077368
> +SHA256 (zsh-5.7.1.tar.xz) = cmApLCwdSDstUP6/pQVRdr1RKzKogzsRYXe/XwHnfug=
> +SIZE (zsh-5.7.1.tar.xz) = 3126308
> diff --git pkg/PLIST pkg/PLIST
> index c9376e94025..b8574c2abbd 100644
> --- pkg/PLIST
> +++ pkg/PLIST
> @@ -19,6 +19,7 @@ lib/zsh/${V}/zsh/files.so
> lib/zsh/${V}/zsh/langinfo.so
> lib/zsh/${V}/zsh/mapfile.so
> lib/zsh/${V}/zsh/mathfunc.so
> +lib/zsh/${V}/zsh/nearcolor.so
> lib/zsh/${V}/zsh/net/
> lib/zsh/${V}/zsh/net/socket.so
> lib/zsh/${V}/zsh/net/tcp.so
> @@ -238,6 +239,7 @@ share/zsh/${V}/functions/Completion/Darwin/_scutil
> share/zsh/${V}/functions/Completion/Darwin/_softwareupdate
> share/zsh/${V}/functions/Completion/Darwin/_sw_vers
> share/zsh/${V}/functions/Completion/Darwin/_system_profiler
> +share/zsh/${V}/functions/Completion/Darwin/_xcode-select
> share/zsh/${V}/functions/Completion/Debian/
> share/zsh/${V}/functions/Completion/Debian/_a2utils
> share/zsh/${V}/functions/Completion/Debian/_apt
> @@ -336,6 +338,7 @@ share/zsh/${V}/functions/Completion/Linux/_pkgtool
> share/zsh/${V}/functions/Completion/Linux/_qdbus
> share/zsh/${V}/functions/Completion/Linux/_rpmbuild
> share/zsh/${V}/functions/Completion/Linux/_schedtool
> +share/zsh/${V}/functions/Completion/Linux/_setsid
> share/zsh/${V}/functions/Completion/Linux/_ss
> share/zsh/${V}/functions/Completion/Linux/_sshfs
> share/zsh/${V}/functions/Completion/Linux/_strace
> @@ -399,6 +402,8 @@ share/zsh/${V}/functions/Completion/Unix/_arch_archives
> share/zsh/${V}/functions/Completion/Unix/_arch_namespace
> share/zsh/${V}/functions/Completion/Unix/_arp
> share/zsh/${V}/functions/Completion/Unix/_arping
> +share/zsh/${V}/functions/Completion/Unix/_asciidoctor
> +share/zsh/${V}/functions/Completion/U
Re: update: shells/zsh 5.7.1
On Thu, Feb 14, 2019 at 10:23 AM Pierre-Emmanuel Andre wrote: > > On Mon, Feb 04, 2019 at 05:59:35PM -0600, Matthew Martin wrote: > > Bump zsh to 5.7.1 (5.7 had a bug in vcs_info). Tests pass (just the > > usual failure in D07) and it's running fine here. > > > > Switch to CONFIGURE_STYLE=gnu since there are no autoconf patches > > (reverting a change from 2004). The generated configure does indeed > > match what we'd generate. > > > > Drop PORTHOME and TEST_FLAGS; the rationale from > > shells/zsh/stable/Makefile 1.8 in 2001 was "allow target regress w/o > > being root." The tests run fine without these variables now. > > > > The regress tests run fine for you ? > On my machine, they hang forever here: > ./V08zpty.ztst: starting. > > The rest of the diff looks good. > > [...] Both make test and env -i make test complete with just the usual failure in D07.
update: shells/zsh 5.7.1
Bump zsh to 5.7.1 (5.7 had a bug in vcs_info). Tests pass (just the
usual failure in D07) and it's running fine here.
Switch to CONFIGURE_STYLE=gnu since there are no autoconf patches
(reverting a change from 2004). The generated configure does indeed
match what we'd generate.
Drop PORTHOME and TEST_FLAGS; the rationale from
shells/zsh/stable/Makefile 1.8 in 2001 was "allow target regress w/o
being root." The tests run fine without these variables now.
Util/reporter and Util/check-tmux-state are not installed as can be
check with a quick grep against PLIST. Doc/zsh.texi isn't used to
generate docs as thankfully upstream provides generated docs. The
remainder of EXTFILES are all in Functions and intended to be
autoloaded. I think EXTFILES and pre-configure can be dropped, but the
commit message in 1.67 isn't clear on why they were added.
I'm unable to send emails from mutt for some reason, so the diff is
attached as well in case gmail munges things.
diff --git Makefile Makefile
index 69b739e9334..098479dc707 100644
--- Makefile
+++ Makefile
@@ -2,7 +2,7 @@
COMMENT= Z shell, Bourne shell-compatible
-V= 5.6.2
+V= 5.7.1
DISTNAME= zsh-$V
CATEGORIES= shells
@@ -23,8 +23,7 @@ WANTLIB= c curses iconv m pcre
LIB_DEPENDS= converters/libiconv \
devel/pcre
-AUTOCONF_VERSION=2.69
-CONFIGURE_STYLE=autoconf
+CONFIGURE_STYLE=gnu
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
@@ -39,25 +38,16 @@ CONFIGURE_ARGS= --enable-zsh-mem \
SUBST_VARS= V
-# required for regression tests
-PORTHOME= ${WRKDIR}
-TEST_FLAGS= INSTALL_PROGRAM="install -c -s -m 555" \
- INSTALL_DATA="install -c -m 444" \
- INSTALL="install -c" \
- TMPPREFIX=${WRKBUILD}/tmp \
- TERM=xterm
-
-EXTFILES= Functions/Misc/checkmail Functions/Misc/run-help \
- Functions/Misc/run-help-ip Functions/Misc/sticky-note \
- Functions/Misc/zcalc Functions/Misc/zed Functions/Misc/zkbd \
- Functions/Calendar/calendar_add Functions/Example/cat \
- Functions/Example/zless Test/ztst.zsh Test/runtests.zsh \
- Util/reporter Util/check-tmux-state Doc/zsh.texi
+EXTFILES= Calendar/calendar_add Example/cat Example/zless \
+ Misc/checkmail Misc/run-help \
+ Misc/run-help-ip \
+ Misc/sticky-note Misc/zcalc \
+ Misc/zed Misc/zkbd
pre-configure:
.for i in ${EXTFILES}
sed -i -e "s,/bin/zsh,${TRUEPREFIX}/bin/zsh,g" \
- ${WRKSRC}/${i}
+ ${WRKSRC}/Functions/${i}
.endfor
.include
diff --git distinfo distinfo
index 9e74544bf66..94271329f48 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (zsh-5.6.2.tar.xz) = pQvWbAVX6OyjuPok6F0N5TPnddeiLfBC2pBIhiN1Lp4=
-SIZE (zsh-5.6.2.tar.xz) = 3077368
+SHA256 (zsh-5.7.1.tar.xz) = cmApLCwdSDstUP6/pQVRdr1RKzKogzsRYXe/XwHnfug=
+SIZE (zsh-5.7.1.tar.xz) = 3126308
diff --git pkg/PLIST pkg/PLIST
index c9376e94025..b8574c2abbd 100644
--- pkg/PLIST
+++ pkg/PLIST
@@ -19,6 +19,7 @@ lib/zsh/${V}/zsh/files.so
lib/zsh/${V}/zsh/langinfo.so
lib/zsh/${V}/zsh/mapfile.so
lib/zsh/${V}/zsh/mathfunc.so
+lib/zsh/${V}/zsh/nearcolor.so
lib/zsh/${V}/zsh/net/
lib/zsh/${V}/zsh/net/socket.so
lib/zsh/${V}/zsh/net/tcp.so
@@ -238,6 +239,7 @@ share/zsh/${V}/functions/Completion/Darwin/_scutil
share/zsh/${V}/functions/Completion/Darwin/_softwareupdate
share/zsh/${V}/functions/Completion/Darwin/_sw_vers
share/zsh/${V}/functions/Completion/Darwin/_system_profiler
+share/zsh/${V}/functions/Completion/Darwin/_xcode-select
share/zsh/${V}/functions/Completion/Debian/
share/zsh/${V}/functions/Completion/Debian/_a2utils
share/zsh/${V}/functions/Completion/Debian/_apt
@@ -336,6 +338,7 @@ share/zsh/${V}/functions/Completion/Linux/_pkgtool
share/zsh/${V}/functions/Completion/Linux/_qdbus
share/zsh/${V}/functions/Completion/Linux/_rpmbuild
share/zsh/${V}/functions/Completion/Linux/_schedtool
+share/zsh/${V}/functions/Completion/Linux/_setsid
share/zsh/${V}/functions/Completion/Linux/_ss
share/zsh/${V}/functions/Completion/Linux/_sshfs
share/zsh/${V}/functions/Completion/Linux/_strace
@@ -399,6 +402,8 @@ share/zsh/${V}/functions/Completion/Unix/_arch_archives
share/zsh/${V}/functions/Completion/Unix/_arch_namespace
share/zsh/${V}/functions/Completion/Unix/_arp
share/zsh/${V}/functions/Completion/Unix/_arping
+share/zsh/${V}/functions/Completion/Unix/_asciidoctor
+share/zsh/${V}/functions/Completion/Unix/_asciinema
share/zsh/${V}/functions/Completion/Unix/_at
share/zsh/${V}/functions/Completion/Unix/_attr
share/zsh/${V}/functions/Completion/Unix/_augeas
@@ -439,6 +444,7 @@ share/zsh/${V}/functions/Completion/Unix/_cmdstring
share/zsh/${V}/functions/Completion/Unix/_cmp
share/zsh/${V}/functions/Completion/Unix/_column
share/zsh/${V}/functions/Completion/Unix/_comm
+share/zsh/${V}/functions/Completion/Unix/_composer
share/zsh/${V}/functions/Completion/Unix/_compress
share/zsh/${V}/functions/Completion/Unix/_configure
share/zsh/${V}/functions/Completion/Unix/_cowsay
@@ -477,6 +483,7 @@ share/zsh/${V}/functions/Completion/Unix/_dmidecode
share/zsh/${V}/functions/Completion/Unix/_dns_types
Re: UPDATE: shells/zsh
On Thu, Sep 13, 2018 at 01:18:57PM +0200, Rafael Sadowski wrote:
> New diff, it won't solve the test issue but it repairs some more
> EXTFILES.
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/shells/zsh/Makefile,v
> retrieving revision 1.88
> diff -u -p -u -p -r1.88 Makefile
> --- Makefile 21 Apr 2018 09:24:06 - 1.88
> +++ Makefile 13 Sep 2018 11:16:26 -
> @@ -2,7 +2,7 @@
>
> COMMENT= Z shell, Bourne shell-compatible
>
> -V= 5.5.1
> +V= 5.6.1
> DISTNAME=zsh-$V
> CATEGORIES= shells
>
> @@ -10,8 +10,10 @@ MAINTAINER=Pierre-Emmanuel Andre
> HOMEPAGE=https://www.zsh.org/
>
> -MASTER_SITES=${MASTER_SITE_SOURCEFORGE:=zsh/}
> -MASTER_SITES+= http://www.zsh.org/pub/
> +MASTER_SITES=${MASTER_SITE_SOURCEFORGE:=zsh/} \
> + http://www.zsh.org/pub/
> +
> +EXTRACT_SUFX=.tar.xz
>
> # BSD
> PERMIT_PACKAGE_CDROM=Yes
> @@ -23,15 +25,21 @@ LIB_DEPENDS= converters/libiconv \
>
> AUTOCONF_VERSION=2.69
> CONFIGURE_STYLE=autoconf
> -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
> -LDFLAGS="-L${LOCALBASE}/lib"
> -CONFIGURE_ARGS= --enable-zsh-mem \
> +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
> + LDFLAGS="-L${LOCALBASE}/lib"
> +
> +CONFIGURE_ARGS= --enable-fndir=${LOCALBASE}/share/zsh/$V/functions \
> + --enable-scriptdir=${LOCALBASE}/share/zsh/$V/scripts \
> + --docdir=${LOCALBASE}/share/doc/zsh/$V \
> + --htmldir=${LOCALBASE}/share/doc/zsh/html/$V \
I don't see what problem this change fixes; if there isn't a problem,
why rearrange the chairs?
Also 5.6.2 is due out tomorrow, so should probably wait for that now.
- Matthew Martin
Re: UPDATE: shells/zsh
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/zs
Re: [patch] geo/garmindev on aarch64
On Wed, Jul 11, 2018 at 12:43:35PM +0100, Stuart Henderson wrote:
> On 2018/07/10 23:16, Matthew Martin wrote:
> > Few signed char fixes.
>
> Was this a build failure before (in which case OK), or did it build but
> misbehave (in which case it needs a bump)?
Build failure [1]. Same reasoning as in bcallah's games/scid patch:
doesn't build on unsigned char arches (as there are negative values) and
no change on signed char arches.
1: http://build-failures.rhaalovely.net/aarch64/2018-06-21/geo/garmindev.log
> > diff --git patches/patch-src_EtrexH_CDevice_cpp
> > patches/patch-src_EtrexH_CDevice_cpp
> > new file mode 100644
> > index 000..4b0c1a0f437
> > --- /dev/null
> > +++ patches/patch-src_EtrexH_CDevice_cpp
> > @@ -0,0 +1,14 @@
> > +$OpenBSD$
> > +
> > +Index: src/EtrexH/CDevice.cpp
> > +--- src/EtrexH/CDevice.cpp.orig
> > src/EtrexH/CDevice.cpp
> > +@@ -47,7 +47,7 @@ callback ( state,0,cancel,0,message )
> > +
> > + namespace EtrexH
> > + {
> > +-static const char _clrtbl[1024]= {
> > ++static const signed char _clrtbl[1024]= {
> > + -127,-127,-127,0,-60,-60,-60,0,90,90,90,0,0,0,0,0,-117,0,0,0,
> > + -76,0,0,0,-43,0,0,0,-1,0,0,0,0,48,0,0,32,48,0,0,
> > + 65,48,0,0,106,48,0,0,-117,48,0,0,-76,48,0,0,-43,48,0,0,
> > diff --git patches/patch-src_EtrexLegendC_CDevice_cpp
> > patches/patch-src_EtrexLegendC_CDevice_cpp
> > new file mode 100644
> > index 000..d8eb9dde223
> > --- /dev/null
> > +++ patches/patch-src_EtrexLegendC_CDevice_cpp
> > @@ -0,0 +1,14 @@
> > +$OpenBSD$
> > +
> > +Index: src/EtrexLegendC/CDevice.cpp
> > +--- src/EtrexLegendC/CDevice.cpp.orig
> > src/EtrexLegendC/CDevice.cpp
> > +@@ -37,7 +37,7 @@ using namespace std;
> > + namespace EtrexLegendC
> > + {
> > +
> > +-static const char _clrtbl[1024]= {
> > ++static const signed char _clrtbl[1024]= {
> > + 0,0,0,0,32,0,0,0,65,0,0,0,106,0,0,0,-117,0,0,0,
> > + -76,0,0,0,-43,0,0,0,-1,0,0,0,0,48,0,0,32,48,0,0,
> > + 65,48,0,0,106,48,0,0,-117,48,0,0,-76,48,0,0,-43,48,0,0,
> > diff --git patches/patch-src_GPSMap60CSx_CDevice_cpp
> > patches/patch-src_GPSMap60CSx_CDevice_cpp
> > new file mode 100644
> > index 000..40789131168
> > --- /dev/null
> > +++ patches/patch-src_GPSMap60CSx_CDevice_cpp
> > @@ -0,0 +1,14 @@
> > +$OpenBSD$
> > +
> > +Index: src/GPSMap60CSx/CDevice.cpp
> > +--- src/GPSMap60CSx/CDevice.cpp.orig
> > src/GPSMap60CSx/CDevice.cpp
> > +@@ -43,7 +43,7 @@ using namespace std;
> > + namespace GPSMap60CSx
> > + {
> > +
> > +-static const char _clrtbl[1024]= {
> > ++static const signed char _clrtbl[1024]= {
> > + 0,0,0,0,32,0,0,0,65,0,0,0,106,0,0,0,-117,0,0,0,
> > + -76,0,0,0,-43,0,0,0,-1,0,0,0,0,48,0,0,32,48,0,0,
> > + 65,48,0,0,106,48,0,0,-117,48,0,0,-76,48,0,0,-43,48,0,0,
> >
>
[patch] geo/garmindev on aarch64
Few signed char fixes.
- Matthew Martin
diff --git patches/patch-src_EtrexH_CDevice_cpp
patches/patch-src_EtrexH_CDevice_cpp
new file mode 100644
index 000..4b0c1a0f437
--- /dev/null
+++ patches/patch-src_EtrexH_CDevice_cpp
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: src/EtrexH/CDevice.cpp
+--- src/EtrexH/CDevice.cpp.orig
src/EtrexH/CDevice.cpp
+@@ -47,7 +47,7 @@ callback ( state,0,cancel,0,message )
+
+ namespace EtrexH
+ {
+-static const char _clrtbl[1024]= {
++static const signed char _clrtbl[1024]= {
+ -127,-127,-127,0,-60,-60,-60,0,90,90,90,0,0,0,0,0,-117,0,0,0,
+ -76,0,0,0,-43,0,0,0,-1,0,0,0,0,48,0,0,32,48,0,0,
+ 65,48,0,0,106,48,0,0,-117,48,0,0,-76,48,0,0,-43,48,0,0,
diff --git patches/patch-src_EtrexLegendC_CDevice_cpp
patches/patch-src_EtrexLegendC_CDevice_cpp
new file mode 100644
index 000..d8eb9dde223
--- /dev/null
+++ patches/patch-src_EtrexLegendC_CDevice_cpp
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: src/EtrexLegendC/CDevice.cpp
+--- src/EtrexLegendC/CDevice.cpp.orig
src/EtrexLegendC/CDevice.cpp
+@@ -37,7 +37,7 @@ using namespace std;
+ namespace EtrexLegendC
+ {
+
+-static const char _clrtbl[1024]= {
++static const signed char _clrtbl[1024]= {
+ 0,0,0,0,32,0,0,0,65,0,0,0,106,0,0,0,-117,0,0,0,
+ -76,0,0,0,-43,0,0,0,-1,0,0,0,0,48,0,0,32,48,0,0,
+ 65,48,0,0,106,48,0,0,-117,48,0,0,-76,48,0,0,-43,48,0,0,
diff --git patches/patch-src_GPSMap60CSx_CDevice_cpp
patches/patch-src_GPSMap60CSx_CDevice_cpp
new file mode 100644
index 000..40789131168
--- /dev/null
+++ patches/patch-src_GPSMap60CSx_CDevice_cpp
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: src/GPSMap60CSx/CDevice.cpp
+--- src/GPSMap60CSx/CDevice.cpp.orig
src/GPSMap60CSx/CDevice.cpp
+@@ -43,7 +43,7 @@ using namespace std;
+ namespace GPSMap60CSx
+ {
+
+-static const char _clrtbl[1024]= {
++static const signed char _clrtbl[1024]= {
+ 0,0,0,0,32,0,0,0,65,0,0,0,106,0,0,0,-117,0,0,0,
+ -76,0,0,0,-43,0,0,0,-1,0,0,0,0,48,0,0,32,48,0,0,
+ 65,48,0,0,106,48,0,0,-117,48,0,0,-76,48,0,0,-43,48,0,0,
[patch] security/libnipper on aarch64
Two signed char fixes.
- Matthew Martin
diff --git patches/patch-device_crypto_crypto-base64_cpp
patches/patch-device_crypto_crypto-base64_cpp
index 081341a572d..68abdfc8951 100644
--- patches/patch-device_crypto_crypto-base64_cpp
+++ patches/patch-device_crypto_crypto-base64_cpp
@@ -1,8 +1,27 @@
let it build with base gcc
$OpenBSD: patch-device_crypto_crypto-base64_cpp,v 1.1.1.1 2008/09/20 20:26:05
steven Exp $
device/crypto/crypto-base64.cpp.orig Sun Sep 7 23:03:17 2008
-+++ device/crypto/crypto-base64.cppSun Sep 7 23:03:17 2008
+Index: device/crypto/crypto-base64.cpp
+--- device/crypto/crypto-base64.cpp.orig
device/crypto/crypto-base64.cpp
+@@ -36,7 +36,7 @@
+
+ // See RFC3548 for details of Base64 Encode / Decode standards
+
+-static const char base64string[] = {62, -1, -1, -1, 63, 52, 53, 54, 55, 56,
57, 58, 59, 60, 61, -1, -1, -1, 0, -1, -1, -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,
10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, -1, -1, -1, -1,
-1, -1, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43,
44, 45, 46, 47, 48, 49, 50, 51};
++static const signed char base64string[] = {62, -1, -1, -1, 63, 52, 53, 54,
55, 56, 57, 58, 59, 60, 61, -1, -1, -1, 0, -1, -1, -1, 0, 1, 2, 3, 4, 5, 6, 7,
8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, -1, -1,
-1, -1, -1, -1, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41,
42, 43, 44, 45, 46, 47, 48, 49, 50, 51};
+
+
+ // Base64 character check
+@@ -57,7 +57,7 @@ const char *Device::base64Decode(const char *encodedSt
+ // Variables...
+ string encoded(encodedString);
+ int offset = 0;
+- char inter1, inter2, inter3, inter4 = 0;
++ signed char inter1, inter2, inter3, inter4 = 0;
+ base64TempString.assign("");
+
+ // Strip unwanted characters from the end of the string
@@ -110,9 +110,9 @@ const char *Device::base64Decode(const char *encodedSt
offset++;
[patch] devel/bullet on aarch64
I don't use bullet, but fixes the build with CXXFLAGS=3D-funsigned-char
- Matthew Martin
diff --git patches/patch-examples_ThirdPartyLibs_Gwen_Renderers_FontData_h =
patches/patch-examples_ThirdPartyLibs_Gwen_Renderers_FontData_h
new file mode 100644
index 000..9b91b0d1a3c
--- /dev/null
+++ patches/patch-examples_ThirdPartyLibs_Gwen_Renderers_FontData_h
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: examples/ThirdPartyLibs/Gwen/Renderers/FontData.h
+--- examples/ThirdPartyLibs/Gwen/Renderers/FontData.h.orig
examples/ThirdPartyLibs/Gwen/Renderers/FontData.h
+@@ -259,7 +259,7 @@ unsigned char sGwenFontData[] =3D=20
+
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,=
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0=
,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,=
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0=
,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,=
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0=
,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+ };
+=20
+-static const char sGwenDebugFontSpacing[]=3D
++static const signed char sGwenDebugFontSpacing[]=3D
+ {
+
0,0,0,0,0,0,0,0,0,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,3,4,6=
,6,9,8,3,4,4,4,6,3,7,3,3,6,6,6,6,6,6,6,6,6,6,3,3,6,5,6,6,11,7,7,8,8,7,6,8,8=
,3,5,7,6,9,8,8,7,8,7,7,5,8,7,9,7,7,7,3,3,3,6,6,3,5,6,5,6,5,4,6,6,2,2,5,2,8,=
6,6,6,6,4,5,4,5,6,8,6,5,5,3,3,3,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0=
,0,0,0,0,0,0,0,0,0,0,0,0,3,3,6,6,5,6,3,6,3,9,4,6,7,4,9,3,4,6,3,3,3,5,6,3,3,=
3,4,6,9,9,9,6,7,7,7,7,7,7,10,8,7,7,7,7,3,3,3,3,8,8,8,8,8,8,8,6,8,8,8,8,8,7,=
7,5,5,5,5,5,5,5,8,5,5,5,5,5,2,2,2,2,6,5,6,6,6,6,6,6,6,5,5,5,5,5,6,5,116,112=
,61,0,0,0,0,-96,-48,96,80,-64,0,64,-96,16,0,0,0,98,99,0,16,0,-96,-48,96,80,=
-64,0,-16,-128,16,98,99,0,-80,32,16,-16,16,112,-64,-64,-32,-16,-48,16,-48,0=
,64,-128,-64,32,-48,-64,-48,-16,96,32,64,96,96,32,32,-96,-64,-96,80,64,-80,=
16,-48,16,-80,-16,48,112,80,-80,-16,64,80,-112,-48,16,80,48,96,16,16,16,-11=
2,-16,-16,0,96,48,48,-112,112,-80,-32,-48,-96,-112,16,80,80,48,-64,-80,-112=
,96,80,64,96,48,80,73,65,32,84,82,84,0,92,103,32,101,120,92,114,102,105,108=
,117,32,92,105,117,120,108,0,115,114,32,114,114,116,101,110,0,92,103,32,101=
,120,92,114,102,105,108,117,32,92,105,117,108,0,92,103,32,101,120,92,114,10=
2,105,108,117,32,92,105,117,120,101,110,105,114,101,0,100,84,60,115,116,95,=
116,97,60,115,119,58,116,115,97,42,114,32,58,115,108,32,110,111,111,58,101,=
44,115,116,97,99,114,97,71,58,110,108,66,32,48,58,110,105,97,58,101,111,61,=
83,100,32,32,114,101,110,105,114,101,44,0,112,116,101,111,105,109,105,0,115=
,110,116,101,111,117,100,97,0,115,111,64,80,-112,34,32,114,101,0,100,105,99=
,115,101,67,114,58,115,44,115,116,97,99,114,97,71,58,110,108,66,32,62,67,11=
6,101,111,62,112,116,42,83,100,32,32,114,101,117,102,110,44,0,115,116,116,1=
10,100,102,110,108,0,100,105,99,115,101,67,114,58,115,44,115,116,97,99,114,=
97,71,58,110,108,66,32,62,67,116,101,111,62,112,116,43,0,115,116,116,110,10=
5,101,116,101,60,108,0,112,116,97,105,97,32,115,32,103,0,100,105,99,115,101=
,67,114,58,115,44,115,116,97,99,114,97,71,58,110,108,66,32,62,67,116,101,11=
1,62,67,97,108,32,114,114,110,112,98,0,100,84,60,115,116,95,116,97,60,115,1=
19,58,116,115,97,42,114,32,58,115,108,32,110,111,111,58,101,44,115,116,97,9=
9,114,97,71,58,110,108,66,32,48,58,110,105,97,58,101,0,112,116,101,111,111,=
101,109,97,0,100,84,60,115,116,95,116,97,60,115,119,58,116,115,97,42,114,32=
,58,115,108,32,110,111,111,58,101,44,115,116,97,99,114,97,71,58,110,108,66,=
32,48,58,110,105,97,58,110,0,112,116,101,111,111,110,109,97,0,118,100,101,1=
11,16,-26,100,105,99,115,101,67,114,58,115,44,115,116,97,99,114,97,71,58,11=
0,108,66,32,62,67,116,101,111,62,112,116,45,0,115,116,116,110,100,101,116,1=
01,97,111,0,0,0,0,97,111,48,48,-96,-112,-48,16,-64,0,-16,-128,16,0,-103,97,=
111,58,110,105,33,-128,32,-64,-16,16,112,-64,-64,-32,-16,-48,16,-48,0,64,-1=
28,-64,32,-48,-64,-48,-16,96,32,112,96,96,32,-96,-96,-64,-96,80,64,-80,16,-=
48,16,-80,-16,48,112,80,-80,-16,64,80,-112,-48,16,80,48,96,16,16,16,-112,32=
,-16,0,96,48,48,-112,112,-80,-32,-48,-96,-112,16,80,80,48,-64,-124,-96,-112=
,64,-110,-128,0,80,112,0,100,84,60,115,116,95,112,97,60,115,116,98,99,114,6=
0,97,44,117,115,58,114,97,60,97,62,97,115,58,111,111,99,95,62,97,71,58,101,=
58,108,42,114,32,58,115,108,32,58,115,115,110,99,95,116,116,100,104,116,116=
,99,95,99,115,100,108,97,60,97,62,62,97,115,58,111,111,116,116,100,97,99,11=
5,100,97,95,105,119,114,115,99,116,99,95,105,119,114,44,115,116,97,99,114,1=
04,116,32,115,99,115,101,69,116,97,114,32,62,58,115,116,116,58,114,114,0,10=
0,84,60,115,116,95,112,97,60,115,116,98,99,114,60,97,44,117,115,58,114,97,6=
0,97,62,97,115,58,111,111,99,95,62,97,71,58,101,58,108,42,114,32,58,115,108=
,32,58,115,115,110,99,95,116,116,100,104,116,116,99,95,99,115,100,108,97,60
[patch] editor/ht on aarch64
I use neither ht nor aarch64, but [0]
htcoffhd.cc:75:3: error: constant expression evaluates to -1 which cannot be
narrowed to type 'char' [-Wc++11-narrowing]
{-1, "COFF - file characteristics"},
^~
seems straightforward to fix. Same fix was sent upstream[1]. I think the
crank can be left out since the binary will be identical on signed char
arches and fixes the build on unsigned char arches.
- Matthew Martin
0: http://build-failures.rhaalovely.net//aarch64/2018-06-21/editors/ht.log
1: https://github.com/sebastianbiallas/ht/pull/21
diff --git patches/patch-httag_h patches/patch-httag_h
new file mode 100644
index 000..d4cc09d7f50
--- /dev/null
+++ patches/patch-httag_h
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: httag.h
+--- httag.h.orig
httag.h
+@@ -69,7 +69,7 @@ struct ht_tag_flags {
+ } PACKED;
+
+ struct ht_tag_flags_s {
+- char bitidx;
++ signed char bitidx;
+ const char *desc;
+ } PACKED;
+
update multimedia/mlt 6.6.0
Update multimedia/mlt to the latest release. Also fixes the build with
clang. I don't use melt, but the tests only have one failure (mentioned
in the Makefile) and it could play a few sample videos. A minor lib bump
is required, but I'm not confident it's sufficient, so the patch cranks
the major.
- Matthew Martin
diff --git Makefile Makefile
index f85a35f6c36..65519303346 100644
--- Makefile
+++ Makefile
@@ -2,19 +2,17 @@
COMMENT-main = multimedia transformations framework
COMMENT-gpl2 = GPLv2-licensed modules for mlt
-VERSION = 6.0.0
+VERSION = 6.6.0
DISTNAME = mlt-${VERSION}
PKGNAME-main = ${DISTNAME}
PKGNAME-gpl2 = mlt-gpl2-${VERSION}
-REVISION-main =3
-REVISION-gpl2 =1
# XXX versions should be kept in sync together
-SHARED_LIBS = mlt 1.1
-SHARED_LIBS += mlt++ 1.1
+SHARED_LIBS = mlt 2.0
+SHARED_LIBS += mlt++ 2.0
CATEGORIES = multimedia devel
-HOMEPAGE = http://www.mltframework.org/
+HOMEPAGE = https://www.mltframework.org/
MAINTAINER = KDE porting team <openbsd-...@googlegroups.com>
@@ -32,7 +30,7 @@ WANTLIB-gpl2 = ${COMPILER_LIBCXX} ${MODQT4_WANTLIB}
lib/qt4/QtGui
WANTLIB-gpl2 += lib/qt4/QtSvg lib/qt4/QtXml lib/qt4/QtOpenGL
WANTLIB-gpl2 += X11 exif m mlt mlt++ pthread samplerate
-MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=mlt/}
+MASTER_SITES =
https://github.com/mltframework/mlt/releases/download/v${VERSION}/
EXTRACT_SUFX = .tar.gz
MULTI_PACKAGES = -main -gpl2
diff --git distinfo distinfo
index 97ca536deaf..b9f40dcf92d 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (mlt-6.0.0.tar.gz) = MXh0z8f8Uo3duzp6Mv1GNyquIr3EUnvhz7Vck/pm470=
-SIZE (mlt-6.0.0.tar.gz) = 1281478
+SHA256 (mlt-6.6.0.tar.gz) = KMvFl09y7yKNYkpYgJx8gFU3L19i9YgtwFUJnURLLN0=
+SIZE (mlt-6.6.0.tar.gz) = 1365768
diff --git patches/patch-src_framework_Makefile
patches/patch-src_framework_Makefile
index df2402ea8a3..196abbcb6ec 100644
--- patches/patch-src_framework_Makefile
+++ patches/patch-src_framework_Makefile
@@ -1,6 +1,7 @@
$OpenBSD: patch-src_framework_Makefile,v 1.1.1.1 2014/07/14 09:15:12 zhuk Exp $
src/framework/Makefile.origSun Jun 29 22:23:17 2014
-+++ src/framework/Makefile Wed Jul 9 09:43:49 2014
+Index: src/framework/Makefile
+--- src/framework/Makefile.orig
src/framework/Makefile
@@ -1,7 +1,6 @@
include ../../config.mak
include config.mak
@@ -19,7 +20,7 @@ $OpenBSD: patch-src_framework_Makefile,v 1.1.1.1 2014/07/14
09:15:12 zhuk Exp $
else
NAME = libmlt$(LIBSUF)
TARGET = $(NAME).$(version)
-@@ -94,10 +96,12 @@ all: $(TARGET)
+@@ -96,10 +98,12 @@ all: $(TARGET)
$(TARGET): $(OBJS)
$(CC) $(SHFLAGS) -o $@ $(OBJS) $(LDFLAGS)
@@ -35,7 +36,7 @@ $OpenBSD: patch-src_framework_Makefile,v 1.1.1.1 2014/07/14
09:15:12 zhuk Exp $
depend: $(SRCS)
$(CC) -MM $(CFLAGS) $^ 1>.depend
-@@ -114,6 +118,8 @@ install:
+@@ -116,6 +120,8 @@ install:
install -m 755 $(TARGET) $(DESTDIR)$(prefix) ; \
install -m 755 $(TARGET) $(DESTDIR)$(libdir)/libmlt.dll ; \
install -m 644 libmlt.def $(DESTDIR)$(libdir) ; \
diff --git patches/patch-src_framework_mlt_property_h
patches/patch-src_framework_mlt_property_h
index 02e8d4d10fe..d93fa11d176 100644
--- patches/patch-src_framework_mlt_property_h
+++ patches/patch-src_framework_mlt_property_h
@@ -3,13 +3,13 @@ $OpenBSD: patch-src_framework_mlt_property_h,v 1.1 2017/05/24
16:30:52 espie Exp
Index: src/framework/mlt_property.h
--- src/framework/mlt_property.h.orig
+++ src/framework/mlt_property.h
-@@ -30,8 +30,11 @@
- #include
- #endif
+@@ -32,8 +32,11 @@
--#if defined(__GLIBC__) || defined(__APPLE__) || (__FreeBSD_version >= 900506)
-+#if defined(__GLIBC__) || defined(__APPLE__) || defined(__FreeBSD_version) &&
(__FreeBSD_version >= 900506)
- #include
+ #if defined(__GLIBC__) && !defined(__APPLE__)
+ # include
+-#elif defined(__APPLE__) || (__FreeBSD_version >= 900506)
++#elif defined(__APPLE__) || defined(__FreeBSD_version) && (__FreeBSD_version
>= 900506)
+ # include
+#elif defined(__OpenBSD__)
+/* XXX matches __nop_locale glue in libc++ */
+typedef void* locale_t;
diff --git patches/patch-src_modules_plusgpl_consumer_cbrts_c
patches/patch-src_modules_plusgpl_consumer_cbrts_c
index a457a6ca42f..992c32eff07 100644
--- patches/patch-src_modules_plusgpl_consumer_cbrts_c
+++ patches/patch-src_modules_plusgpl_consumer_cbrts_c
@@ -1,7 +1,8 @@
$OpenBSD: patch-src_modules_plusgpl_consumer_cbrts_c,v 1.2 2016/04/03 19:15:23
zhuk Exp $
src/modules/plusgpl/consumer_cbrts.c.orig Thu Feb 18 00:43:24 2016
-+++ src/modules/plusgpl/consumer_cbrts.c Mon Feb 29 19:34:22 2016
-@@ -251,6 +251,10 @@ static void load_sections( co
zsh 5.5.1
Small patch to zsh 5.5.1.
Also I noticed the two patches removed for 5.5 are now zero byte files.
Anything git users can do to make that easier (or should patch(1) be
modified to recognize +++ /dev/null as rm the file)?
- Matthew Martin
diff --git Makefile Makefile
index af6389a94f6..0ae338f1805 100644
--- Makefile
+++ Makefile
@@ -2,7 +2,7 @@
COMMENT= Z shell, Bourne shell-compatible
-V= 5.5
+V= 5.5.1
DISTNAME= zsh-$V
CATEGORIES=shells
diff --git distinfo distinfo
index 6a79e41a63c..bdf3045f919 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (zsh-5.5.tar.gz) = 0FYGpUVnKuhiOCiALbzEyD2aTT2/uWDpSp/Z9iRnwVk=
-SIZE (zsh-5.5.tar.gz) = 4576506
+SHA256 (zsh-5.5.1.tar.gz) = d0yqieeupfM8MDPL/9k+KHB/crpRSceXCeSObC0u4IA=
+SIZE (zsh-5.5.1.tar.gz) = 4578700
diff --git pkg/PLIST pkg/PLIST
index 0f1f851d890..6d040cf591c 100644
--- pkg/PLIST
+++ pkg/PLIST
@@ -192,6 +192,7 @@ share/zsh/${V}/functions/_chmod
share/zsh/${V}/functions/_chown
share/zsh/${V}/functions/_chrt
share/zsh/${V}/functions/_chsh
+share/zsh/${V}/functions/_cksum
share/zsh/${V}/functions/_clay
share/zsh/${V}/functions/_cmdambivalent
share/zsh/${V}/functions/_cmdstring
Casting bitmaps (clang 6)
net/nam has 32 files in bitmap/* which define a static char[]. Clang errors on any byte >= 0x80. The Tk API requires a static char *. Is it preferable to change the definition to a static unsigned char[] and reinterpret_cast when calling Tk or to sprikle static_cast in the definitions? In the latter case should all bytes be cast or just the ones >= 0x80? - Matthew Martin
clang 6 fix java/jlint
Fix format specifier, add spaces, and use negative literals when
negative numbers are desired (with a cast for -0x8000).
- Matthew Martin
diff --git patches/patch-jlint_cc patches/patch-jlint_cc
index 1bf4f950634..567174b30e4 100644
--- patches/patch-jlint_cc
+++ patches/patch-jlint_cc
@@ -1,6 +1,7 @@
$OpenBSD: patch-jlint_cc,v 1.5 2017/04/14 00:44:21 ian Exp $
jlint.cc.orig Mon Jan 10 21:42:33 2011
-+++ jlint.cc Wed Apr 12 14:39:37 2017
+Index: jlint.cc
+--- jlint.cc.orig
jlint.cc
@@ -41,7 +41,7 @@ bool source_path_redefined = false;
int reported_message_mask = cat_all;
FILE* history;
@@ -33,7 +34,7 @@ $OpenBSD: patch-jlint_cc,v 1.5 2017/04/14 00:44:21 ian Exp $
break;
case 'd': // integer
-dst += sprintf(dst, "%d", (int)(long)parameter[index]);
-+dst += sprintf(dst, "%d", (long)parameter[index]);
++dst += sprintf(dst, "%ld", (long)parameter[index]);
break;
default:
assert(false/*bad message parameter format*/);
@@ -66,3 +67,21 @@ $OpenBSD: patch-jlint_cc,v 1.5 2017/04/14 00:44:21 ian Exp $
monitor_stack::const_iterator it;
for (it = this_class->usedLocks.begin();
+@@ -662,7 +662,7 @@ inline int stricmp(const char* p, const char* q)
+ return 0;
+ }
+
+-void proceed_file(char* file_name, bool recursive = false)
++void proceed_file(char* file_name, int recursive = 0)
+ {
+ #ifdef _WIN32
+ HANDLE dir;
+@@ -1041,7 +1041,7 @@ int main(int argc, char* argv[])
+ if (verbose) {
+ fprintf(stderr,
+ "Jlint - program correctness verifier for Java, "
+- "version %s ("__DATE__").\n", VERSION);
++ "version %s (" __DATE__ ").\n", VERSION);
+ }
+ continue;
+ }
diff --git patches/patch-types_hh patches/patch-types_hh
index ceffae91f2d..62f1caa675f 100644
--- patches/patch-types_hh
+++ patches/patch-types_hh
@@ -1,6 +1,7 @@
$OpenBSD: patch-types_hh,v 1.4 2015/06/17 19:06:58 jasper Exp $
types.hh.orig Fri Oct 13 08:52:50 2006
-+++ types.hh Wed Jun 17 21:03:25 2015
+Index: types.hh
+--- types.hh.orig
types.hh
@@ -2,10 +2,10 @@
#define TYPES_HH
@@ -13,3 +14,20 @@ $OpenBSD: patch-types_hh,v 1.4 2015/06/17 19:06:58 jasper
Exp $
#include
#include
#include
+@@ -140,11 +140,11 @@ struct vbm_operand {
+
+ int_type_range const ranges[] = {
+ // min max
+- {0x, 0x0001}, // tp_bool
+-{0xff80, 0x007f}, // tp_byte
+- {0x, 0x}, // tp_char
+-{0x8000, 0x7fff}, // tp_short
+- {0x8000, 0x7fff} // tp_int
++ { 0x, 0x0001}, // tp_bool
++{-0x0080, 0x007f}, // tp_byte
++ { 0x, 0x}, // tp_char
++{-0x8000, 0x7fff}, // tp_short
++ {static_cast(-0x8000), 0x7fff} // tp_int
+ };
+
+ int const array_type[] = {
Re: clang 6 fix devel/jdk/1.8
On Wed, Apr 11, 2018 at 08:27:34AM -0400, Kurt Miller wrote: > On Tue, 2018-04-10 at 21:23 -0500, Matthew Martin wrote: > > Add lots of whitespace and change a few types from signed to > > unsigned. > > Probably should get a REVISION bump, but I'm not sure where that goes > > for subpackages. > > > > Is anyone already an OpenJDK contributor or know someone upstream > > with > > whom I could work? > > Hey Matthew, > > I'm both upstream and the port maintainer here. Thanks for working on > this. There are some aspects of the OpenJDK project that are particular > to it. In order for me to accept patches for upstream I need to respect > Oracle's policies. Unless things have changed recently, they require > authors of patches to sign their contribution agreement (ugh, yea I > know that sucks). For example getting the bsd-port project accepted by > Oracle required an review of all the bsd-port changes, who wrote them > and confirmation they had signed the SCSL (Sun's old agreement) or > Oracle's current one. Some patches needed to be dropped and recreated > from scratch in that process. > > Several times I have received small fixes for OpenJDK for things where > I simply did not look at the patch, recreated the problems and authored > an independent fix so I can push it upstream. I believe I'm in one of > of those cases now unless all of authors (including the ones taken from > FreeBSD) have signed the contribution agreement. > > I suggest you finish the work and I'll have to avoid participating now. > When I have time I can recreate the compilation issues using the > upstream repo and fix independently so I can get them upstream. > > Best, > -Kurt Morning Kurt, I was looking at the OCA last night; and although I'm generally not fond of giving up moral rights, in this case the patches are largely just adding whitespace and I don't think are (or at least should not be) copyrightable in the first place. If it would make things easier, I wouldn't mind signing it. The patches I sent are solely my own work and not taken from FreeBSD. - Matthew Martin
Re: clang 6 fix security/steghide
On Wed, Apr 11, 2018 at 01:48:29PM +0200, Jeremie Courreges-Anglas wrote:
> On Wed, Apr 11 2018, Giovanni Bechis <giova...@openbsd.org> wrote:
> > On 04/11/18 05:16, Matthew Martin wrote:
> >> On Tue, Apr 10, 2018 at 04:44:56PM +0200, Giovanni Bechis wrote:
> >>> test.log run on 6.3 attached, does it differs from yours ?
> >>> Cheers
> >>> Giovanni
> >>
> >> Not meaningfully. Thanks for the log.
> >>
> >> - Matthew Martin
> >>
> > Ok for me if it still works then.
> > I cannot commit nor switch to clang6 before next week.
>
> I would gladly commit it, but as-is the diff would break non-clang
> platforms. Maybe an ifdef check would be enough.
How about this then? Just tell clang to compile as c++03.
- Matthew Martin
diff --git Makefile Makefile
index 78a8c328b25..b1135d6771e 100644
--- Makefile
+++ Makefile
@@ -3,7 +3,7 @@
COMMENT = software able to hide data in various kind of files
DISTNAME = steghide-0.5.1
-REVISION = 4
+REVISION = 5
CATEGORIES = security
HOMEPAGE = http://steghide.sf.net/
@@ -20,9 +20,14 @@ LIB_DEPENDS =devel/gettext \
security/mhash \
graphics/jpeg
WANTLIB = c iconv intl jpeg m mhash mcrypt ${COMPILER_LIBCXX} z
-CONFIGURE_STYLE = gnu
+CONFIGURE_STYLE = autoconf
+AUTOCONF_VERSION = 2.57
CONFIGURE_ENV =CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -liconv -lintl"
+.include
+.if ${PROPERTIES:Mclang}
+CONFIGURE_ENV += CXXFLAGS=-std=c++03
+.endif
.include
diff --git patches/patch-configure_in patches/patch-configure_in
new file mode 100644
index 000..b68f1db01ee
--- /dev/null
+++ patches/patch-configure_in
@@ -0,0 +1,23 @@
+$OpenBSD$
+
+Index: configure.in
+--- configure.in.orig
configure.in
+@@ -22,14 +22,14 @@ AC_ARG_ENABLE(debug,[ --enable-debug enable
+ then
+ AC_MSG_RESULT([yes])
+ AC_DEFINE(DEBUG,1,[enable code used only for debugging])
+- CXXFLAGS="-O2 -Wall -g"
++ CXXFLAGS="$CXXFLAGS -O2 -Wall -g"
+ else
+ AC_MSG_RESULT([no])
+- CXXFLAGS="-O2 -Wall"
++ CXXFLAGS="$CXXFLAGS -O2 -Wall"
+ fi
+ ,
+ AC_MSG_RESULT([no])
+- CXXFLAGS="-O2 -Wall"
++ CXXFLAGS="$CXXFLAGS -O2 -Wall"
+ )
+
+ dnl check if randomness should be disabled
Re: clang 6 fix security/steghide
On Tue, Apr 10, 2018 at 04:44:56PM +0200, Giovanni Bechis wrote: > test.log run on 6.3 attached, does it differs from yours ? > Cheers > Giovanni Not meaningfully. Thanks for the log. - Matthew Martin
clang 6 fix security/steghide
Seems easier to make the C++11 fixes rather than patch the makefiles to
compile for C++03. There's a test failure, but I don't know if it's new.
- Matthew Martin
diff --git Makefile Makefile
index 78a8c328b25..2cc5016be00 100644
--- Makefile
+++ Makefile
@@ -3,7 +3,7 @@
COMMENT = software able to hide data in various kind of files
DISTNAME = steghide-0.5.1
-REVISION = 4
+REVISION = 5
CATEGORIES = security
HOMEPAGE = http://steghide.sf.net/
diff --git patches/patch-src_Arguments_h patches/patch-src_Arguments_h
new file mode 100644
index 000..189f313f3c0
--- /dev/null
+++ patches/patch-src_Arguments_h
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: src/Arguments.h
+--- src/Arguments.h.orig
src/Arguments.h
+@@ -100,7 +100,7 @@ class Arguments {
+ static const VERBOSITY Default_Verbosity = NORMAL ;
+ static const unsigned long Default_Radius = 0 ; // there is no
default radius for all file formats
+ static const unsigned int Max_Algorithm = 3 ;
+- static const float Default_Goal = 100.0 ;
++ static constexpr float Default_Goal = 100.0 ;
+ static const DEBUGCOMMAND Default_DebugCommand = NONE ;
+ static const bool Default_Check = false ;
+ static const unsigned int Default_DebugLevel = 0 ;
diff --git patches/patch-src_ProgressOutput_h patches/patch-src_ProgressOutput_h
new file mode 100644
index 000..133e2b781ca
--- /dev/null
+++ patches/patch-src_ProgressOutput_h
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: src/ProgressOutput.h
+--- src/ProgressOutput.h.orig
src/ProgressOutput.h
+@@ -64,7 +64,7 @@ class ProgressOutput {
+**/
+ void done (float rate, float avgweight = NoAvgWeight) const ;
+
+- static const float NoAvgWeight = -1.0 ;
++ static constexpr float NoAvgWeight = -1.0 ;
+
+ protected:
+ std::string vcompose (const char *msgfmt, va_list ap) const ;
update: math/z3
Update z3; builds here with clang 6. Enable tests while here.
- Matthew Martin
diff --git Makefile Makefile
index 6fe70abc40a..b32659d5940 100644
--- Makefile
+++ Makefile
@@ -2,9 +2,8 @@
COMMENT = z3 theorem prover
-VERSION = 4.5.0
+VERSION = 4.6.0
DISTNAME = z3-${VERSION}
-REVISION = 0
GH_ACCOUNT = Z3Prover
GH_PROJECT = z3
@@ -25,11 +24,12 @@ MODULES = lang/python
WRKDIST = ${WRKDIR}/z3-${DISTNAME}
-NO_TEST = Yes
-
do-build:
cd ${WRKSRC}/build && make
+do-test:
+ cd ${WRKSRC}/build && make test
+
do-install:
cd ${WRKSRC}/build && make install DESTDIR=""
diff --git distinfo distinfo
index 367c197e8d9..78a13056b2b 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (z3-4.5.0.tar.gz) = rq4dI5xeBqwYO+fdhTd1uEaY2xJlyyJY5ZGKKDctSgw=
-SIZE (z3-4.5.0.tar.gz) = 3573695
+SHA256 (z3-4.6.0.tar.gz) = UR2jHR+YXPDHmy3gW9pOBXNxulGXadFUb/ceEwT+U8k=
+SIZE (z3-4.6.0.tar.gz) = 3987830
diff --git pkg/PLIST pkg/PLIST
index 0d452ebdc7f..ad83b890997 100644
--- pkg/PLIST
+++ pkg/PLIST
@@ -12,6 +12,7 @@ include/z3_macros.h
include/z3_optimization.h
include/z3_polynomial.h
include/z3_rcf.h
+include/z3_spacer.h
include/z3_v1.h
lib/libz3.so
lib/python${MODPY_VERSION}/site-packages/z3/
clang 6 fix astro/celestia
Neither of these changes are in the code on github because these chunks
of code are no where to be found (even in history). Regardless builds
and runs here now.
- Matthew Martin
diff --git Makefile Makefile
index 5d8943d5330..2b18df5a1af 100644
--- Makefile
+++ Makefile
@@ -3,7 +3,7 @@
COMMENT= free space simulator and planetarium
DISTNAME= celestia-1.6.1
-REVISION= 12
+REVISION= 13
CATEGORIES=astro x11
diff --git patches/patch-src_celestia_celestiacore_cpp
patches/patch-src_celestia_celestiacore_cpp
index a2195a5dc9c..0c701fdf16d 100644
--- patches/patch-src_celestia_celestiacore_cpp
+++ patches/patch-src_celestia_celestiacore_cpp
@@ -1,6 +1,16 @@
$OpenBSD: patch-src_celestia_celestiacore_cpp,v 1.5 2011/07/09 01:41:13
ajacoutot Exp $
src/celestia/celestiacore.cpp.orig Sun Jun 5 18:11:13 2011
-+++ src/celestia/celestiacore.cpp Sat Jul 9 03:23:48 2011
+Index: src/celestia/celestiacore.cpp
+--- src/celestia/celestiacore.cpp.orig
src/celestia/celestiacore.cpp
+@@ -439,7 +439,7 @@ void CelestiaCore::activateFavorite(FavoritesEntry& fa
+ sim->setTime(fav.jd);
+ sim->setObserverPosition(fav.position);
+ sim->setObserverOrientation(fav.orientation);
+-if (fav.fov != NULL)
++if (fav.fov != 0)
+ {
+ sim->getActiveObserver()->setFOV(fav.fov);
+ setZoomFromFOV();
@@ -4103,7 +4103,7 @@ bool CelestiaCore::initSimulation(const string* config
}
else
diff --git patches/patch-src_celestia_favorites_cpp
patches/patch-src_celestia_favorites_cpp
new file mode 100644
index 000..039a7af4e61
--- /dev/null
+++ patches/patch-src_celestia_favorites_cpp
@@ -0,0 +1,23 @@
+$OpenBSD$
+
+Index: src/celestia/favorites.cpp
+--- src/celestia/favorites.cpp.orig
src/celestia/favorites.cpp
+@@ -80,7 +80,7 @@ FavoritesList* ReadFavoritesList(istream& in)
+
+ // Get fov
+ if (!favParams->getNumber("fov", fav->fov))
+-fav->fov = NULL;
++fav->fov = 0;
+
+ // Get time
+ fav->jd = 0.0;
+@@ -137,7 +137,7 @@ void WriteFavoritesList(FavoritesList& favorites, ostr
+ out << "\tangle " << angle << '\n';
+ out << setprecision(16);
+ out << "\ttime " << fav->jd << '\n';
+-if (fav->fov != NULL)
++if (fav->fov != 0)
+ out << "\tfov " << fav->fov << '\n';
+ out << "\tselection \"" << fav->selectionName << "\"\n";
+ out << "\tcoordsys \"";
update: zsh 5.5
Update zsh to 5.5. I've been running the RCs for a week or so and
haven't had issues. I bumped AUTOCONF_VERSION since ./configure has
a comment that it's generated with 2.69 and removed both remaining
patches. The _bsd_pkg patch is superseded by improvements made upstream
and the zsh.texi patch seems to be useless: zsh-5.5/fake-amd64 is
identical with and without the patch.
- Matthew Martin
diff --git Makefile Makefile
index 36350def5ad..1fc94cb5666 100644
--- Makefile
+++ Makefile
@@ -2,7 +2,7 @@
COMMENT= Z shell, Bourne shell-compatible
-V= 5.4.2
+V= 5.5
DISTNAME= zsh-$V
CATEGORIES=shells
@@ -21,7 +21,7 @@ WANTLIB= c curses iconv m pcre
LIB_DEPENDS= converters/libiconv \
devel/pcre
-AUTOCONF_VERSION=2.68
+AUTOCONF_VERSION=2.69
CONFIGURE_STYLE=autoconf
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git distinfo distinfo
index 446c618c94b..6a79e41a63c 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (zsh-5.4.2.tar.gz) = lXvNssV/ZMAvZzaT6lp1GO8ktlV66zpM4iLO+m10rMk=
-SIZE (zsh-5.4.2.tar.gz) = 4482413
+SHA256 (zsh-5.5.tar.gz) = 0FYGpUVnKuhiOCiALbzEyD2aTT2/uWDpSp/Z9iRnwVk=
+SIZE (zsh-5.5.tar.gz) = 4576506
diff --git patches/patch-Completion_BSD_Command__bsd_pkg
patches/patch-Completion_BSD_Command__bsd_pkg
deleted file mode 100644
index 5496f27152c..000
--- patches/patch-Completion_BSD_Command__bsd_pkg
+++ /dev/null
@@ -1,87 +0,0 @@
-$OpenBSD: patch-Completion_BSD_Command__bsd_pkg,v 1.5 2017/12/05 23:28:56 jca
Exp $
-Index: Completion/BSD/Command/_bsd_pkg
Completion/BSD/Command/_bsd_pkg.orig
-+++ Completion/BSD/Command/_bsd_pkg
-@@ -6,15 +6,19 @@ _bsd_pkg_pkgfiles() {
-
- case $OSTYPE in
- netbsd*)
--portsdir=/usr/pkgsrc
-+portsdir=${PORTSDIR:-/usr/pkgsrc}
-+pkgsdir=${PACKAGES:-$portsdir/packages}/All
- ;;
-+ openbsd*)
-+portsdir=${PORTSDIR:-/usr/ports}
-+pkgsdir=${PACKAGES:-$portsdir/packages}/$(arch -s)/All
-+;;
- *)
- portsdir=${PORTSDIR:-/usr/ports}
-+pkgsdir=${PACKAGES:-$portsdir/packages}/All
- ;;
- esac
-
-- pkgsdir=${PACKAGES:-$portsdir/packages}/All
--
- paths=( "${(@)${(@s.:.)PKG_PATH}:#}" )
- _files "$@" -g '*.t[bg]z(-.)' && ret=0
- (( $#path )) && _files "$@" -W paths -g '*.t[bg]z(-.)' && ret=0
-@@ -25,7 +29,7 @@ _bsd_pkg_pkgfiles() {
-
- (( $+functions[_bsd_pkg_pkgs] )) ||
- _bsd_pkg_pkgs() {
-- compadd "$@" - ${PKG_DBDIR:-/var/db/pkg}/*(/:t)
-+ compadd "$@" - ${PKG_DBDIR:-/var/db/pkg}/*(-/:t)
- }
-
- (( $+functions[_bsd_pkg_pkgs_and_files] )) ||
-@@ -157,14 +161,22 @@ _bsd_pkg() {
- ;;
- esac
-
--_arguments -s \
-- $flags[@] \
-- '(-a)*:package name:_bsd_pkg_pkgs_and_files'
-+case "$OSTYPE" in
-+openbsd*)
-+ _arguments -s \
-+$flags[@] \
-+'*:installed package name:_bsd_pkg_pkgs'
-+ ;;
-+*)
-+ _arguments -s \
-+$flags[@] \
-+'(-a)*:package name:_bsd_pkg_pkgs_and_files'
-+ ;;
-+esac
- ;;
-
- pkg_info)
- flags=(
-- '(:)-a[show all installed packages]'
- '-c[show comment fields]'
- '-D[show install-message files]'
- '-d[show long descriptions]'
-@@ -209,9 +221,20 @@ _bsd_pkg() {
- ;;
- esac
-
--_arguments -s \
-- $flags[@] \
-- '(-a)*:package name:_bsd_pkg_pkgs_and_files'
-+case "$OSTYPE" in
-+openbsd*)
-+ _arguments -s \
-+'(* -)-a[show all installed packages]' \
-+$flags[@] \
-+'*:installed package name:_bsd_pkg_pkgs'
-+ ;;
-+*)
-+ _arguments -s \
-+'(:)-a[show all installed packages]' \
-+$flags[@] \
-+'(-a)*:package name:_bsd_pkg_pkgs_and_files'
-+ ;;
-+esac
- ;;
- esac
- }
diff --git patches/patch-Doc_zsh_texi patches/patch-Doc_zsh_texi
deleted file mode 100644
index a827e72189c..000
--- patches/patch-Doc_zsh_texi
+++ /dev/null
@@ -1,14 +0,0 @@
-$OpenBSD: patch-Doc_zsh_texi,v 1.10 2017/02/02 03:41:12 juanfra Exp $
Doc/zsh.texi.orig Fri Dec 2 13:55:17 2016
-+++ Doc/zsh.texi Fri Dec 2 15:24:31 2016
-@@ -5,6 +5,10 @@
- @end iftex
- @setfilename zsh.info
- @settitle zsh
-+@dircategory Shells
-+@direntry
-+* Zsh: (zsh). The Z shell.
-+@end direntry
- @c %**end of header
-
- @ifinfo
diff --git pkg/PLIST pkg/PLIST
index 8a8a2a2d7e0..e61fd3b612b 100644
--- pkg/PLIST
+++ pkg/PLIST
@@ -117,6 +117,7 @@ share/zsh/${V}/functions/_all_labels
share/zsh/${V}/functions/_all_matches
share/zsh/${V}/functions/_alternative
share/zsh/${V}/functions/_analyseplugin
+share/zsh/${V}/functions/_ansible
share/zsh/${V}/functions/_ant
share/zsh/${V}/functions/_antiword
share/zsh/${V}/functions/_apachectl
@@ -170,6 +171,7 @@ share/zsh/${V}/functions/_bzip2
share/zsh/${V}/functions/_bzr
share/zsh/${V}/functio
dvd+rw-tools and clang 6
Looks like clang just needs some space. Again only build tested.
- Matthew Martin
diff --git patches/patch-dvd+rw-mediainfo_cpp patches/patch-dvd+rw-mediainfo_cpp
new file mode 100644
index 000..bf6310efc0f
--- /dev/null
+++ patches/patch-dvd+rw-mediainfo_cpp
@@ -0,0 +1,40 @@
+$OpenBSD$
+
+Index: dvd+rw-mediainfo.cpp
+--- dvd+rw-mediainfo.cpp.orig
dvd+rw-mediainfo.cpp
+@@ -621,7 +621,7 @@ legacy:
+ if (phys_end>0) phys_end -= phys_start;
+ if (phys_end>0) phys_end += 1;
+
+- printf (" %s%u*2KB=%"LLU"\n",
++ printf (" %s%u*2KB=%" LLU "\n",
+ dvd_dash>=0?"Legacy lead-out at:":"Last border-out at:",
+ phys_end,phys_end*2048LL);
+
+@@ -941,14 +941,14 @@ legacy:
+ printf(" %s:\t\t%u*%u=",type[formats[8]&3],
+ capacity=formats[4]<<24|formats[5]<<16|formats[6]<<8|formats[7],
+ blocksize);
+- printf("%"LLU"\n",(unsigned long long)capacity*blocksize);
++ printf("%" LLU "\n",(unsigned long long)capacity*blocksize);
+
+ for(i=12;i<len;i+=8)
+ { printf(" %02Xh(%x):\t\t%u*%u=",formats[i+4]>>2,
+ formats[i+5]<<16|formats[i+6]<<8|formats[i+7],
+
capacity=formats[i]<<24|formats[i+1]<<16|formats[i+2]<<8|formats[i+3],
+ blocksize);
+- printf("%"LLU"\n",(unsigned long long)capacity*blocksize);
++ printf("%" LLU "\n",(unsigned long long)capacity*blocksize);
+ }
+ break;
+ }
+@@ -1121,7 +1121,7 @@ legacy:
+ if (ccity) ccity++;
+ bsize = header[4]<<24|header[5]<<16|header[6]<<8|header[7];
+
+- printf ("READ CAPACITY: %u*%u=%"LLU"\n",
++ printf ("READ CAPACITY: %u*%u=%" LLU "\n",
+ ccity,bsize,
+ (unsigned long long)ccity*bsize);
+ } while (0);
apachetop and clang 6
Don't use apachetop, so just build tested. Looks like someone was
overzealous with their NULL usage. Also fix what looks like a write past
the end of the array.
- Matthew Martin
diff --git patches/patch-src_apachetop_cc patches/patch-src_apachetop_cc
new file mode 100644
index 000..0132e95966f
--- /dev/null
+++ patches/patch-src_apachetop_cc
@@ -0,0 +1,23 @@
+$OpenBSD$
+
+Index: src/apachetop.cc
+--- src/apachetop.cc.orig
src/apachetop.cc
+@@ -271,7 +271,7 @@ int main(int argc, char *argv[])
+ hm->create(cf.circle_size);
+ /* }}} */
+
+- memset(, (char) NULL, sizeof(gstats));
++ memset(, 0, sizeof(gstats));
+ gstats.start = time(NULL);
+
+ signal(SIGINT, );
+@@ -465,7 +465,7 @@ int main(int argc, char *argv[])
+ continue;
+ }
+
+- *nextline = (char) NULL;
++ *nextline = '\0';
+ ++nextline;
+
+ /* which parser? */
diff --git patches/patch-src_apachetop_cc.orig
patches/patch-src_apachetop_cc.orig
new file mode 100644
index 000..ca729eb2dd2
--- /dev/null
+++ patches/patch-src_apachetop_cc.orig
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: src/apachetop.cc
+--- src/apachetop.cc.orig
src/apachetop.cc
+@@ -271,7 +271,7 @@ int main(int argc, char *argv[])
+ hm->create(cf.circle_size);
+ /* }}} */
+
+- memset(, (char) NULL, sizeof(gstats));
++ memset(, 0, sizeof(gstats));
+ gstats.start = time(NULL);
+
+ signal(SIGINT, );
diff --git patches/patch-src_display_cc patches/patch-src_display_cc
new file mode 100644
index 000..7b45ed8d454
--- /dev/null
+++ patches/patch-src_display_cc
@@ -0,0 +1,32 @@
+$OpenBSD$
+
+Index: src/display.cc
+--- src/display.cc.orig
src/display.cc
+@@ -1145,7 +1145,7 @@ void display_histogram()
+* characters high to draw the barchart
+ */
+ float bar_height[hist_width];
+- char line[hist_width];
++ char line[hist_width + 1];
+ for(i = 0 ; i < hist_width ; i++)
+ bar_height[i] = 0;
+
+@@ -1191,7 +1191,7 @@ void display_histogram()
+
+ /* compose a row of hashes */
+ memset(line, ' ', hist_width);
+- line[hist_width] = (char)NULL;
++ line[hist_width] = '\0';
+ for(j = 0 ; j < hist_width ; ++j)
+ {
+ if (bar_height[j] > y_scale)
+@@ -1203,7 +1203,7 @@ void display_histogram()
+ }
+
+ memset(horiz_line, '-', hist_width);
+- horiz_line[hist_width] = (char)NULL;
++ horiz_line[hist_width] = '\0';
+ mvprintw(HISTOGRAM_START + hist_height, 2, "0+%*s",
+ hist_width, horiz_line);
+
diff --git patches/patch-src_display_cc.orig patches/patch-src_display_cc.orig
new file mode 100644
index 000..ddc053387dc
--- /dev/null
+++ patches/patch-src_display_cc.orig
@@ -0,0 +1,23 @@
+$OpenBSD$
+
+Index: src/display.cc
+--- src/display.cc.orig
src/display.cc
+@@ -1145,7 +1145,7 @@ void display_histogram()
+* characters high to draw the barchart
+ */
+ float bar_height[hist_width];
+- char line[hist_width];
++ char line[hist_width + 1];
+ for(i = 0 ; i < hist_width ; i++)
+ bar_height[i] = 0;
+
+@@ -1191,7 +1191,7 @@ void display_histogram()
+
+ /* compose a row of hashes */
+ memset(line, ' ', hist_width);
+- line[hist_width] = (char)NULL;
++ line[hist_width] = '\0';
+ for(j = 0 ; j < hist_width ; ++j)
+ {
+ if (bar_height[j] > y_scale)
diff --git patches/patch-src_hits_circle_cc patches/patch-src_hits_circle_cc
new file mode 100644
index 000..55678bed305
--- /dev/null
+++ patches/patch-src_hits_circle_cc
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: src/hits_circle.cc
+--- src/hits_circle.cc.orig
src/hits_circle.cc
+@@ -24,7 +24,7 @@ int Hits_Circle::create(unsigned int passed_size)
+ }
+
+ reqcount = bytecount = 0;
+- memset(rc_summary, (char) NULL, sizeof(rc_summary));
++ memset(rc_summary, 0, sizeof(rc_summary));
+
+ return 0;
+ }
diff --git patches/patch-src_log_cc patches/patch-src_log_cc
new file mode 100644
index 000..e6cf4f15af1
--- /dev/null
+++ patches/patch-src_log_cc
@@ -0,0 +1,59 @@
+$OpenBSD$
+
+Index: src/log.cc
+--- src/log.cc.orig
src/log.cc
+@@ -37,7 +37,7 @@ int CommonLogParser::parse(char *logline, struct logbi
+ if (!bufcp)
+ return -1;
+
+- *bufcp = (char) NULL;
++ *bufcp = '\0';
+ ++bufcp;
+
+ /* quickly figure out if this is an IP or a host. We do this by
+@@ -172,7 +172,7 @@ int CommonLogParser::parse(char *logline, struct logbi
+ /* find the end of referrer and null it */
Re: update: shells/zsh 5.4.2
On Mon, Nov 13, 2017 at 05:08:41PM +0100, Pierre-Emmanuel André wrote:
> ok pea@
ping?
diff --git Makefile Makefile
index 58066551155..ebf02b2ed75 100644
--- Makefile
+++ Makefile
@@ -2,7 +2,7 @@
COMMENT= Z shell, Bourne shell-compatible
-V= 5.4.1
+V= 5.4.2
DISTNAME= zsh-$V
CATEGORIES=shells
diff --git distinfo distinfo
index 0c68d09cc98..446c618c94b 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (zsh-5.4.1.tar.gz) = xEe4MsroZvUEWh6WP5vrcjFQJScSIkLjMibbBzwAHOI=
-SIZE (zsh-5.4.1.tar.gz) = 4468512
+SHA256 (zsh-5.4.2.tar.gz) = lXvNssV/ZMAvZzaT6lp1GO8ktlV66zpM4iLO+m10rMk=
+SIZE (zsh-5.4.2.tar.gz) = 4482413
diff --git patches/patch-Completion_BSD_Command__bsd_pkg
patches/patch-Completion_BSD_Command__bsd_pkg
index 2386825e9f6..7e5b6e8c7d3 100644
--- patches/patch-Completion_BSD_Command__bsd_pkg
+++ patches/patch-Completion_BSD_Command__bsd_pkg
@@ -1,12 +1,7 @@
$OpenBSD: patch-Completion_BSD_Command__bsd_pkg,v 1.4 2015/12/21 19:13:17
jasper Exp $
-
-From 3272bdce987a3e5d5448688529ccb8290e148a67 Mon Sep 17 00:00:00 2001
-From: Matthew Martin <phy1...@gmail.com>
-Date: Fri, 11 Dec 2015 11:51:09 +0100
-Subject: [PATCH] 37383: add completion type for object files
-
Completion/BSD/Command/_bsd_pkg.orig Wed Jan 21 14:53:28 2004
-+++ Completion/BSD/Command/_bsd_pkgMon Jan 23 21:30:02 2006
+Index: Completion/BSD/Command/_bsd_pkg
+--- Completion/BSD/Command/_bsd_pkg.orig
Completion/BSD/Command/_bsd_pkg
@@ -6,15 +6,19 @@ _bsd_pkg_pkgfiles() {
case $OSTYPE in
@@ -39,113 +34,7 @@ Subject: [PATCH] 37383: add completion type for object files
}
(( $+functions[_bsd_pkg_pkgs_and_files] )) ||
-@@ -67,9 +71,9 @@ _bsd_pkg() {
- ;;
- netbsd*)
- flags=(
-- $flags[@]
-- '-u[update]'
-- '-V[show version and exit]'
-+$flags[@]
-+'-u[update]'
-+'-V[show version and exit]'
- )
- ;;
- esac
-@@ -83,37 +87,37 @@ _bsd_pkg() {
- case "$OSTYPE" in
- freebsd*)
- flags=(
-- '-f[specify plist file]:plist file:_files'
-- '(-b)-c[specify comment file]:comment file:_files'
-- '(-b)-d[specify descr file]:descr file:_files'
-- '-Y[assume YES for any questions asked]'
-- '-N[assume NO for any questions asked]'
-- '(-b)-O[packing list only mode]'
-- '-v[be verbose]'
-- '-h[force tar to follow symlinks]'
-- '(-b)-i[specify pre-install script]:pre-install script:_files'
-- '(-b)-I[specify post-install script]:post-install script:_files'
-- '(-b)-P[specify initial dependencies]:dependencies:_bsd_pkg_pkgs'
-- '(-b)-p[specify prefix]:prefix directory:_files -/'
-- '(-b)-k[specify deinstall script]:deinstall script:_files'
-- '(-b)-K[specify post-deinstall script]:post-deinstall script:_files'
-- '(-b)-r[specify req script]:req script:_files'
-- '(-b)-s[specify source directory]:source directory:_files -/'
-- '(-b)-t[specify mktemp template]:mktemp template:_files'
-- '(-b)-X[specify exclude file]:exclude file for tar:_files'
-- '(-b)-D[specify message file]:message file:_files'
-- '(-b)-m[specify mtree file]:mtree file:_files'
-- '(-b)-o[specify origin]:origin:_files -W ${PORTSDIR\:-/usr/ports} -/'
-- '-j[use bzip2]'
-- '-z[use gzip]'
-- '(-c -d -O -i -I -P -p -k -K -r -s -t -X -D -m -o)-b[specify
pkgname]:pkgname:_bsd_pkg_pkgs'
-- '*:package file name:_files'
-+'-f[specify plist file]:plist file:_files'
-+'(-b)-c[specify comment file]:comment file:_files'
-+'(-b)-d[specify descr file]:descr file:_files'
-+'-Y[assume YES for any questions asked]'
-+'-N[assume NO for any questions asked]'
-+'(-b)-O[packing list only mode]'
-+'-v[be verbose]'
-+'-h[force tar to follow symlinks]'
-+'(-b)-i[specify pre-install script]:pre-install script:_files'
-+'(-b)-I[specify post-install script]:post-install script:_files'
-+'(-b)-P[specify initial dependencies]:dependencies:_bsd_pkg_pkgs'
-+'(-b)-p[specify prefix]:prefix directory:_files -/'
-+'(-b)-k[specify deinstall script]:deinstall script:_files'
-+'(-b)-K[specify post-deinstall script]:post-deinstall script:_files'
-+'(-b)-r[specify req script]:req script:_files'
-+'(-b)-s[specify source directory]:source directory:_files -/'
-+'(-b)-t[specify mktemp template]:mktemp template:_files'
-+'(-b)-X[specify exclude file]:exclude file for tar:_files'
-+'(-b)-D[specify message file]:message file:_files'
-+'(-b)-m[specify mtree file]:mtree file:_files'
-+'(-b)-o[specify origin]:origin:_files -W ${PORTSDIR\:-/usr/ports} -/'
-+'-j[use bzip2]'
-+'-z[use gzip]'
-+'(-c -d -O -i -I -P -p -k -K -r -s -t -X -D -m -o)-b[specify
pkgname]:pkgname:_bsd_pkg_pkgs'
-+'*:package file name:_files'
- )
-
Re: update: shells/zsh 5.4.2
Ping (with pea@ this time and my apologies). Haven't run into issues in
the past two months.
- Matthew Martin
On Sat, Sep 09, 2017 at 09:39:11PM -0500, Matthew Martin wrote:
> Been running this for about a week now. The patch is only large because
> I'd like to kill the needless whitespace changes in the _bsd_pkg
> completion patch. I don't have a strong opinion on the matter if someone
> prefers to keep it as is.
>
> - Matthew Martin
>
>
> diff --git Makefile Makefile
> index 58066551155..ebf02b2ed75 100644
> --- Makefile
> +++ Makefile
> @@ -2,7 +2,7 @@
>
> COMMENT= Z shell, Bourne shell-compatible
>
> -V= 5.4.1
> +V= 5.4.2
> DISTNAME=zsh-$V
> CATEGORIES= shells
>
> diff --git distinfo distinfo
> index 0c68d09cc98..446c618c94b 100644
> --- distinfo
> +++ distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (zsh-5.4.1.tar.gz) = xEe4MsroZvUEWh6WP5vrcjFQJScSIkLjMibbBzwAHOI=
> -SIZE (zsh-5.4.1.tar.gz) = 4468512
> +SHA256 (zsh-5.4.2.tar.gz) = lXvNssV/ZMAvZzaT6lp1GO8ktlV66zpM4iLO+m10rMk=
> +SIZE (zsh-5.4.2.tar.gz) = 4482413
> diff --git patches/patch-Completion_BSD_Command__bsd_pkg
> patches/patch-Completion_BSD_Command__bsd_pkg
> index 2386825e9f6..7e5b6e8c7d3 100644
> --- patches/patch-Completion_BSD_Command__bsd_pkg
> +++ patches/patch-Completion_BSD_Command__bsd_pkg
> @@ -1,12 +1,7 @@
> $OpenBSD: patch-Completion_BSD_Command__bsd_pkg,v 1.4 2015/12/21 19:13:17
> jasper Exp $
> -
> -From 3272bdce987a3e5d5448688529ccb8290e148a67 Mon Sep 17 00:00:00 2001
> -From: Matthew Martin <phy1...@gmail.com>
> -Date: Fri, 11 Dec 2015 11:51:09 +0100
> -Subject: [PATCH] 37383: add completion type for object files
> -
> Completion/BSD/Command/_bsd_pkg.orig Wed Jan 21 14:53:28 2004
> -+++ Completion/BSD/Command/_bsd_pkg Mon Jan 23 21:30:02 2006
> +Index: Completion/BSD/Command/_bsd_pkg
> +--- Completion/BSD/Command/_bsd_pkg.orig
> Completion/BSD/Command/_bsd_pkg
> @@ -6,15 +6,19 @@ _bsd_pkg_pkgfiles() {
>
> case $OSTYPE in
> @@ -39,113 +34,7 @@ Subject: [PATCH] 37383: add completion type for object
> files
> }
>
> (( $+functions[_bsd_pkg_pkgs_and_files] )) ||
> -@@ -67,9 +71,9 @@ _bsd_pkg() {
> - ;;
> - netbsd*)
> - flags=(
> --$flags[@]
> --'-u[update]'
> --'-V[show version and exit]'
> -+$flags[@]
> -+'-u[update]'
> -+'-V[show version and exit]'
> - )
> - ;;
> - esac
> -@@ -83,37 +87,37 @@ _bsd_pkg() {
> - case "$OSTYPE" in
> - freebsd*)
> - flags=(
> --'-f[specify plist file]:plist file:_files'
> --'(-b)-c[specify comment file]:comment file:_files'
> --'(-b)-d[specify descr file]:descr file:_files'
> --'-Y[assume YES for any questions asked]'
> --'-N[assume NO for any questions asked]'
> --'(-b)-O[packing list only mode]'
> --'-v[be verbose]'
> --'-h[force tar to follow symlinks]'
> --'(-b)-i[specify pre-install script]:pre-install script:_files'
> --'(-b)-I[specify post-install script]:post-install script:_files'
> --'(-b)-P[specify initial dependencies]:dependencies:_bsd_pkg_pkgs'
> --'(-b)-p[specify prefix]:prefix directory:_files -/'
> --'(-b)-k[specify deinstall script]:deinstall script:_files'
> --'(-b)-K[specify post-deinstall script]:post-deinstall script:_files'
> --'(-b)-r[specify req script]:req script:_files'
> --'(-b)-s[specify source directory]:source directory:_files -/'
> --'(-b)-t[specify mktemp template]:mktemp template:_files'
> --'(-b)-X[specify exclude file]:exclude file for tar:_files'
> --'(-b)-D[specify message file]:message file:_files'
> --'(-b)-m[specify mtree file]:mtree file:_files'
> --'(-b)-o[specify origin]:origin:_files -W ${PORTSDIR\:-/usr/ports} -/'
> --'-j[use bzip2]'
> --'-z[use gzip]'
> --'(-c -d -O -i -I -P -p -k -K -r -s -t -X -D -m -o)-b[specify
> pkgname]:pkgname:_bsd_pkg_pkgs'
> --'*:package file name:_files'
> -+'-f[specify plist file]:plist file:_files'
> -+'(-b)-c[specify comment file]:comment file:_files'
> -+'(-b)-d[specify descr file]:descr file:_files'
> -+'-Y[assume YES for any questions asked]'
> -+'-N[assume NO for any questions asked]'
> -+'(-b)-O[packing list only mode]'
> -+'-v[be verbose]'
> -+'-h[force tar to follow symlinks]'
> -+'(-b)-i[specify pre-install script]:pre-install script:_files'
> -+'(-b)-I[specify post-install script]:post-install script:_files'
> -+'(-b)-P[specify initial dependencies]:dependencies:_bsd_pkg_pkgs'
> -+'(-b)-p[specify prefix]:prefix directory:_files -/'
Re: Update to git-2.14.2
On Tue, Sep 26, 2017 at 05:22:36PM -0400, Daniel Jakots wrote: > Hi, > > Patch to update to latest release. Security advisory: > http://seclists.org/oss-sec/2017/q3/att-534/git_cvsserver.txt > > make test looks sorta good: > fixed 2 > success 16200 > failed 0 > broken 221 > total 16602 > (in the current version I have 'broken 222') > > I'll look into a patch for -stable. > > naddy, sthen you're in cc because I can smell the lock from here. > > Comments? OK? > > Cheers, > Daniel Works for me on OpenBSD 6.2 (GENERIC.MP) #111: Tue Sep 26 11:09:09 MDT 2017. Similar test results and I see no difference in my usual workflow. - Matthew Martin
update: shells/zsh 5.4.2
Been running this for about a week now. The patch is only large because
I'd like to kill the needless whitespace changes in the _bsd_pkg
completion patch. I don't have a strong opinion on the matter if someone
prefers to keep it as is.
- Matthew Martin
diff --git Makefile Makefile
index 58066551155..ebf02b2ed75 100644
--- Makefile
+++ Makefile
@@ -2,7 +2,7 @@
COMMENT= Z shell, Bourne shell-compatible
-V= 5.4.1
+V= 5.4.2
DISTNAME= zsh-$V
CATEGORIES=shells
diff --git distinfo distinfo
index 0c68d09cc98..446c618c94b 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (zsh-5.4.1.tar.gz) = xEe4MsroZvUEWh6WP5vrcjFQJScSIkLjMibbBzwAHOI=
-SIZE (zsh-5.4.1.tar.gz) = 4468512
+SHA256 (zsh-5.4.2.tar.gz) = lXvNssV/ZMAvZzaT6lp1GO8ktlV66zpM4iLO+m10rMk=
+SIZE (zsh-5.4.2.tar.gz) = 4482413
diff --git patches/patch-Completion_BSD_Command__bsd_pkg
patches/patch-Completion_BSD_Command__bsd_pkg
index 2386825e9f6..7e5b6e8c7d3 100644
--- patches/patch-Completion_BSD_Command__bsd_pkg
+++ patches/patch-Completion_BSD_Command__bsd_pkg
@@ -1,12 +1,7 @@
$OpenBSD: patch-Completion_BSD_Command__bsd_pkg,v 1.4 2015/12/21 19:13:17
jasper Exp $
-
-From 3272bdce987a3e5d5448688529ccb8290e148a67 Mon Sep 17 00:00:00 2001
-From: Matthew Martin <phy1...@gmail.com>
-Date: Fri, 11 Dec 2015 11:51:09 +0100
-Subject: [PATCH] 37383: add completion type for object files
-
Completion/BSD/Command/_bsd_pkg.orig Wed Jan 21 14:53:28 2004
-+++ Completion/BSD/Command/_bsd_pkgMon Jan 23 21:30:02 2006
+Index: Completion/BSD/Command/_bsd_pkg
+--- Completion/BSD/Command/_bsd_pkg.orig
Completion/BSD/Command/_bsd_pkg
@@ -6,15 +6,19 @@ _bsd_pkg_pkgfiles() {
case $OSTYPE in
@@ -39,113 +34,7 @@ Subject: [PATCH] 37383: add completion type for object files
}
(( $+functions[_bsd_pkg_pkgs_and_files] )) ||
-@@ -67,9 +71,9 @@ _bsd_pkg() {
- ;;
- netbsd*)
- flags=(
-- $flags[@]
-- '-u[update]'
-- '-V[show version and exit]'
-+$flags[@]
-+'-u[update]'
-+'-V[show version and exit]'
- )
- ;;
- esac
-@@ -83,37 +87,37 @@ _bsd_pkg() {
- case "$OSTYPE" in
- freebsd*)
- flags=(
-- '-f[specify plist file]:plist file:_files'
-- '(-b)-c[specify comment file]:comment file:_files'
-- '(-b)-d[specify descr file]:descr file:_files'
-- '-Y[assume YES for any questions asked]'
-- '-N[assume NO for any questions asked]'
-- '(-b)-O[packing list only mode]'
-- '-v[be verbose]'
-- '-h[force tar to follow symlinks]'
-- '(-b)-i[specify pre-install script]:pre-install script:_files'
-- '(-b)-I[specify post-install script]:post-install script:_files'
-- '(-b)-P[specify initial dependencies]:dependencies:_bsd_pkg_pkgs'
-- '(-b)-p[specify prefix]:prefix directory:_files -/'
-- '(-b)-k[specify deinstall script]:deinstall script:_files'
-- '(-b)-K[specify post-deinstall script]:post-deinstall script:_files'
-- '(-b)-r[specify req script]:req script:_files'
-- '(-b)-s[specify source directory]:source directory:_files -/'
-- '(-b)-t[specify mktemp template]:mktemp template:_files'
-- '(-b)-X[specify exclude file]:exclude file for tar:_files'
-- '(-b)-D[specify message file]:message file:_files'
-- '(-b)-m[specify mtree file]:mtree file:_files'
-- '(-b)-o[specify origin]:origin:_files -W ${PORTSDIR\:-/usr/ports} -/'
-- '-j[use bzip2]'
-- '-z[use gzip]'
-- '(-c -d -O -i -I -P -p -k -K -r -s -t -X -D -m -o)-b[specify
pkgname]:pkgname:_bsd_pkg_pkgs'
-- '*:package file name:_files'
-+'-f[specify plist file]:plist file:_files'
-+'(-b)-c[specify comment file]:comment file:_files'
-+'(-b)-d[specify descr file]:descr file:_files'
-+'-Y[assume YES for any questions asked]'
-+'-N[assume NO for any questions asked]'
-+'(-b)-O[packing list only mode]'
-+'-v[be verbose]'
-+'-h[force tar to follow symlinks]'
-+'(-b)-i[specify pre-install script]:pre-install script:_files'
-+'(-b)-I[specify post-install script]:post-install script:_files'
-+'(-b)-P[specify initial dependencies]:dependencies:_bsd_pkg_pkgs'
-+'(-b)-p[specify prefix]:prefix directory:_files -/'
-+'(-b)-k[specify deinstall script]:deinstall script:_files'
-+'(-b)-K[specify post-deinstall script]:post-deinstall script:_files'
-+'(-b)-r[specify req script]:req script:_files'
-+'(-b)-s[specify source directory]:source directory:_files -/'
-+'(-b)-t[specify mktemp template]:mktemp template:_files'
-+'(-b)-X[specify exclude file]:exclude file for tar:_files'
-+'(-b)-D[specify message file]:message file:_files'
-+'(-b)-m[specify mtree file]:mtree file:_files'
-+'(-b)-o[specify origin]:origin:_files -W ${PORTSDIR\:-/usr/ports} -/'
-+'-j[use bzip2]'
-+'-z[use gzip]'
-+
Re: UPDATE: shells/zsh
On Wed, Aug 09, 2017 at 09:41:33PM +0200, Rafael Sadowski wrote: > Please find below a quite simple patch to update zsh to 5.4.1. > > Ok? Comments? > > Rafael Sadowski Got to it before I could get home :). Works fine here. I had largely the same diff; however, I thought we might remove the needless whitespace changes in patches/patch-Completion_BSD_Command__bsd_pkg (I have the diff locally if anyone wants it). If anyone knows how to get a list of all packages (installed and not) preferably without having a ports tree, I could fix up the patch to push it upstream. - Matthew Martin
Re: NEW PORT: systemd
On Mon, Jul 31, 2017 at 08:07:13PM +0200, Marc Espie wrote: > Port is attached. Maintainer name and email don't seem to match. - Matthew Martin
[patch] zsh 5.3
Update to zsh 5.3, mostly removing upstreamed patches. A regex test in
D07 fails, but upstream believes[1] this is due to OpenBSD's locale
support (or lack thereof). Been running for about a day.
1: http://zsh.org/mla/workers/2016/msg02607.html
- Matthew Martin
Index: Makefile
===
RCS file: /cvs/ports/shells/zsh/Makefile,v
retrieving revision 1.82
diff -u -p -r1.82 Makefile
--- Makefile9 Apr 2016 20:14:49 - 1.82
+++ Makefile13 Dec 2016 02:40:43 -
@@ -2,10 +2,9 @@
COMMENT= Z shell, Bourne shell-compatible
-V= 5.2
+V= 5.3
DISTNAME= zsh-$V
CATEGORIES=shells
-REVISION= 3
MAINTAINER=Pierre-Emmanuel Andre <p...@openbsd.org>
Index: distinfo
===
RCS file: /cvs/ports/shells/zsh/distinfo,v
retrieving revision 1.22
diff -u -p -r1.22 distinfo
--- distinfo17 Dec 2015 18:31:21 - 1.22
+++ distinfo13 Dec 2016 02:40:43 -
@@ -1,2 +1,2 @@
-SHA256 (zsh-5.2.tar.gz) = +pJMU0xmM8IZ3P/c19qTmdq/tjNH+Izm3c1btEEhWTc=
-SIZE (zsh-5.2.tar.gz) = 4245682
+SHA256 (zsh-5.3.tar.gz) = HaJz+pYEGzle6fYo0U8q/wj5pi6YQjqZAhji6gN7mm0=
+SIZE (zsh-5.3.tar.gz) = 4403492
Index: patches/patch-Completion_Unix_Command__elfdump
===
RCS file: patches/patch-Completion_Unix_Command__elfdump
diff -N patches/patch-Completion_Unix_Command__elfdump
--- patches/patch-Completion_Unix_Command__elfdump 21 Dec 2015 19:13:17
- 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,29 +0,0 @@
-$OpenBSD: patch-Completion_Unix_Command__elfdump,v 1.1 2015/12/21 19:13:17
jasper Exp $
-
-From 3272bdce987a3e5d5448688529ccb8290e148a67 Mon Sep 17 00:00:00 2001
-From: Matthew Martin <phy1...@gmail.com>
-Date: Fri, 11 Dec 2015 11:51:09 +0100
-Subject: [PATCH] 37383: add completion type for object files
-
Completion/Unix/Command/_elfdump.orig Sun May 3 19:57:18 2015
-+++ Completion/Unix/Command/_elfdump Mon Dec 21 09:54:57 2015
-@@ -2,10 +2,6 @@
-
- local -a args
-
--_elf_file() {
-- [[ -x $REPLY || $REPLY = (core*|*.([ao]|so|elf)) ]]
--}
--
- args=(
- '-c[dump section header information]'
- '-d[dump .dynamic section]'
-@@ -38,7 +34,7 @@ case $OSTYPE in
- '-l[show long section names without truncation]'
- '-O[specify osabi to apply]:osabi'
- '-P[use alternative section header]'
-- "*:elf file:_files -g '*(-.e:_elf_file:)'"
-+ "*:elf file:_object_files"
- )
- ;;
- freebsd*) args+=( '-a[dump all information]' ) ;;
Index: patches/patch-Completion_Unix_Command__nm
===
RCS file: patches/patch-Completion_Unix_Command__nm
diff -N patches/patch-Completion_Unix_Command__nm
--- patches/patch-Completion_Unix_Command__nm 21 Dec 2015 19:13:17 -
1.3
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,22 +0,0 @@
-$OpenBSD: patch-Completion_Unix_Command__nm,v 1.3 2015/12/21 19:13:17 jasper
Exp $
-
-From 3272bdce987a3e5d5448688529ccb8290e148a67 Mon Sep 17 00:00:00 2001
-From: Matthew Martin <phy1...@gmail.com>
-Date: Fri, 11 Dec 2015 11:51:09 +0100
-Subject: [PATCH] 37383: add completion type for object files
-
Completion/Unix/Command/_nm.orig Sat Oct 24 19:06:08 2015
-+++ Completion/Unix/Command/_nmMon Dec 21 10:04:02 2015
-@@ -2,11 +2,7 @@
-
- local args files variant
-
--_nm_object_file() {
-- [[ -x $REPLY || $REPLY = *.([ao]|so|elf) ]]
--}
--
--files="*:object file:_files -g '*(-.e,_nm_object_file,)'"
-+files="*:object file:_object_files"
- args=(
- '(-A -o --print-file-name)'{-A,-o,--print-file-name}'[print name of input
file on each line]'
- '(--demangle)-C[decode symbol names]'
Index: patches/patch-Completion_Unix_Command__objdump
===
RCS file: patches/patch-Completion_Unix_Command__objdump
diff -N patches/patch-Completion_Unix_Command__objdump
--- patches/patch-Completion_Unix_Command__objdump 21 Dec 2015 19:13:17
- 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,19 +0,0 @@
-$OpenBSD: patch-Completion_Unix_Command__objdump,v 1.1 2015/12/21 19:13:17
jasper Exp $
-
-From 3272bdce987a3e5d5448688529ccb8290e148a67 Mon Sep 17 00:00:00 2001
-From: Matthew Martin <phy1...@gmail.com>
-Date: Fri, 11 Dec 2015 11:51:09 +0100
-Subject: [PATCH] 37383: add completion type for object files
-
Completion/Unix/Command/_objdump.orig Sat Oct 24 19:06:08 2015
-+++ Completion/Unix/Command/_objdump Mon Dec 21 09:54:57 2015
-@@ -1,8 +1,3 @@
- #compdef objdump
-
--# borrowed from _nm_object_file
--_objdump_object_file() {
-- [[ -x $REPLY || $REPLY = *.([ao]|so|elf) ]]
--}
--
--_arguments -- '*:object file:_files -g "*(-.e,_objdump_object_file,)"'
-+_arguments -- '*:object
Re: UPDATE: ledger 3.1.1
On Mon, Mar 14, 2016 at 08:05:59PM +0100, Florian Stinglmayr wrote:
> On Mon, Mar 14, 2016 at 06:00:09PM +, Martin Oppegaard wrote:
> > I get it to build, but it doesn't install the binary. It installs
> > libledger.so instead. From the patch:
> >
> > -@bin bin/ledger
> > +@lib bin/libledger.so.${LIBledger_VERSION}
> >
>
> Thanks a lot for testing. This bug has been fixed in the diff below.
>
> Please apply with patch -p0 < ledger.patch so that all necessary
> directories are created. This should fix any build issues one might
> have.
>
> Regards,
> Florian
Compiles and works for my ledger file (but I started using ledger after
your first mail). Only tests 1, 3, 4, and 5 pass for me; the other 339
fail. Is this expected?
- Matthew Martin
[patch] time_t printf in zsh
zsh printf's a time_t as a long. The cast is so that I can send the same patch upstream (assuming that casting to long long is the correct fix). Bug found with clang. - Matthew Martin Index: patches/patch-Src_Builtins_sched_c === RCS file: patches/patch-Src_Builtins_sched_c diff -N patches/patch-Src_Builtins_sched_c --- /dev/null 1 Jan 1970 00:00:00 - +++ patches/patch-Src_Builtins_sched_c 21 Feb 2016 01:23:00 - @@ -0,0 +1,12 @@ +$OpenBSD$ +--- Src/Builtins/sched.c.orig Fri Feb 19 19:38:11 2016 Src/Builtins/sched.c Sat Feb 20 11:06:55 2016 +@@ -353,7 +353,7 @@ schedgetfn(UNUSED(Param pm)) + time_t t; + + t = sch->time; +- sprintf(tbuf, "%ld", t); ++ sprintf(tbuf, "%lld", (long long) t); + if (sch->flags & SCHEDFLAG_TRASH_ZLE) + flagstr = "-o"; + else
[update] zsh 5.2
Zsh 5.2 was released yesterday. All tests pass on amd64.
- Matthew Martin
Index: Makefile
===
RCS file: /cvs/ports/shells/zsh/Makefile,v
retrieving revision 1.75
diff -u -p -r1.75 Makefile
--- Makefile6 Nov 2015 14:17:03 - 1.75
+++ Makefile3 Dec 2015 20:55:09 -
@@ -2,7 +2,7 @@
COMMENT= Z shell, Bourne shell-compatible
-V= 5.1.1
+V= 5.2
DISTNAME= zsh-$V
CATEGORIES=shells
Index: distinfo
===
RCS file: /cvs/ports/shells/zsh/distinfo,v
retrieving revision 1.21
diff -u -p -r1.21 distinfo
--- distinfo6 Nov 2015 14:17:03 - 1.21
+++ distinfo3 Dec 2015 20:55:09 -
@@ -1,2 +1,2 @@
-SHA256 (zsh-5.1.1.tar.gz) = lO1bQSAjdhvI0vA8Fz8T1iXgbl1vDf8sem4UDD+lUIc=
-SIZE (zsh-5.1.1.tar.gz) = 4192885
+SHA256 (zsh-5.2.tar.gz) = +pJMU0xmM8IZ3P/c19qTmdq/tjNH+Izm3c1btEEhWTc=
+SIZE (zsh-5.2.tar.gz) = 4245682
Index: pkg/PFRAG.shared
===
RCS file: /cvs/ports/shells/zsh/pkg/PFRAG.shared,v
retrieving revision 1.10
diff -u -p -r1.10 PFRAG.shared
--- pkg/PFRAG.shared2 Oct 2013 19:49:13 - 1.10
+++ pkg/PFRAG.shared3 Dec 2015 20:55:09 -
@@ -20,6 +20,8 @@ lib/zsh/${V}/zsh/net/
lib/zsh/${V}/zsh/net/socket.so
lib/zsh/${V}/zsh/net/tcp.so
lib/zsh/${V}/zsh/newuser.so
+lib/zsh/${V}/zsh/param/
+lib/zsh/${V}/zsh/param/private.so
lib/zsh/${V}/zsh/parameter.so
lib/zsh/${V}/zsh/pcre.so
lib/zsh/${V}/zsh/regex.so
Index: pkg/PLIST
===
RCS file: /cvs/ports/shells/zsh/pkg/PLIST,v
retrieving revision 1.41
diff -u -p -r1.41 PLIST
--- pkg/PLIST 6 Nov 2015 14:17:03 - 1.41
+++ pkg/PLIST 3 Dec 2015 20:55:09 -
@@ -172,6 +172,7 @@ share/zsh/${V}/functions/_cryptsetup
share/zsh/${V}/functions/_cssh
share/zsh/${V}/functions/_csup
share/zsh/${V}/functions/_ctags_tags
+share/zsh/${V}/functions/_curl
share/zsh/${V}/functions/_cut
share/zsh/${V}/functions/_cvs
share/zsh/${V}/functions/_cvsup
@@ -329,6 +330,7 @@ share/zsh/${V}/functions/_gzip
share/zsh/${V}/functions/_hash
share/zsh/${V}/functions/_have_glob_qual
share/zsh/${V}/functions/_hdiutil
+share/zsh/${V}/functions/_head
share/zsh/${V}/functions/_hg
share/zsh/${V}/functions/_history
share/zsh/${V}/functions/_history_complete_word
@@ -383,6 +385,7 @@ share/zsh/${V}/functions/_links
share/zsh/${V}/functions/_lintian
share/zsh/${V}/functions/_list
share/zsh/${V}/functions/_list_files
+share/zsh/${V}/functions/_lldb
share/zsh/${V}/functions/_ln
share/zsh/${V}/functions/_loadkeys
share/zsh/${V}/functions/_locales
@@ -472,6 +475,7 @@ share/zsh/${V}/functions/_nothing
share/zsh/${V}/functions/_notmuch
share/zsh/${V}/functions/_npm
share/zsh/${V}/functions/_nslookup
+share/zsh/${V}/functions/_objdump
share/zsh/${V}/functions/_object_classes
share/zsh/${V}/functions/_od
share/zsh/${V}/functions/_okular
@@ -589,6 +593,7 @@ 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/_screen
share/zsh/${V}/functions/_sed
share/zsh/${V}/functions/_sep_parts
@@ -643,8 +648,8 @@ share/zsh/${V}/functions/_sysctl
share/zsh/${V}/functions/_sysstat
share/zsh/${V}/functions/_systat
share/zsh/${V}/functions/_system_profiler
-share/zsh/${V}/functions/_systemd
share/zsh/${V}/functions/_tags
+share/zsh/${V}/functions/_tail
share/zsh/${V}/functions/_tar
share/zsh/${V}/functions/_tar_archive
share/zsh/${V}/functions/_tardy
@@ -671,6 +676,7 @@ share/zsh/${V}/functions/_topgit
share/zsh/${V}/functions/_totd
share/zsh/${V}/functions/_tpb
share/zsh/${V}/functions/_tpconfig
+share/zsh/${V}/functions/_tr
share/zsh/${V}/functions/_tracepath
share/zsh/${V}/functions/_trap
share/zsh/${V}/functions/_tree
@@ -802,7 +808,9 @@ share/zsh/${V}/functions/_zoneadm
share/zsh/${V}/functions/_zones
share/zsh/${V}/functions/_zpool
share/zsh/${V}/functions/_zpty
+share/zsh/${V}/functions/_zsh
share/zsh/${V}/functions/_zsh-mime-handler
+share/zsh/${V}/functions/_zsocket
share/zsh/${V}/functions/_zstyle
share/zsh/${V}/functions/_ztodo
share/zsh/${V}/functions/_zypper
@@ -815,6 +823,7 @@ share/zsh/${V}/functions/backward-word-m
share/zsh/${V}/functions/bashcompinit
share/zsh/${V}/functions/before
share/zsh/${V}/functions/bracketed-paste-magic
+share/zsh/${V}/functions/bracketed-paste-url-magic
share/zsh/${V}/functions/calendar
share/zsh/${V}/functions/calendar_add
share/zsh/${V}/functions/calendar_edit
@@ -991,6 +1000,7 @@ share/zsh/${V}/functions/zsh-mime-handle
share/zsh/${V}/functions/zsh-mime-setup
share/zsh/${V}/functions/zsh-newuser-install
share/zsh/${V}/functions/zsh_directory_name_cdr
+share/zsh/${V}/functions/zsh_directory_name_generic
share/zsh/${V}/functions/zstyle+
share/zsh/${V
new: shells/zsh-syntax-highlighting
New port for zsh-syntax-highlighting which provides fish shell like syntax highlighting for zsh. Github home page is https://github.com/zsh-users/zsh-syntax-highlighting . A few questions: * Is there a more appropriate category than shells for this? * Is it preferred to set NO_BUILD or SEPARATE_BUILD for a port that only copies files? - Matthew Martin zsh-syntax-highlighting.tgz Description: application/tar-gz
Re: [update] zsh-5.1.1
Ping? I've been running this for over a month with no issues.
On Sat, Sep 12, 2015 at 12:04:25AM -0500, Matthew Martin wrote:
> zsh has already released a 5.1.1. This is a one line change from the
> final diff in the 5.1 thread.
>
> The failing test (D07) was added between 5.0.8 and 5.1 in commit bfac7f0
> 35374: tab expansion with double width characters. I think this is a bug
> in OpenBSD's Unicode handling, but I haven't yet had the time to dig
> deep enough to find a definitive cause. Interestingly the test's success
> depends on the snapshot I'm running (some always fail, some always
> succeed); however, the output of the print line in question does not
> change (that is there's always the incorrect 8 spaces after ZSH).
>
> I have still yet to see any other failing tests on amd64.
>
> - Matthew Martin
>
>
>
> Index: shells/zsh/Makefile
> ===
> RCS file: /cvs/ports/shells/zsh/Makefile,v
> retrieving revision 1.74
> diff -u -p -r1.74 Makefile
> --- shells/zsh/Makefile 28 Apr 2015 06:30:13 - 1.74
> +++ shells/zsh/Makefile 12 Sep 2015 02:28:22 -
> @@ -2,9 +2,8 @@
>
> COMMENT= Z shell, Bourne shell-compatible
>
> -V= 5.0.7
> +V= 5.1.1
> DISTNAME=zsh-$V
> -REVISION=0
> CATEGORIES= shells
>
> MAINTAINER= Pierre-Emmanuel Andre <p...@openbsd.org>
> @@ -12,6 +11,7 @@ MAINTAINER= Pierre-Emmanuel Andre <pea@o
> HOMEPAGE=http://www.zsh.org/
>
> MASTER_SITES=${MASTER_SITE_SOURCEFORGE:=zsh/}
> +MASTER_SITES+= http://www.zsh.org/pub/
>
> # BSD
> PERMIT_PACKAGE_CDROM=Yes
> @@ -49,11 +49,14 @@ EXTFILES= Misc/checkmail Misc/run-help M
>
> pre-configure:
> .for i in ${EXTFILES}
> - perl -pi -e "s,/bin/zsh,${TRUEPREFIX}/bin/zsh,g"
> ${WRKSRC}/Functions/${i}
> + sed -i -e "s,/bin/zsh,${TRUEPREFIX}/bin/zsh,g" ${WRKSRC}/Functions/${i}
> .endfor
> @find ${WRKSRC} -name "*.orig" -exec rm -f {} \;
>
> post-install:
> ${INSTALL_DATA_DIR} ${PREFIX}/share/zsh/$V/scripts/
> +
> +pre-test:
> + rm -f ${WRKDIR}/bin/chgrp
>
> .include
> Index: shells/zsh/distinfo
> ===
> RCS file: /cvs/ports/shells/zsh/distinfo,v
> retrieving revision 1.20
> diff -u -p -r1.20 distinfo
> --- shells/zsh/distinfo 22 Apr 2015 11:52:40 - 1.20
> +++ shells/zsh/distinfo 12 Sep 2015 02:28:22 -
> @@ -1,2 +1,2 @@
> -SHA256 (zsh-5.0.7.tar.gz) = Q/CkwXnvebuMkVNXVoX39F8oo2FcjPljRfUD1bnnuRk=
> -SIZE (zsh-5.0.7.tar.gz) = 4004964
> +SHA256 (zsh-5.1.1.tar.gz) = lO1bQSAjdhvI0vA8Fz8T1iXgbl1vDf8sem4UDD+lUIc=
> +SIZE (zsh-5.1.1.tar.gz) = 4192885
> Index: shells/zsh/patches/patch-Completion_BSD_Command__bsd_pkg
> ===
> RCS file:
> /cvs/ports/shells/zsh/patches/patch-Completion_BSD_Command__bsd_pkg,v
> retrieving revision 1.2
> diff -u -p -r1.2 patch-Completion_BSD_Command__bsd_pkg
> --- shells/zsh/patches/patch-Completion_BSD_Command__bsd_pkg 29 Jan 2006
> 20:41:02 - 1.2
> +++ shells/zsh/patches/patch-Completion_BSD_Command__bsd_pkg 12 Sep 2015
> 02:28:22 -
> @@ -33,21 +33,6 @@ $OpenBSD: patch-Completion_BSD_Command__
> }
>
> (( $+functions[_bsd_pkg_pkgs_and_files] )) ||
> -@@ -48,11 +52,11 @@ _bsd_pkg() {
> - pkg_add)
> - flags=(
> - '-f[force installation]'
> -- '-I[don'\''t execute installation scripts]'
> -+ '-I[don''t execute installation scripts]'
> - '-M[run in master mode]'
> -- '-n[don'\''t really install packages]'
> -+ '-n[don''t really install packages]'
> - '-p[specify prefix]:prefix directory:_files -/'
> -- '-R[don'\''t record]'
> -+ '-R[don''t record]'
> - '-S[run in slave mode]'
> - '-t[specify mktemp template]:mktemp template:_files -/'
> - '-v[be verbose]'
> @@ -67,9 +71,9 @@ _bsd_pkg() {
> ;;
> netbsd*)
> @@ -125,19 +110,6 @@ $OpenBSD: patch-Completion_BSD_Command__
> )
> ;;
> esac
> -@@ -124,10 +128,10 @@ _bsd_pkg() {
> -
> - pkg_delete)
> - flags=(
> -- '-D[don'\''t execute deinstallation scripts]'
> -+ '-D[don''t execute deinstallation scripts]'
> - '-d[remove empty directories]'
> - '-f[force deinstallation]'
> -- '-n[don'\''t really deinstall packages]'
> -+ '-n[don''t really deinstall packages]'
> - '-p[specify prefix]:prefix directory:_files -/'
> - '-v[be verbose]'
> - )
> @@ -136,35 +140,43 @@
[update] zsh-5.1.1
zsh has already released a 5.1.1. This is a one line change from the
final diff in the 5.1 thread.
The failing test (D07) was added between 5.0.8 and 5.1 in commit bfac7f0
35374: tab expansion with double width characters. I think this is a bug
in OpenBSD's Unicode handling, but I haven't yet had the time to dig
deep enough to find a definitive cause. Interestingly the test's success
depends on the snapshot I'm running (some always fail, some always
succeed); however, the output of the print line in question does not
change (that is there's always the incorrect 8 spaces after ZSH).
I have still yet to see any other failing tests on amd64.
- Matthew Martin
Index: shells/zsh/Makefile
===
RCS file: /cvs/ports/shells/zsh/Makefile,v
retrieving revision 1.74
diff -u -p -r1.74 Makefile
--- shells/zsh/Makefile 28 Apr 2015 06:30:13 - 1.74
+++ shells/zsh/Makefile 12 Sep 2015 02:28:22 -
@@ -2,9 +2,8 @@
COMMENT= Z shell, Bourne shell-compatible
-V= 5.0.7
+V= 5.1.1
DISTNAME= zsh-$V
-REVISION= 0
CATEGORIES=shells
MAINTAINER=Pierre-Emmanuel Andre <p...@openbsd.org>
@@ -12,6 +11,7 @@ MAINTAINER= Pierre-Emmanuel Andre <pea@o
HOMEPAGE= http://www.zsh.org/
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=zsh/}
+MASTER_SITES+= http://www.zsh.org/pub/
# BSD
PERMIT_PACKAGE_CDROM= Yes
@@ -49,11 +49,14 @@ EXTFILES= Misc/checkmail Misc/run-help M
pre-configure:
.for i in ${EXTFILES}
- perl -pi -e "s,/bin/zsh,${TRUEPREFIX}/bin/zsh,g"
${WRKSRC}/Functions/${i}
+ sed -i -e "s,/bin/zsh,${TRUEPREFIX}/bin/zsh,g" ${WRKSRC}/Functions/${i}
.endfor
@find ${WRKSRC} -name "*.orig" -exec rm -f {} \;
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/zsh/$V/scripts/
+
+pre-test:
+ rm -f ${WRKDIR}/bin/chgrp
.include
Index: shells/zsh/distinfo
===
RCS file: /cvs/ports/shells/zsh/distinfo,v
retrieving revision 1.20
diff -u -p -r1.20 distinfo
--- shells/zsh/distinfo 22 Apr 2015 11:52:40 - 1.20
+++ shells/zsh/distinfo 12 Sep 2015 02:28:22 -
@@ -1,2 +1,2 @@
-SHA256 (zsh-5.0.7.tar.gz) = Q/CkwXnvebuMkVNXVoX39F8oo2FcjPljRfUD1bnnuRk=
-SIZE (zsh-5.0.7.tar.gz) = 4004964
+SHA256 (zsh-5.1.1.tar.gz) = lO1bQSAjdhvI0vA8Fz8T1iXgbl1vDf8sem4UDD+lUIc=
+SIZE (zsh-5.1.1.tar.gz) = 4192885
Index: shells/zsh/patches/patch-Completion_BSD_Command__bsd_pkg
===
RCS file: /cvs/ports/shells/zsh/patches/patch-Completion_BSD_Command__bsd_pkg,v
retrieving revision 1.2
diff -u -p -r1.2 patch-Completion_BSD_Command__bsd_pkg
--- shells/zsh/patches/patch-Completion_BSD_Command__bsd_pkg29 Jan 2006
20:41:02 - 1.2
+++ shells/zsh/patches/patch-Completion_BSD_Command__bsd_pkg12 Sep 2015
02:28:22 -
@@ -33,21 +33,6 @@ $OpenBSD: patch-Completion_BSD_Command__
}
(( $+functions[_bsd_pkg_pkgs_and_files] )) ||
-@@ -48,11 +52,11 @@ _bsd_pkg() {
- pkg_add)
- flags=(
- '-f[force installation]'
-- '-I[don'\''t execute installation scripts]'
-+ '-I[don''t execute installation scripts]'
- '-M[run in master mode]'
-- '-n[don'\''t really install packages]'
-+ '-n[don''t really install packages]'
- '-p[specify prefix]:prefix directory:_files -/'
-- '-R[don'\''t record]'
-+ '-R[don''t record]'
- '-S[run in slave mode]'
- '-t[specify mktemp template]:mktemp template:_files -/'
- '-v[be verbose]'
@@ -67,9 +71,9 @@ _bsd_pkg() {
;;
netbsd*)
@@ -125,19 +110,6 @@ $OpenBSD: patch-Completion_BSD_Command__
)
;;
esac
-@@ -124,10 +128,10 @@ _bsd_pkg() {
-
- pkg_delete)
- flags=(
-- '-D[don'\''t execute deinstallation scripts]'
-+ '-D[don''t execute deinstallation scripts]'
- '-d[remove empty directories]'
- '-f[force deinstallation]'
-- '-n[don'\''t really deinstall packages]'
-+ '-n[don''t really deinstall packages]'
- '-p[specify prefix]:prefix directory:_files -/'
- '-v[be verbose]'
- )
@@ -136,35 +140,43 @@ _bsd_pkg() {
freebsd*)
flags=(
@@ -162,7 +134,7 @@ $OpenBSD: patch-Completion_BSD_Command__
+'(:)-a[delete all installed packages]'
+'-F[specify each package by an installed file]'
+'-i[be interactive]'
-+'-O[only delete the package''s entries]'
++'-O[only delete the package'\''s entries]'
'-R[delete upward recursively]'
'-r[delete recursively]'
- '-V[show version and exit]'
Index: shells/zsh/patches/patch-Completion_Base_Utility__call_program
===
RCS file: shells/zsh/patches/patch-Completion_Base_Utility__call_program
diff -N shells/zsh/patches/patch-Completion_Base_Utility__ca
Re: [update] zsh-5.1
On Wed, Sep 02, 2015 at 07:26:35AM +0200, Theo Buehler wrote:
> On Tue, Sep 01, 2015 at 08:55:36PM -0500, Matthew Martin wrote:
> > Patch to update zsh to 5.1. Fairly boring mostly deleting upstreamed
> > patches, deleteing unneeded parts of patches, and adding the pre-test
> > hack discussed at http://marc.info/?t=14406539723=1=2 .
>
> First of all thanks for tracking down and fixing that annoying broken
> test, this has been around for quite a while. After seeing the solution
> I'm sure it would have taken me a long time to figure that one out (if I
> would have found it at all)... Great!
>
> When will 5.1 be officially released? The zsh.org site still announces
> 5.0.8. I will test your port when the release is official.
pws announced it on zsh-users
http://www.zsh.org/mla/users/2015/msg00839.html
> A couple of months ago, I posted an update for 5.0.8, but it didn't make
> it into the tree. I'm happy to drop it that since your fixes are
> generally superior to mine. For reference
> http://www.marc.info/?t=14358179311=1=2
I saw it, but then people started complaining about regressions for
5.0.8 on zsh-workers, and I figured old is better than broken for 5.8.
> A few comments on your patch:
>
> - I was a bit more aggressive about unneeded parts in
> patches/patch-Completion_BSD_Command__bsd_pkg
> because most of the rest of this patch is really just whitespace
> noise.
I have plans to eventually upstream this patch too and would include the
whitespace there. There's no harm in keeping it for one more release
(I've been thinking about better pkg_* completion; hopefully I'll get to
it before 5.2).
> - I agree about the texi-bits. As it currently stands, it makes no
> sense and introduces a few errors. I went for fixing the errors and
> adding the missing bits for consistency, but the resulting patch is
> humungous. If they are no longer needed, your route surely is
> preferable.
>
>
> Two small suggestions:
>
> In the pre-configure target of the Makefile, you could do this:
>
> - perl -pi -e "s,/bin/zsh,${TRUEPREFIX}/bin/zsh,g"
> ${WRKSRC}/Functions/${i}
> + sed -i -e "s,/bin/zsh,${TRUEPREFIX}/bin/zsh,g"
> ${WRKSRC}/Functions/${i}
>
> compare with jasper@'s hackathon report:
> http://undeadly.org/cgi?action=article=20150723124332=expanded
I have no preference here.
> I think the ${FULLPKGNAME} in pkg/PLIST should be replaced by
> zsh-${V}, at least according to the commit message for revision 1.39
> http://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/shells/zsh/pkg/PLIST
I was just going off of what make update-plist did, but you seem to be
correct.
- Matthew Martin
Re: [update] zsh-5.1
On Wed, Sep 02, 2015 at 09:29:42AM +0200, Theo Buehler wrote:
> With your diff 'make patch' fails because it doesn't remove the patches
> for _find and _diff_options which you upstreamed (did you 'cvs rm' the
> patch files?).
Sorry, I must have at some point swapping between 5.1 5.0.7 for the bug
report and back. The only patches left should be the little bit of
patches/patch-Doc_zsh_texi and
patches/patch-Completion_BSD_Command__bsd_pkg
> The patch below fixes these two points and has the
> following two minor additions which I mentioned in my last mail:
>
> - replace 'perl -pi -e' with 'sed -i -e'
> - replace ${FULLPKGNAME} with zsh-${V} in PLIST
Looks fine to me. Thanks sthen@ for clarifying on update-plist.
> Tested on amd64. I will test on powerpc within the next day and will
> report back.
On Wed, Sep 02, 2015 at 12:56:52PM +0200, Theo Buehler wrote:
> It seems that you fixed the C02 test for good. However, on macppc,
> 'make test' fails the multibyte character test D07 with the following
> output (see also the attached test-macppc.log). I have LC_CTYPE set
> to en_US.UTF-8, in case that matters.
I seem to be getting the same failure on amd64 (8 spaces after the ZSH).
For some reason it seems that the test suite isn't comparing the output
at all. I'll look into it, but I doubt it's a new regression.
> Moreover, on amd64, a number of tests fail sometimes, but I can't
> reproduce that reliably.
I haven't run into it yet (even with the many times I reran the tests
for the chgrp bug), but I'll keep an eye out.
- Matthew Martin
[update] zsh-5.1
Patch to update zsh to 5.1. Fairly boring mostly deleting upstreamed
patches, deleteing unneeded parts of patches, and adding the pre-test
hack discussed at http://marc.info/?t=14406539723=1=2 .
I don't think the texi patch is still needed (aside from the bit of
metadata at the top). It seems that double single quotes are rendered
correctly even without the patch (and the patch missed a few anyway).
- Matthew Martin
Index: Makefile
===
RCS file: /cvs/ports/shells/zsh/Makefile,v
retrieving revision 1.74
diff -u -p -r1.74 Makefile
--- Makefile28 Apr 2015 06:30:13 - 1.74
+++ Makefile2 Sep 2015 01:47:22 -
@@ -2,9 +2,9 @@
COMMENT= Z shell, Bourne shell-compatible
-V= 5.0.7
+V= 5.1
DISTNAME= zsh-$V
-REVISION= 0
+PKGNAME= zsh-5.1
CATEGORIES=shells
MAINTAINER=Pierre-Emmanuel Andre <p...@openbsd.org>
@@ -12,6 +12,7 @@ MAINTAINER= Pierre-Emmanuel Andre <pea@o
HOMEPAGE= http://www.zsh.org/
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=zsh/}
+MASTER_SITES+= http://www.zsh.org/pub/
# BSD
PERMIT_PACKAGE_CDROM= Yes
@@ -55,5 +56,8 @@ pre-configure:
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/zsh/$V/scripts/
+
+pre-test:
+ rm -f ${WRKDIR}/bin/chgrp
.include
Index: distinfo
===
RCS file: /cvs/ports/shells/zsh/distinfo,v
retrieving revision 1.20
diff -u -p -r1.20 distinfo
--- distinfo22 Apr 2015 11:52:40 - 1.20
+++ distinfo2 Sep 2015 01:47:22 -
@@ -1,2 +1,2 @@
-SHA256 (zsh-5.0.7.tar.gz) = Q/CkwXnvebuMkVNXVoX39F8oo2FcjPljRfUD1bnnuRk=
-SIZE (zsh-5.0.7.tar.gz) = 4004964
+SHA256 (zsh-5.1.tar.gz) = 43MTgYEOaQ+5Vc7fqL5RsJNL+h/zjHCfVBOJYOPezZk=
+SIZE (zsh-5.1.tar.gz) = 4187455
Index: patches/patch-Completion_BSD_Command__bsd_pkg
===
RCS file: /cvs/ports/shells/zsh/patches/patch-Completion_BSD_Command__bsd_pkg,v
retrieving revision 1.2
diff -u -p -r1.2 patch-Completion_BSD_Command__bsd_pkg
--- patches/patch-Completion_BSD_Command__bsd_pkg 29 Jan 2006 20:41:02
- 1.2
+++ patches/patch-Completion_BSD_Command__bsd_pkg 2 Sep 2015 01:47:23
-
@@ -33,21 +33,6 @@ $OpenBSD: patch-Completion_BSD_Command__
}
(( $+functions[_bsd_pkg_pkgs_and_files] )) ||
-@@ -48,11 +52,11 @@ _bsd_pkg() {
- pkg_add)
- flags=(
- '-f[force installation]'
-- '-I[don'\''t execute installation scripts]'
-+ '-I[don''t execute installation scripts]'
- '-M[run in master mode]'
-- '-n[don'\''t really install packages]'
-+ '-n[don''t really install packages]'
- '-p[specify prefix]:prefix directory:_files -/'
-- '-R[don'\''t record]'
-+ '-R[don''t record]'
- '-S[run in slave mode]'
- '-t[specify mktemp template]:mktemp template:_files -/'
- '-v[be verbose]'
@@ -67,9 +71,9 @@ _bsd_pkg() {
;;
netbsd*)
@@ -125,19 +110,6 @@ $OpenBSD: patch-Completion_BSD_Command__
)
;;
esac
-@@ -124,10 +128,10 @@ _bsd_pkg() {
-
- pkg_delete)
- flags=(
-- '-D[don'\''t execute deinstallation scripts]'
-+ '-D[don''t execute deinstallation scripts]'
- '-d[remove empty directories]'
- '-f[force deinstallation]'
-- '-n[don'\''t really deinstall packages]'
-+ '-n[don''t really deinstall packages]'
- '-p[specify prefix]:prefix directory:_files -/'
- '-v[be verbose]'
- )
@@ -136,35 +140,43 @@ _bsd_pkg() {
freebsd*)
flags=(
@@ -162,7 +134,7 @@ $OpenBSD: patch-Completion_BSD_Command__
+'(:)-a[delete all installed packages]'
+'-F[specify each package by an installed file]'
+'-i[be interactive]'
-+'-O[only delete the package''s entries]'
++'-O[only delete the package'\''s entries]'
'-R[delete upward recursively]'
'-r[delete recursively]'
- '-V[show version and exit]'
Index: patches/patch-Completion_Base_Utility__call_program
===
RCS file: patches/patch-Completion_Base_Utility__call_program
diff -N patches/patch-Completion_Base_Utility__call_program
--- patches/patch-Completion_Base_Utility__call_program 28 Apr 2015 06:30:13
- 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,19 +0,0 @@
-$OpenBSD: patch-Completion_Base_Utility__call_program,v 1.1 2015/04/28
06:30:13 jasper Exp $
-
-be conservative about redirecting _call_program stderr, the caller may have
-already done so
-http://sourceforge.net/p/zsh/code/ci/22c4ea424ce2e8febce04d324c5ec9898f5d534b/
-
Completion/Base/Utility/_call_program.orig Sat Apr 25 20:20:25 2015
-+++ Completion/Base/Utility/_call_program Sat Apr 25 20:20:38 2015
-@@ -2,8 +2,8 @@
-
- local tmp err_fd=-1
-
--if (( ${debug_fd:--1} > 2 ))
--then exec {err_fd}>&2
Re: [patch] Test target PATH
On Fri, Aug 28, 2015 at 08:47:05PM +0100, Stuart Henderson wrote:
On 2015/08/27 22:04, Matthew Martin wrote:
${WRKDIR}/bin is only in PATH during extract, configure, build, fake,
and test. Since fake creates the chown and chgrp symlinks, extract,
configure, build, and test must not depend on those symlinks as they
don't depend on fake. Would it be acceptable to clean up the symlinks
after fake completes or rm -f them in test in case test is run after
fake? Both patches below fix the issue.
However, I still believe that the first patch is correct as any ports it
breaks has tests that depend on non-standard install(1) behavior caused
by the perl wrapper so including ${WRKDIR}/bin in PATH is just
concealing the breakage.
This directory is used for other things which may get called during
test, for example symlinks bin/python - /usr/local/bin/python-2.7 or
bin/cc - /usr/local/bin/egcc, so I think that the patch which removes
${WRKDIR}/bin from PATH during test is incorrect.
Fair enough.
+ @rm -f ${WRKDIR}/bin/chown ${WRKDIR}/bin/chgrp
If you're going to do this, wouldn't it make sense to rm the install
wrapper as well?
I didn't rm the install wrapper because Juan raised concerns about
regressions. Since both chown and chgrp are created by fake, there
couldn't be any test regressions this way. Although as I noted any test
that relies on the install wrapper is likely broken anyway.
There might be a problem though, I suspect it will break things with
SEPARATE_BUILD=flavored, so from that perspective it would be safer
to target it tightly in the port which is actually affected by it
even if it's not quite correct.
I'm not familiar with how SEPARATE_BUILD works, so I'll defer to you on
this. While I'd prefer a fix in the ports system, if it'd have other
fallout, a patch for zsh is fine.
- Matthew Martin
Re: [patch] Test target PATH
On Thu, Aug 27, 2015 at 11:27:44PM -0400, Raul Miller wrote:
On Thu, Aug 27, 2015 at 11:04 PM, Matthew Martin phy1...@gmail.com wrote:
On Thu, Aug 27, 2015 at 11:47:19PM +0200, Juan Francisco Cantero Hurtado
wrote:
---rm -f ${WRKDIR}/bin/chgrp
While this would fix the problem, since the problem is not in zsh
itself, I don't think that the zsh port is the right place to fix this.
Since the bug only occurs in the port of zsh, that means that the zsh
port is the right place to fix this.
Just because I found the bug while messing with the zsh port, doesn't
mean that there aren't other ports that are broken in the same way. Any
port that needs chown or chgrp during its test is similarly broken.
Or am I missing some important issue? (If so, could you explain what breaks?)
I thought I had explained what breaks, but once more can't hurt.
Test C02cond.ztst contains the following among others
touch zerolength
chgrp $EGID zerolength
[...]
[[ -G zerolength ]]
touch zerolength creates a file with uid:gid 1000:0 (assuming your user
is uid 1000). chgrp then changes the gid of zerolength to 1000 as that's
my primary gid. The last line tests that the file zerolength is owned by
the effecive gid of the shell.
For a typical make test, fake is not run (since test only depends on
build and most people remember to run test before fake) and the test
succeeds. For make fake test (or running test anytime after fake) the
test fails. This is because the test target (among other things) runs
the tests with
@cd ${WRKBUILD} exec 31 exit `exec 41 13; \
(exec; set +e; ${SETENV} ${ALL_TEST_ENV} ${MAKE_PROGRAM} \
${ALL_TEST_FLAGS} -f ${MAKE_FILE} ${TEST_TARGET}; \
echo $$? 4) 21 ${TEST_LOG}`
The PATH is containted in ALL_TEST_ENV which is defined as
ALL_TEST_ENV = ${MAKE_ENV} ${TEST_ENV}
TEST_ENV is typically blank and the environment comes from MAKE_ENV
MAKE_ENV += PATH='${PORTPATH}' PREFIX='${PREFIX}' \
LOCALBASE='${LOCALBASE}' DEPBASE='${DEPBASE}' X11BASE='${X11BASE}' \
CFLAGS='${CFLAGS:C/ *$//}' \
TRUEPREFIX='${PREFIX}' ${DESTDIRNAME}='' \
HOME='${PORTHOME}'
defined thusly. PATH is equal to PORTPATH which a few lines above is
PORTPATH ?=
${WRKDIR}/bin:/usr/bin:/bin:/usr/sbin:/sbin:${DEPBASE}/bin:${LOCALBASE}/bin:${X11BASE}/bin
Now when `chgrp ...` is run we first search in ${WRKDIR}/bin for chgrp.
Typically this directory does not contain a chgrp and the shell
continues down the PATH to find /bin/chgrp; however, the fake target has
@ln -sf /bin/echo ${WRKDIR}/bin/chown
@ln -sf /bin/echo ${WRKDIR}/bin/chgrp
run whenever ${FAKE_AS_ROOT:L} != yes. fake does not rm these links
after it has finished. Thus anytime that tests are run after fake has
run, chown and chgrp are just echo and do nothing.
Since chgrp does nothing in this case and 0 != 1000, [[ -G zerolength ]]
fails as does the test. Hopefully it's now obvious that zsh expecting
for chgrp to actually change groups is not a bug in zsh and that chgrp
failing to change a file's group while tests are being run is a bug in
the ports system.
- Matthew Martin
Re: [patch] Test target PATH
On Thu, Aug 27, 2015 at 11:50:19AM +0200, Juan Francisco Cantero Hurtado wrote:
Can you try this in your port?
TEST_ENV=PATH=${PATH}:YOURPATH or TEST_ENV=PATH=YOURPATH:${PATH}
I don't think you're following the problem. It's not that anything needs
to be added to PATH; it's that the first element needs to be removed.
The PATH that ports uses is set by PORTPATH to be
${WRKDIR}/bin:/usr/bin:/bin:/usr/sbin:/sbin:${DEPBASE}/bin:${LOCALBASE}/bin:${X11BASE}/bin
With make test, ${WRKDIR}/bin only has install in it, so chgrp runs
/bin/chgrp. When make fake is run, a symlink from ${WRKDIR}/bin/chgrp to
/bin/echo is added. This resuls in make fake test using the chgrp in
${WRKDIR}/bin and the test failing since that chgrp doesn't change the
group. I am proposing to remove ${WRKDIR}/bin from PATH for tests so
that all commands work as expected.
-Matthew Martin
On Thu, Aug 27, 2015 at 12:37:22AM -0500, Matthew Martin wrote:
The zsh port fails an additional test when invoked with make clean fake
test instead of make clean test. This is because in its tests it
touch zerolength
chgrp $EGID zerolength
and then tests that zerolength has a group of EGID. Since make fake puts
a symlink in ${WRKDIR}/bin from chgrp to /bin/echo and ${WRKDIR}/bin is
first in the environment's PATH, the chgrp does nothing, and test
C02cond fails. With the below patch it completes successfully.
This patch does slightly change behavior as PATH can no longer be set in
TEST_ENV (which no ports seem to do anyway) and install is no longer the
perl wrapper in ${WRKDIR}/bin; however, during tests we probably
shouldn't be messing with install either.
- Matthew Martin
Index: infrastructure/mk/bsd.port.mk
===
RCS file: /cvs/ports/infrastructure/mk/bsd.port.mk,v
retrieving revision 1.1298
diff -u -p -r1.1298 bsd.port.mk
--- infrastructure/mk/bsd.port.mk 19 Jul 2015 17:31:44 - 1.1298
+++ infrastructure/mk/bsd.port.mk 27 Aug 2015 03:53:55 -
@@ -809,7 +809,7 @@ FAKE_TARGET ?= ${INSTALL_TARGET}
TEST_TARGET ?= test
TEST_FLAGS ?=
-TEST_ENV ?=
+TEST_ENV +=
PATH=/usr/bin:/bin:/usr/sbin:/sbin:${DEPBASE}/bin:${LOCALBASE}/bin:${X11BASE}/bin
ALL_TEST_FLAGS = ${MAKE_FLAGS} ${TEST_FLAGS}
ALL_TEST_ENV = ${MAKE_ENV} ${TEST_ENV}
TEST_LOGFILE ?= ${WRKDIR}/test.log
--
Juan Francisco Cantero Hurtado http://juanfra.info
Re: [patch] Test target PATH
On Thu, Aug 27, 2015 at 11:47:19PM +0200, Juan Francisco Cantero Hurtado wrote:
I see the problem now. You can remove the symlinks from ${WRKDIR}/bin with:
pre-test:
---rm -f ${WRKDIR}/bin/chgrp
While this would fix the problem, since the problem is not in zsh
itself, I don't think that the zsh port is the right place to fix this.
The problem with your patch is that you're modifying the environment
for thousands of ports and we can't test manually every port to see if
your changes are breaking something.
However, overriding chown and chgrp during test is a bug. They clearly
don't need to be overridden during test since the symlinks only exist if
test is called after fake and don't exist for make clean test.
${WRKDIR}/bin is only in PATH during extract, configure, build, fake,
and test. Since fake creates the chown and chgrp symlinks, extract,
configure, build, and test must not depend on those symlinks as they
don't depend on fake. Would it be acceptable to clean up the symlinks
after fake completes or rm -f them in test in case test is run after
fake? Both patches below fix the issue.
However, I still believe that the first patch is correct as any ports it
breaks has tests that depend on non-standard install(1) behavior caused
by the perl wrapper so including ${WRKDIR}/bin in PATH is just
concealing the breakage.
- Matthew Martin
Index: infrastructure/mk/bsd.port.mk
===
RCS file: /cvs/ports/infrastructure/mk/bsd.port.mk,v
retrieving revision 1.1298
diff -u -p -r1.1298 bsd.port.mk
--- infrastructure/mk/bsd.port.mk 19 Jul 2015 17:31:44 - 1.1298
+++ infrastructure/mk/bsd.port.mk 28 Aug 2015 01:58:04 -
@@ -2886,6 +2886,8 @@ ${_FAKE_COOKIE}: ${_BUILD_COOKIE} ${_FAK
fi; \
done
+ @rm -f ${WRKDIR}/bin/chown ${WRKDIR}/bin/chgrp
+
@${_FAKESUDO} ${_MAKE_COOKIE} $@
print-plist:
Index: infrastructure/mk/bsd.port.mk
===
RCS file: /cvs/ports/infrastructure/mk/bsd.port.mk,v
retrieving revision 1.1298
diff -u -p -r1.1298 bsd.port.mk
--- infrastructure/mk/bsd.port.mk 19 Jul 2015 17:31:44 - 1.1298
+++ infrastructure/mk/bsd.port.mk 28 Aug 2015 02:06:13 -
@@ -2786,6 +2786,7 @@ ${_TEST_COOKIE}: ${_BUILD_COOKIE}
@exit 1
.endif
. endif
+ @rm -f ${WRKDIR}/bin/chown ${WRKDIR}/bin/chgrp
. if target(pre-test)
@${_MAKE} pre-test
. endif
[patch] Test target PATH
The zsh port fails an additional test when invoked with make clean fake
test instead of make clean test. This is because in its tests it
touch zerolength
chgrp $EGID zerolength
and then tests that zerolength has a group of EGID. Since make fake puts
a symlink in ${WRKDIR}/bin from chgrp to /bin/echo and ${WRKDIR}/bin is
first in the environment's PATH, the chgrp does nothing, and test
C02cond fails. With the below patch it completes successfully.
This patch does slightly change behavior as PATH can no longer be set in
TEST_ENV (which no ports seem to do anyway) and install is no longer the
perl wrapper in ${WRKDIR}/bin; however, during tests we probably
shouldn't be messing with install either.
- Matthew Martin
Index: infrastructure/mk/bsd.port.mk
===
RCS file: /cvs/ports/infrastructure/mk/bsd.port.mk,v
retrieving revision 1.1298
diff -u -p -r1.1298 bsd.port.mk
--- infrastructure/mk/bsd.port.mk 19 Jul 2015 17:31:44 - 1.1298
+++ infrastructure/mk/bsd.port.mk 27 Aug 2015 03:53:55 -
@@ -809,7 +809,7 @@ FAKE_TARGET ?= ${INSTALL_TARGET}
TEST_TARGET ?= test
TEST_FLAGS ?=
-TEST_ENV ?=
+TEST_ENV +=
PATH=/usr/bin:/bin:/usr/sbin:/sbin:${DEPBASE}/bin:${LOCALBASE}/bin:${X11BASE}/bin
ALL_TEST_FLAGS = ${MAKE_FLAGS} ${TEST_FLAGS}
ALL_TEST_ENV = ${MAKE_ENV} ${TEST_ENV}
TEST_LOGFILE ?= ${WRKDIR}/test.log
Re: NEW: x11/libvterm
On Wed, Apr 22, 2015 at 11:37 AM, Matthew Martin phy1...@gmail.com wrote: Attached is libvterm which is required for pangoterm. While it works, launchpad seems to tar revisions on the fly in a non-deterministic way making checksums impossible. I would appreciate if anyone has a better way for getting code from launchpad. I can't fetch a milestone as other ports do since there are none. - Matthew Martin ping?
NEW: x11/libvterm
Attached is libvterm which is required for pangoterm. While it works, launchpad seems to tar revisions on the fly in a non-deterministic way making checksums impossible. I would appreciate if anyone has a better way for getting code from launchpad. I can't fetch a milestone as other ports do since there are none. - Matthew Martin libvterm.tgz Description: GNU Zip compressed data
