Re: [UPDATE] www/py-webpy to 0.40
On Wed, Oct 02, 2019 at 11:30:59PM -0400, Kurt Mosiejczuk wrote:
>
> On Sat, Sep 28, 2019 at 10:29:17PM +0800, Kevin Lo wrote:
> > Greetings,
>
> > Here's an update of py-webpy to 0.40; tested on amd64.
>
> > Changelog here: https://github.com/webpy/webpy/blob/master/ChangeLog.txt#L3
>
> > ok?
>
> I'd like to propose a different diff. It's available on PyPI, so I'd rather
> it pulled from there rather than use GH_*. Also, there's not a reason to
> set NO_TEST. The tests do run. 4 tests fail, but 49 pass. Just needs
> MODPY_PYTEST. Lastly, it does support both flavors of Python. I can be
> argued with about supporting both flavors, but then we'd need a change to
> quirks to retire the python 2 flavor.
Thank you for the review and your comments. Here's the revised diff.
ok?
Index: www/py-webpy/Makefile
===
RCS file: /cvs/ports/www/py-webpy/Makefile,v
retrieving revision 1.14
diff -u -p -u -p -r1.14 Makefile
--- www/py-webpy/Makefile 12 Jul 2019 20:51:03 - 1.14
+++ www/py-webpy/Makefile 4 Oct 2019 05:30:10 -
@@ -2,26 +2,30 @@
COMMENT= web framework for python
-VERSION= 0.38
-DISTNAME= web.py-${VERSION}
-PKGNAME= py-webpy-${VERSION}
+MODPY_EGG_VERSION= 0.40
+DISTNAME= web.py-${MODPY_EGG_VERSION}
+PKGNAME= py-webpy-${MODPY_EGG_VERSION}
+
CATEGORIES=www
-MASTER_SITES= ${HOMEPAGE}/static/
HOMEPAGE= http://webpy.org
+MAINTAINER=Kevin Lo
+
# Public Domain, except wsgiserver
PERMIT_PACKAGE=Yes
MODULES= lang/python
-SUBST_VARS=VERSION
+MODPY_PI= Yes
+MODPY_PYTEST= Yes
+MODPY_PYTEST_ARGS= tests
+MODPY_SETUPTOOLS= Yes
-TEST_DEPENDS= databases/py-sqlite2 \
- ${BASE_PKGPATH}
+RUN_DEPENDS= textproc/py-markdown${MODPY_FLAVOR} \
+ www/py-cheroot${MODPY_FLAVOR}
-do-test:
- cd ${WRKSRC} && ${MODPY_BIN} ./web/test.py
- cd ${WRKSRC} && ${MODPY_BIN} ./web/db.py SqliteTest
+FLAVORS= python3
+FLAVOR ?=
.include
Index: www/py-webpy/distinfo
===
RCS file: /cvs/ports/www/py-webpy/distinfo,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 distinfo
--- www/py-webpy/distinfo 3 Nov 2016 10:12:34 - 1.7
+++ www/py-webpy/distinfo 4 Oct 2019 05:30:10 -
@@ -1,2 +1,2 @@
-SHA256 (web.py-0.38.tar.gz) = CcYbW2tuHdVYgY0H37qzstoGI2AwecfXIjZEsofwiHA=
-SIZE (web.py-0.38.tar.gz) = 91877
+SHA256 (web.py-0.40.tar.gz) = 3F5C/7xC130H91t6zKmXWjNormCXdOSd3rtJenhBMfM=
+SIZE (web.py-0.40.tar.gz) = 103781
Index: www/py-webpy/pkg/DESCR
===
RCS file: /cvs/ports/www/py-webpy/pkg/DESCR,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 DESCR
--- www/py-webpy/pkg/DESCR 5 Dec 2007 15:44:49 - 1.1.1.1
+++ www/py-webpy/pkg/DESCR 4 Oct 2019 05:30:10 -
@@ -1,3 +1,3 @@
web.py is a web framework for python that is as simple as it is
powerful. web.py is in the public domain; you can use it for whatever
-purpose with absolutely no restrictions.
+purpose with absolutely no restrictions.
Index: www/py-webpy/pkg/PLIST
===
RCS file: /cvs/ports/www/py-webpy/pkg/PLIST,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 PLIST
--- www/py-webpy/pkg/PLIST 20 Jan 2013 09:10:04 - 1.6
+++ www/py-webpy/pkg/PLIST 4 Oct 2019 05:30:10 -
@@ -1,49 +1,47 @@
@comment $OpenBSD: PLIST,v 1.6 2013/01/20 09:10:04 benoit Exp $
lib/python${MODPY_VERSION}/site-packages/web/
-lib/python${MODPY_VERSION}/site-packages/web.${MODPY_PY_PREFIX}${VERSION}-py${MODPY_VERSION}.egg-info
+lib/python${MODPY_VERSION}/site-packages/web.${MODPY_PY_PREFIX}${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
+lib/python${MODPY_VERSION}/site-packages/web.${MODPY_PY_PREFIX}${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
+lib/python${MODPY_VERSION}/site-packages/web.${MODPY_PY_PREFIX}${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
+lib/python${MODPY_VERSION}/site-packages/web.${MODPY_PY_PREFIX}${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
+lib/python${MODPY_VERSION}/site-packages/web.${MODPY_PY_PREFIX}${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
+lib/python${MODPY_VERSION}/site-packages/web.${MODPY_PY_PREFIX}${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
lib/python${MODPY_VERSION}/site-packages/web/__init__.py
-lib/python${MODPY_VERSION}/site-packages/web/__init__.pyc
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/web/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/web/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/web/application.py
-lib/python${MODPY_VERSION}/site-packages/web/application.pyc
Re: firefox: unveil and pledge enhancements [8]
On Thu, Oct 03, 2019 at 07:59:33PM -0500, joshua stein wrote: > On Fri, 04 Oct 2019 at 01:05:12 +0200, Solene Rapenne wrote: > > I found this line just before writing a gigantic core file > > > > 52304 firefox CALL ioctl(124,VIDIOC_QUERYCAP,0x1d9a1d7ac158) > > > > I'm not sure what I need to search for the fd, I found these lines > > related to "124". > > > > 52304 firefox NAMI "/dev/video0" > > 52304 firefox GIO fd 4 wrote 4096 bytes > > > > "\0\0\0\M^?\0\0\0\M^?\0\0\0\M^?\0\0\0\M^?\0\0\0\M^?\0\0\0\M^?\0\0\0\M^?\0\0\0\M^?\0\0\0\M^?\0\0\ > > [ lot of this ] > > 52304 firefox RET open 124/0x7c > > > > I'm guessing this is the main process since the content process > can't open /dev/video, but if you grep the kdump output for > "52304.*pledge" it will show what file it read its promises from. > Then you can add the video pledge to that file and see if it fixes > the crash. > > But perhaps it's stranger that Firefox is trying to read your webcam > information just by viewing a YouTube video... The browser is trying to access the webcam because a page called in GetUserMedia/WebRTC APIs to figure out if a webcam is available.. Afaict, firefox itself makes no decisions - the websites authors do.
[MAINTAINER UPDATE] www/sblg to 0.5.7
This is another simple maintainer update of sblg from 0.5.6 to 0.5.7.
The changes included in this release are:
sblg 0.5.7: "Add ${sblg-setcount} for printing the number of remaining
articles in a tagged navigation series."
I did testing on amd64 with no issues. It should work fine everywhere.
If someone could ok and commit, that would be great. Thank you.
Bryan
Index: www/sblg/Makefile
===
RCS file: /cvs/ports/www/sblg/Makefile,v
retrieving revision 1.25
diff -u -p -r1.25 Makefile
--- www/sblg/Makefile 11 Sep 2019 00:10:38 - 1.25
+++ www/sblg/Makefile 4 Oct 2019 03:20:34 -
@@ -2,7 +2,7 @@
COMMENT = simple off-line blog utility
-DISTNAME = sblg-0.5.6
+DISTNAME = sblg-0.5.7
CATEGORIES = www
HOMEPAGE = https://kristaps.bsd.lv/sblg/
Index: www/sblg/distinfo
===
RCS file: /cvs/ports/www/sblg/distinfo,v
retrieving revision 1.23
diff -u -p -r1.23 distinfo
--- www/sblg/distinfo 11 Sep 2019 00:10:38 - 1.23
+++ www/sblg/distinfo 4 Oct 2019 03:20:34 -
@@ -1,2 +1,2 @@
-SHA256 (sblg-0.5.6.tar.gz) = 6DFYUPe6b190ffWJZ0W2h20133ICjzqirdg0rBkBL8w=
-SIZE (sblg-0.5.6.tar.gz) = 1447439
+SHA256 (sblg-0.5.7.tar.gz) = yP5AK5CG8DWdSP317eYSSihHGOIDAxYPIQiSpLfZxFg=
+SIZE (sblg-0.5.7.tar.gz) = 1447664
Re: valgrind diff to fix run memcheck on amd64
Sorry, my delayed reply. From: YASUOKA Masahiko Date: Wed, 02 Oct 2019 23:29:05 +0900 (JST) > I looked into the problem more. > > - unveil(2) itself fails > - so file system related system calls are not restricted (yet) > > valgrind complains: > > ==13326== > --13326-- WARNING: unhandled syscall: 114 > --13326-- You may be able to write your own handler. > --13326-- Read the file README_MISSING_SYSCALL_OR_IOCTL. > --13326-- Nevertheless we consider this a bug. Please report > --13326-- it at http://valgrind.org/support/bug_reports.html. > > valgrind doesn't support unveil(2) yet. I suppose Asou can add that. Now I am fixing this problem. -- ASOU Masato
Re: boost md context switching on macppc
On Sat, 14 Sep 2019 15:08:10 -0400 George Koehler wrote: > I have stopped work on this diff. My next task is to report an issue > to GitHub boost/context, about the multiple problems with ppc32. I reported ppc32 problems in Boost context: https://github.com/boostorg/context/issues/120 I want to fix OpenBSD/macppc upstream, but before I can do so, I need upstream to pull some other patches. I have opened 2 pull requests: - https://github.com/boostorg/test/pull/231 for patch-boost_test_impl_execution_monitor_ipp - https://github.com/boostorg/context/pull/121 for MAP_STACK -- George Koehler
firefox: unveil and pledge enhancements [10]
Are you tired of compiling Firefox yet?
The preference keys for pledge and unveil settings were concerning
from a security standpoint, so I've taken a new direction and moved
them both to root-owned files. Landry and I are discussing this
with upstream:
https://bugzilla.mozilla.org/show_bug.cgi?id=1584839
These files are now installed to
/usr/local/lib/firefox/browser/defaults/preferences/ and you can put
your own versions in /etc/firefox if you need to override them (but
you shouldn't).
This also changes the way unveil or pledge are disabled for testing,
because the environment variable mechanism was scaring me by
allowing a potentially compromised main process to influence a new
content process. Now the only way to disable it is by modifying
those root-owned files to just contain "disable".
This also does essentially a 'mkdir -p $XDG_CACHE_HOME/dconf' on
startup from the main process if needed (like on a fresh login
account) because otherwise lots of things complain.
This also adds back the video pledge to the main process which got
lost along the way.
I would really like to commit this version to ports so we can at
least get snapshot packages out with this for testing before 6.6.
Index: Makefile
===
RCS file: /cvs/ports/www/mozilla-firefox/Makefile,v
retrieving revision 1.396
diff -u -p -u -p -r1.396 Makefile
--- Makefile3 Oct 2019 17:57:49 - 1.396
+++ Makefile4 Oct 2019 01:49:27 -
@@ -10,6 +10,8 @@ MOZILLA_BRANCH = release
MOZILLA_PROJECT = firefox
MOZILLA_CODENAME = browser
+REVISION= 0
+
WRKDIST = ${WRKDIR}/${MOZILLA_DIST}-${MOZILLA_DIST_VERSION:C/b[0-9]*//}
HOMEPAGE = https://www.mozilla.org/firefox/
SO_VERSION = 84.0
@@ -51,6 +53,8 @@ BUILD_DEPENDS += lang/node
BUILD_DEPENDS += devel/cbindgen>=0.9.0
# 67 requires nasm for bundled libav1d
BUILD_DEPENDS += devel/nasm
+# unveil support relies on xdg-open
+RUN_DEPENDS += devel/xdg-utils
WANTLIB += X11-xcb Xcursor Xi intl xcb xcb-shm ${COMPILER_LIBCXX}
@@ -64,7 +68,7 @@ MAKE_ENV += BUILD_VERBOSE_LOG="1"
CONFIGURE_ARGS += --enable-release #1386371
CONFIGURE_ARGS += --enable-sandbox
CONFIGURE_ARGS += --with-libclang-path=${LOCALBASE}/lib
-SUBST_VARS += LOCALBASE X11BASE
+SUBST_VARS += LOCALBASE X11BASE MOZILLA_PROJECT
show-commit:
@curl -s
https://releases.mozilla.org/pub/mozilla.org/firefox/releases/${MOZILLA_VERSION}/SOURCE|
awk -F / '/^https:\/\/hg/ {print $$7 }'
@@ -92,6 +96,10 @@ post-install:
${PREFIX}/share/pixmaps/firefox.png
# link default48.png to default.png to be used by default by non-icccm
compliant wm
- ln
${PREFIX}/lib/${MOZILLA_PROJECT}/browser/chrome/icons/default/default{48,}.png
+ ln -f
${PREFIX}/lib/${MOZILLA_PROJECT}/browser/chrome/icons/default/default{48,}.png
+
+.for f in unveil.content unveil.gpu unveil.main pledge.content pledge.gpu
pledge.main
+ ${INSTALL_DATA} ${FILESDIR}/${f}
${PREFIX}/lib/${MOZILLA_PROJECT}/browser/defaults/preferences/
+.endfor
.include
Index: files/all-openbsd.js
===
RCS file: /cvs/ports/www/mozilla-firefox/files/all-openbsd.js,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 all-openbsd.js
--- files/all-openbsd.js9 Sep 2019 18:50:35 - 1.10
+++ files/all-openbsd.js4 Oct 2019 01:49:27 -
@@ -5,10 +5,6 @@ pref("app.normandy.enabled",false);
pref("browser.safebrowsing.enabled", false);
pref("browser.safebrowsing.malware.enabled", false);
pref("spellchecker.dictionary_path", "${LOCALBASE}/share/mozilla-dicts/");
-// enable pledging the content process
-pref("security.sandbox.content.level", 1);
-pref("security.sandbox.pledge.main","stdio rpath wpath cpath inet proc exec
prot_exec flock ps sendfd recvfd dns vminfo tty drm unix fattr getpw mcast
video");
-pref("security.sandbox.pledge.content","stdio rpath wpath cpath inet recvfd
sendfd prot_exec unix drm ps");
pref("extensions.pocket.enabled", false);
pref("browser.newtabpage.enabled", false);
pref("browser.startup.homepage", "about:blank");
Index: files/pledge.content
===
RCS file: files/pledge.content
diff -N files/pledge.content
--- /dev/null 1 Jan 1970 00:00:00 -
+++ files/pledge.content4 Oct 2019 01:49:27 -
@@ -0,0 +1,10 @@
+stdio
+rpath
+wpath
+cpath
+recvfd
+sendfd
+prot_exec
+unix
+drm
+ps
Index: files/pledge.gpu
===
RCS file: files/pledge.gpu
diff -N files/pledge.gpu
--- /dev/null 1 Jan 1970 00:00:00 -
+++ files/pledge.gpu4 Oct 2019 01:49:27 -
@@ -0,0 +1,11 @@
+stdio
+rpath
+wpath
+cpath
+ps
+sendfd
+recvfd
+drm
+dns
+unix
+prot_exec
Index: files/pledge.main
Re: UPDATE: math/fftw3 to disable OpenMP
Ping?
cvs server: Diffing .
Index: Makefile
===
RCS file: /cvs/ports/math/fftw/Makefile,v
retrieving revision 1.23
diff -u -p -r1.23 Makefile
--- Makefile12 Jul 2019 20:47:40 - 1.23
+++ Makefile3 Oct 2019 22:18:04 -
@@ -5,7 +5,7 @@ PORTROACH= limit:^2\.
COMMENT= C routines for computing the Discrete Fourier Transform
DISTNAME= fftw-2.1.5
-REVISION= 3
+REVISION= 4
SHARED_LIBS= fftw2.7 \
rfftw 2.7
CATEGORIES=math
@@ -23,6 +23,7 @@ MASTER_SITES= http://fftw.org/ \
CONFIGURE_STYLE= gnu
+CONFIGURE_ARGS+= --disable-openmp
.if ${MACHINE_ARCH} == "i386"
CONFIGURE_ARGS+= --enable-i386-hacks
PATCH_LIST=gcc-* patch-*
Re: firefox: unveil and pledge enhancements [8]
joshua stein wrote: > On Fri, 04 Oct 2019 at 01:05:12 +0200, Solene Rapenne wrote: > > I found this line just before writing a gigantic core file > > > > 52304 firefox CALL ioctl(124,VIDIOC_QUERYCAP,0x1d9a1d7ac158) > > > > I'm not sure what I need to search for the fd, I found these lines > > related to "124". > > > > 52304 firefox NAMI "/dev/video0" > > 52304 firefox GIO fd 4 wrote 4096 bytes > > > > "\0\0\0\M^?\0\0\0\M^?\0\0\0\M^?\0\0\0\M^?\0\0\0\M^?\0\0\0\M^?\0\0\0\M^?\0\0\0\M^?\0\0\0\M^?\0\0\ > > [ lot of this ] > > 52304 firefox RET open 124/0x7c > > > > I'm guessing this is the main process since the content process > can't open /dev/video, but if you grep the kdump output for > "52304.*pledge" it will show what file it read its promises from. > Then you can add the video pledge to that file and see if it fixes > the crash. > > But perhaps it's stranger that Firefox is trying to read your webcam > information just by viewing a YouTube video... Maybe they are taking photos of the people who won't use DOH.
Re: firefox: unveil and pledge enhancements [8]
joshua stein wrote: > On Fri, 04 Oct 2019 at 01:05:12 +0200, Solene Rapenne wrote: > > I found this line just before writing a gigantic core file > > > > 52304 firefox CALL ioctl(124,VIDIOC_QUERYCAP,0x1d9a1d7ac158) > > > > I'm not sure what I need to search for the fd, I found these lines > > related to "124". > > > > 52304 firefox NAMI "/dev/video0" > > 52304 firefox GIO fd 4 wrote 4096 bytes > > > > "\0\0\0\M^?\0\0\0\M^?\0\0\0\M^?\0\0\0\M^?\0\0\0\M^?\0\0\0\M^?\0\0\0\M^?\0\0\0\M^?\0\0\0\M^?\0\0\ > > [ lot of this ] > > 52304 firefox RET open 124/0x7c > > > > I'm guessing this is the main process since the content process > can't open /dev/video, but if you grep the kdump output for > "52304.*pledge" it will show what file it read its promises from. > Then you can add the video pledge to that file and see if it fixes > the crash. > > But perhaps it's stranger that Firefox is trying to read your webcam > information just by viewing a YouTube video... Are we cynical yet??
Re: firefox: unveil and pledge enhancements [8]
On Fri, 04 Oct 2019 at 01:05:12 +0200, Solene Rapenne wrote: > I found this line just before writing a gigantic core file > > 52304 firefox CALL ioctl(124,VIDIOC_QUERYCAP,0x1d9a1d7ac158) > > I'm not sure what I need to search for the fd, I found these lines > related to "124". > > 52304 firefox NAMI "/dev/video0" > 52304 firefox GIO fd 4 wrote 4096 bytes > > "\0\0\0\M^?\0\0\0\M^?\0\0\0\M^?\0\0\0\M^?\0\0\0\M^?\0\0\0\M^?\0\0\0\M^?\0\0\0\M^?\0\0\0\M^?\0\0\ > [ lot of this ] > 52304 firefox RET open 124/0x7c > I'm guessing this is the main process since the content process can't open /dev/video, but if you grep the kdump output for "52304.*pledge" it will show what file it read its promises from. Then you can add the video pledge to that file and see if it fixes the crash. But perhaps it's stranger that Firefox is trying to read your webcam information just by viewing a YouTube video...
Re: firefox: unveil and pledge enhancements [8]
Solene Rapenne wrote:
> I found this line just before writing a gigantic core file
>
> 52304 firefox CALL ioctl(124,VIDIOC_QUERYCAP,0x1d9a1d7ac158)
>
> I'm not sure what I need to search for the fd, I found these lines
> related to "124".
>
> 52304 firefox NAMI "/dev/video0"
> 52304 firefox GIO fd 4 wrote 4096 bytes
>
> "\0\0\0\M^?\0\0\0\M^?\0\0\0\M^?\0\0\0\M^?\0\0\0\M^?\0\0\0\M^?\0\0\0\M^?\0\0\0\M^?\0\0\0\M^?\0\0\
> [ lot of this ]
> 52304 firefox RET open 124/0x7c
That process needs the "video" pledge.
if ((p->p_p->ps_pledge & PLEDGE_VIDEO)) {
switch (com) {
case VIDIOC_QUERYCAP:
Wonder what process it is in
Re: firefox: unveil and pledge enhancements [8]
On Thu, Oct 03, 2019 at 04:25:23PM -0600, Theo de Raadt wrote: > Solene Rapenne wrote: > > > On Wed, Sep 25, 2019 at 11:25:59AM -0500, joshua stein wrote: > > > This patchset goes back to files in /etc/firefox for unveil file > > > lists, and goes further and moves the pledge strings to separate > > > files too. This should be the most secure version that is still > > > tweakable at runtime. > > > > > > I switched away from using Firefox's NS_LOCAL_FILE_CONTRACTID/ > > > NS_LOCALFILEINPUTSTREAM_CONTRACTID mechanisms to read a file, since > > > they require a lot of internal setup to be done before they can be > > > used (which is otherwise a good thing, because other things later in > > > Firefox shouldn't have raw file access). Instead of those, I'm > > > using the normal C++ API for reading the /etc/firefox files and this > > > way I have been able to move the pledge/unveil calls earlier in the > > > process startup. Unfortunately this also means that I can't > > > dynamically detect the localized ~/Downloads directory, so if you > > > use a different directory, you'll just need to modify the > > > unveil.content and unveil.main files to change it. > > > > > > I tried the $TMPDIR shenanigans with the main process mkdtemp'ing > > > somewhere in $TMPDIR (or /tmp), and then exporting TMPDIR as that > > > directory so that everything else within Firefox uses that > > > subdirectory as its temp directory, allowing /tmp to be removed from > > > the unveil lists and only that subdirectory visible. Unfortunately > > > the first thing to break was our own shm_open() which hard-codes > > > /tmp and doesn't honor $TMPDIR. So that all was ripped out and > > > we're back to full access to /tmp. > > > > > > If the mailing list mangles this again, it's at > > > https://jcs.org/patches/firefox-port-unveil8.diff > > > > > > > > > > when opening a youtube video, after a few seconds (no need to start the > > video) firefox stops with a pledge error. > > > > firefox[27483]: pledge "tty", syscall 54 > > The output file will be huge, but by now it is obvious what is > required: > > ktrace -di firefox > > kdump > hugefile > > And search for that the last record of that pid/thread (because the > pledge killed it), and provide that information. > > It is ioctl. But what ioctl, and sometimes it also matters what > that fd is, so you can search upwards for when it is created. > > Such information will be enough to find it in the code quickly. > > BTW, this applies to all pledge work. > > I found this line just before writing a gigantic core file 52304 firefox CALL ioctl(124,VIDIOC_QUERYCAP,0x1d9a1d7ac158) I'm not sure what I need to search for the fd, I found these lines related to "124". 52304 firefox NAMI "/dev/video0" 52304 firefox GIO fd 4 wrote 4096 bytes "\0\0\0\M^?\0\0\0\M^?\0\0\0\M^?\0\0\0\M^?\0\0\0\M^?\0\0\0\M^?\0\0\0\M^?\0\0\0\M^?\0\0\0\M^?\0\0\ [ lot of this ] 52304 firefox RET open 124/0x7c
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: na...@cvs.openbsd.org 2019/10/03 16:43:39 Modified files: education/verbiste: Makefile distinfo education/verbiste/patches: patch-Makefile_in Log message: update to 0.1.47: conjugation table and regression test fixes
Re: firefox: unveil and pledge enhancements [8]
Solene Rapenne wrote: > On Wed, Sep 25, 2019 at 11:25:59AM -0500, joshua stein wrote: > > This patchset goes back to files in /etc/firefox for unveil file > > lists, and goes further and moves the pledge strings to separate > > files too. This should be the most secure version that is still > > tweakable at runtime. > > > > I switched away from using Firefox's NS_LOCAL_FILE_CONTRACTID/ > > NS_LOCALFILEINPUTSTREAM_CONTRACTID mechanisms to read a file, since > > they require a lot of internal setup to be done before they can be > > used (which is otherwise a good thing, because other things later in > > Firefox shouldn't have raw file access). Instead of those, I'm > > using the normal C++ API for reading the /etc/firefox files and this > > way I have been able to move the pledge/unveil calls earlier in the > > process startup. Unfortunately this also means that I can't > > dynamically detect the localized ~/Downloads directory, so if you > > use a different directory, you'll just need to modify the > > unveil.content and unveil.main files to change it. > > > > I tried the $TMPDIR shenanigans with the main process mkdtemp'ing > > somewhere in $TMPDIR (or /tmp), and then exporting TMPDIR as that > > directory so that everything else within Firefox uses that > > subdirectory as its temp directory, allowing /tmp to be removed from > > the unveil lists and only that subdirectory visible. Unfortunately > > the first thing to break was our own shm_open() which hard-codes > > /tmp and doesn't honor $TMPDIR. So that all was ripped out and > > we're back to full access to /tmp. > > > > If the mailing list mangles this again, it's at > > https://jcs.org/patches/firefox-port-unveil8.diff > > > > > > when opening a youtube video, after a few seconds (no need to start the > video) firefox stops with a pledge error. > > firefox[27483]: pledge "tty", syscall 54 The output file will be huge, but by now it is obvious what is required: ktrace -di firefox kdump > hugefile And search for that the last record of that pid/thread (because the pledge killed it), and provide that information. It is ioctl. But what ioctl, and sometimes it also matters what that fd is, so you can search upwards for when it is created. Such information will be enough to find it in the code quickly. BTW, this applies to all pledge work.
Re: firefox: unveil and pledge enhancements [8]
On Wed, Sep 25, 2019 at 11:25:59AM -0500, joshua stein wrote: > This patchset goes back to files in /etc/firefox for unveil file > lists, and goes further and moves the pledge strings to separate > files too. This should be the most secure version that is still > tweakable at runtime. > > I switched away from using Firefox's NS_LOCAL_FILE_CONTRACTID/ > NS_LOCALFILEINPUTSTREAM_CONTRACTID mechanisms to read a file, since > they require a lot of internal setup to be done before they can be > used (which is otherwise a good thing, because other things later in > Firefox shouldn't have raw file access). Instead of those, I'm > using the normal C++ API for reading the /etc/firefox files and this > way I have been able to move the pledge/unveil calls earlier in the > process startup. Unfortunately this also means that I can't > dynamically detect the localized ~/Downloads directory, so if you > use a different directory, you'll just need to modify the > unveil.content and unveil.main files to change it. > > I tried the $TMPDIR shenanigans with the main process mkdtemp'ing > somewhere in $TMPDIR (or /tmp), and then exporting TMPDIR as that > directory so that everything else within Firefox uses that > subdirectory as its temp directory, allowing /tmp to be removed from > the unveil lists and only that subdirectory visible. Unfortunately > the first thing to break was our own shm_open() which hard-codes > /tmp and doesn't honor $TMPDIR. So that all was ripped out and > we're back to full access to /tmp. > > If the mailing list mangles this again, it's at > https://jcs.org/patches/firefox-port-unveil8.diff > > when opening a youtube video, after a few seconds (no need to start the video) firefox stops with a pledge error. firefox[27483]: pledge "tty", syscall 54
Re: [new] xe-0.11
Ping. Reattaching same port tarball OKed by Brian Callahan on 9/6 Thanks, Evan Silberman Brian Callahan wrote: > > > On 8/31/19 8:17 PM, Evan Silberman wrote: > > Brian Callahan wrote: > >> I notice there's no maintainer. Evan, would you like to be maintainer > >> since you've submitted this? > > Attaching Brian's tarball with yours truly as maintainer. Builds, > > installs, passes tests, and works for me on amd64. > > > > Evan > > OK with me. > > ~Brian xe.tgz Description: GNU Zip compressed data
Re: Security: textproc/xpdf fix CVE-2019-16927
Works fine for me on a bunch of different PDFs; OK kn
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2019/10/03 14:10:30 Modified files: devel/py-asn1 : Makefile distinfo devel/py-asn1/pkg: DESCR PLIST Log message: Update devel/py-asn1 0.3.7 -> 0.4.7 Brings py-asn1 up to date. >From Clem Atis. Thank you! OK benoit@ (maintainer)
lang/mono: add compat option
Hi,
With the move to mono 5 and integration of .NET Core modules (corefx,
corert), mono has tightened the checks around some operations, leading
to exceptions in some software that was built based on previously
allowed operations.
The diff below adds an option to disable 2 of these checks, allowing
to run selected software again by setting the env var
MONO_FORCE_COMPAT.
This was found and tested with the 2 games Terraria and Sword of the
Stars: The Pit, by me stefmorino (on Freenode #openbsd-gaming), and
solene@.
My understanding of the reasons for the exceptions is that undefined
behavior could occur if these exceptions are disabled. Terraria and
Sword of the Stars: The Pit work fine with this workaround.
MONO_FORCE_COMPAT shoud only be set in such exceptions where the
assemblies fail to run otherwise. The use of mono should otherwise be
unaffected.
The Terraria part of this compatibility issue has been raised with
upstream, but the conversation is stalling [1].
ok to include this in mono?
[1] https://github.com/mono/corert/pull/33
Index: Makefile
===
RCS file: /cvs/ports/lang/mono/Makefile,v
retrieving revision 1.132
diff -u -p -r1.132 Makefile
--- Makefile19 Sep 2019 12:02:59 - 1.132
+++ Makefile3 Oct 2019 17:16:02 -
@@ -5,6 +5,7 @@ USE_WXNEEDED= Yes
COMMENT= cross platform, open source .NET developement framework
V= 5.20.1.34
+REVISION= 0
DISTNAME= mono-${V}
Index:
patches/patch-external_corefx_src_Common_src_CoreLib_System_Collections_Generic_List_cs
===
RCS file:
patches/patch-external_corefx_src_Common_src_CoreLib_System_Collections_Generic_List_cs
diff -N
patches/patch-external_corefx_src_Common_src_CoreLib_System_Collections_Generic_List_cs
--- /dev/null 1 Jan 1970 00:00:00 -
+++
patches/patch-external_corefx_src_Common_src_CoreLib_System_Collections_Generic_List_cs
3 Oct 2019 17:16:02 -
@@ -0,0 +1,24 @@
+$OpenBSD$
+
+add MONO_FORCE_COMPAT env var for backwards compatibility with some
+routines that were abandoned with the update to mono 5 upstream
+This may lead to undefined behavior and should only be used in
+well-defined cases.
+
+Index:
external/corefx/src/Common/src/CoreLib/System/Collections/Generic/List.cs
+---
external/corefx/src/Common/src/CoreLib/System/Collections/Generic/List.cs.orig
external/corefx/src/Common/src/CoreLib/System/Collections/Generic/List.cs
+@@ -578,8 +578,11 @@ namespace System.Collections.Generic
+ action(_items[i]);
+ }
+
+-if (version != _version)
+-
ThrowHelper.ThrowInvalidOperationException_InvalidOperation_EnumFailedVersion();
++if (Environment.GetEnvironmentVariable ("MONO_FORCE_COMPAT") ==
null)
++{
++if (version != _version)
++
ThrowHelper.ThrowInvalidOperationException_InvalidOperation_EnumFailedVersion();
++}
+ }
+
+ // Returns an enumerator for this list with the given
Index:
patches/patch-external_corert_src_System_Private_CoreLib_shared_System_Collections_Generic_ArraySortHelper_cs
===
RCS file:
patches/patch-external_corert_src_System_Private_CoreLib_shared_System_Collections_Generic_ArraySortHelper_cs
diff -N
patches/patch-external_corert_src_System_Private_CoreLib_shared_System_Collections_Generic_ArraySortHelper_cs
--- /dev/null 1 Jan 1970 00:00:00 -
+++
patches/patch-external_corert_src_System_Private_CoreLib_shared_System_Collections_Generic_ArraySortHelper_cs
3 Oct 2019 17:16:02 -
@@ -0,0 +1,20 @@
+$OpenBSD$
+
+add MONO_FORCE_COMPAT env var for backwards compatibility with some
+routines that were abandoned with the update to mono 5 upstream
+This may lead to undefined behavior and should only be used in
+well-defined cases.
+
+Index:
external/corert/src/System.Private.CoreLib/shared/System/Collections/Generic/ArraySortHelper.cs
+---
external/corert/src/System.Private.CoreLib/shared/System/Collections/Generic/ArraySortHelper.cs.orig
external/corert/src/System.Private.CoreLib/shared/System/Collections/Generic/ArraySortHelper.cs
+@@ -40,7 +40,8 @@ namespace System.Collections.Generic
+
+ internal static void ThrowOrIgnoreBadComparer(object comparer)
+ {
+-throw new ArgumentException(SR.Format(SR.Arg_BogusIComparer,
comparer));
++if (Environment.GetEnvironmentVariable ("MONO_FORCE_COMPAT") ==
null)
++throw new ArgumentException(SR.Format(SR.Arg_BogusIComparer,
comparer));
+ }
+ }
+
Re: Security: textproc/xpdf fix CVE-2019-16927
Hi, On Thu, Oct 03, 2019 at 06:00:51PM +0200, Christian Weisgerber wrote: > xpdf 4.02 fixed an out-of-bounds write, CVE-2019-16927. > The German Federal CERT classified the vulnerability as "high risk", > "remote attack", and "arbitrary code execution". > > Based on the report and the vague response... > https://forum.xpdfreader.com/viewtopic.php?f=3=41885 > ... I extracted and adapted the fix from the diff between 4.01.01 > and 4.02. I had a look at the diffs betwwen 4.01.01 and 4.02, too, and think your diff is ok. > This could use some more sanity testing over a collection of PDF > files. Onless other people do some testing, I could test tomorrow. Ciao, Kili
Re: UPDATE: devel/cmake
On Thu, Oct 03, 2019 at 08:39:17PM +0200, Rafael Sadowski wrote: > "In CMake 3.15.0 through 3.15.3, the EXCLUDE_FROM_ALL directory property > was regressed from pre-3.14 behavior and caused targets within the > directory to be excluded even from its own “all”. This has been fixed. > The bug also existed in 3.14.0 through 3.14.6 and is fixed in 3.14.7." If we did not experience any issues in/after the transition from older/correct versions to those regressed ones, and this update merely contains the EXCLUDE_FROM_ALL fix without anything else, I'd say it's save to update; or not?
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2019/10/03 12:39:26 Modified files: lang/ruby/2.5 : Makefile distinfo Log message: Update to Ruby 2.5.7, fixing the following vulnerabilities: * CVE-2019-16255: A code injection vulnerability of Shell#[] and Shell#test * CVE-2019-16254: HTTP response splitting in WEBrick (Additional fix) * CVE-2019-15845: A NUL injection vulnerability of File.fnmatch and File.fnmatch? * CVE-2019-16201: Regular Expression Denial of Service vulnerability of WEBrick.s Digest access authentication
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2019/10/03 12:39:57 Modified files: lang/ruby/2.4 : Makefile distinfo Log message: Update to Ruby 2.4.9, fixing the following vulnerabilities: * CVE-2019-16255: A code injection vulnerability of Shell#[] and Shell#test * CVE-2019-16254: HTTP response splitting in WEBrick (Additional fix) * CVE-2019-15845: A NUL injection vulnerability of File.fnmatch and File.fnmatch? * CVE-2019-16201: Regular Expression Denial of Service vulnerability of WEBrick.s Digest access authentication
UPDATE: devel/cmake
Bugfix update cmake to 3.15.4, From changelog:
"In CMake 3.15.0 through 3.15.3, the EXCLUDE_FROM_ALL directory property
was regressed from pre-3.14 behavior and caused targets within the
directory to be excluded even from its own “all”. This has been fixed.
The bug also existed in 3.14.0 through 3.14.6 and is fixed in 3.14.7."
-- https://cmake.org/cmake/help/v3.15/release/3.15.html (at the end)
OK?
Index: Makefile
===
RCS file: /cvs/ports/devel/cmake/Makefile,v
retrieving revision 1.177
diff -u -p -u -p -r1.177 Makefile
--- Makefile20 Sep 2019 14:37:24 - 1.177
+++ Makefile3 Oct 2019 16:13:30 -
@@ -4,7 +4,7 @@ DPB_PROPERTIES =parallel
COMMENT = portable build system
-VER = 3.15.3
+VER = 3.15.4
EPOCH =0
DISTNAME = cmake-${VER}
CATEGORIES = devel
Index: distinfo
===
RCS file: /cvs/ports/devel/cmake/distinfo,v
retrieving revision 1.55
diff -u -p -u -p -r1.55 distinfo
--- distinfo20 Sep 2019 14:37:25 - 1.55
+++ distinfo3 Oct 2019 16:13:30 -
@@ -1,2 +1,2 @@
-SHA256 (cmake-3.15.3.tar.gz) = E5WCQ6ATZbBWUvoBsh1A+oNPcKnjDvppwCYE5k9YuPU=
-SIZE (cmake-3.15.3.tar.gz) = 9270184
+SHA256 (cmake-3.15.4.tar.gz) = iiEVieohN05Jsl/B/BcOLVx0YreV8bKchN0OmEMB7Xo=
+SIZE (cmake-3.15.4.tar.gz) = 9270648
Index: patches/patch-Source_cmGlobalGenerator_cxx
===
RCS file: /cvs/ports/devel/cmake/patches/patch-Source_cmGlobalGenerator_cxx,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 patch-Source_cmGlobalGenerator_cxx
--- patches/patch-Source_cmGlobalGenerator_cxx 20 Sep 2019 14:37:25 -
1.11
+++ patches/patch-Source_cmGlobalGenerator_cxx 3 Oct 2019 16:13:30 -
@@ -3,7 +3,7 @@ $OpenBSD: patch-Source_cmGlobalGenerator
Index: Source/cmGlobalGenerator.cxx
--- Source/cmGlobalGenerator.cxx.orig
+++ Source/cmGlobalGenerator.cxx
-@@ -2432,6 +2432,9 @@ void cmGlobalGenerator::AddGlobalTarget_Test(
+@@ -2440,6 +2440,9 @@ void cmGlobalGenerator::AddGlobalTarget_Test(
cmCustomCommandLine singleLine;
singleLine.push_back(cmSystemTools::GetCTestCommand());
singleLine.push_back("--force-new-ctest-process");
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2019/10/03 12:38:54 Modified files: lang/ruby/2.6 : Makefile distinfo lang/ruby/2.6/pkg: PLIST-main Log message: Update to Ruby 2.6.5, fixing the following vulnerabilities: * CVE-2019-16255: A code injection vulnerability of Shell#[] and Shell#test * CVE-2019-16254: HTTP response splitting in WEBrick (Additional fix) * CVE-2019-15845: A NUL injection vulnerability of File.fnmatch and File.fnmatch? * CVE-2019-16201: Regular Expression Denial of Service vulnerability of WEBrick.s Digest access authentication
UPDATE: devel/intellij
Update intellij to the latest stable version 2019.2.2.
Looks like jetbrains switched all projects to JAVA>8. Let's switch to
MODJAVA_VER 11 as we did in pycharm.
The other parts, as always.
OK, Feedback?
RS
Index: Makefile
===
RCS file: /cvs/ports/devel/intellij/Makefile,v
retrieving revision 1.62
diff -u -p -u -p -r1.62 Makefile
--- Makefile12 Jul 2019 20:44:36 - 1.62
+++ Makefile2 Oct 2019 19:08:48 -
@@ -2,11 +2,10 @@
COMMENT= IntelliJ IDEA Java IDE
-V= 2019.1.1
+V= 2019.2.2
DISTNAME= ideaIC-${V}
PKGNAME= intellij-${V}
CATEGORIES=devel
-REVISION= 0
HOMEPAGE= https://www.jetbrains.com/idea/
MAINTAINER=Caspar Schutijser
@@ -17,7 +16,7 @@ PERMIT_PACKAGE= Yes
MASTER_SITES= https://download.jetbrains.com/idea/
MODULES= java
-MODJAVA_VER= 1.8+
+MODJAVA_VER= 11
BUILD_DEPENDS= ${MODJAVA_RUN_DEPENDS}
@@ -26,7 +25,7 @@ RUN_DEPENDS= devel/desktop-file-utils \
NO_TEST= Yes
-WRKDIST= ${WRKDIR}/idea-IC-191.6707.61
+WRKDIST= ${WRKDIR}/idea-IC-192.6603.28
IJ=${PREFIX}/intellij
# If NO_BUILD is set, JAVA_HOME doesn't get defined. So do
Index: distinfo
===
RCS file: /cvs/ports/devel/intellij/distinfo,v
retrieving revision 1.37
diff -u -p -u -p -r1.37 distinfo
--- distinfo26 Apr 2019 12:38:02 - 1.37
+++ distinfo2 Oct 2019 19:08:48 -
@@ -1,2 +1,2 @@
-SHA256 (ideaIC-2019.1.1.tar.gz) = WKk4n9iSUNfyUZ6yQtaAFHxTE0JUWCP+WXoKBXCwbXU=
-SIZE (ideaIC-2019.1.1.tar.gz) = 577947165
+SHA256 (ideaIC-2019.2.2.tar.gz) = +i1CKVFqSe53alJM2jJMdLEv+0eacDtEwVyE6cVzH68=
+SIZE (ideaIC-2019.2.2.tar.gz) = 672831239
Index: patches/patch-bin_idea_sh
===
RCS file: /cvs/ports/devel/intellij/patches/patch-bin_idea_sh,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-bin_idea_sh
--- patches/patch-bin_idea_sh 28 Dec 2018 09:25:01 - 1.1
+++ patches/patch-bin_idea_sh 2 Oct 2019 19:08:48 -
@@ -5,12 +5,12 @@ Avoid "egrep: -: No such file or directo
Index: bin/idea.sh
--- bin/idea.sh.orig
+++ bin/idea.sh
-@@ -174,7 +174,7 @@ fi
+@@ -180,7 +180,7 @@ fi
VM_OPTIONS=""
if [ -r "$VM_OPTIONS_FILE" ]; then
- VM_OPTIONS=`"$CAT" "$VM_OPTIONS_FILE" | "$GREP" -v "^#.*"`
-- if { echo "$VM_OPTIONS" | "$GREP" -q "agentlib:yjpagent" - ; } then
-+ if { echo "$VM_OPTIONS" | "$GREP" -q "agentlib:yjpagent"; } then
+ VM_OPTIONS=$("$CAT" "$VM_OPTIONS_FILE" | "$GREP" -v "^#.*")
+- if { echo "$VM_OPTIONS" | "$GREP" -q "agentlib:yjpagent" - ; }; then
++ if { echo "$VM_OPTIONS" | "$GREP" -q "agentlib:yjpagent"; }; then
if [ "$OS_TYPE" = "Linux" ]; then
- VM_OPTIONS=`echo "$VM_OPTIONS" | "$SED" -e
"s|-agentlib:yjpagent\(-linux\)\?\([^=]*\)|-agentpath:$IDE_BIN_HOME/libyjpagent-linux\2.so|"`
+ VM_OPTIONS=$(echo "$VM_OPTIONS" | "$SED" -e
"s|-agentlib:yjpagent\(-linux\)\?\([^=]*\)|-agentpath:$IDE_BIN_HOME/libyjpagent-linux\2.so|")
else
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/intellij/pkg/PLIST,v
retrieving revision 1.38
diff -u -p -u -p -r1.38 PLIST
--- pkg/PLIST 26 Apr 2019 12:38:02 - 1.38
+++ pkg/PLIST 2 Oct 2019 19:08:48 -
@@ -23,17 +23,452 @@ intellij/bin/printenv.py
intellij/bin/restart.py
intellij/build.txt
intellij/idea.png
+intellij/jbr/
+intellij/jbr/bin/
+intellij/jbr/bin/jaotc
+intellij/jbr/bin/java
+intellij/jbr/bin/javac
+intellij/jbr/bin/jdb
+intellij/jbr/bin/jjs
+intellij/jbr/bin/jrunscript
+intellij/jbr/bin/keytool
+intellij/jbr/bin/pack200
+intellij/jbr/bin/rmid
+intellij/jbr/bin/rmiregistry
+intellij/jbr/bin/serialver
+intellij/jbr/bin/unpack200
+intellij/jbr/conf/
+intellij/jbr/conf/logging.properties
+intellij/jbr/conf/management/
+intellij/jbr/conf/management/jmxremote.access
+intellij/jbr/conf/management/jmxremote.password.template
+intellij/jbr/conf/management/management.properties
+intellij/jbr/conf/net.properties
+intellij/jbr/conf/security/
+intellij/jbr/conf/security/java.policy
+intellij/jbr/conf/security/java.security
+intellij/jbr/conf/security/policy/
+intellij/jbr/conf/security/policy/README.txt
+intellij/jbr/conf/security/policy/limited/
+intellij/jbr/conf/security/policy/limited/default_US_export.policy
+intellij/jbr/conf/security/policy/limited/default_local.policy
+intellij/jbr/conf/security/policy/limited/exempt_local.policy
+intellij/jbr/conf/security/policy/unlimited/
+intellij/jbr/conf/security/policy/unlimited/default_US_export.policy
+intellij/jbr/conf/security/policy/unlimited/default_local.policy
+intellij/jbr/conf/sound.properties
+intellij/jbr/include/
Re: PostgreSQL 12.0
On 10/03 09:01, Jeremy Evans wrote:
> PostgreSQL 12.0 was released today. Here's a diff to update to it.
> Tested briefly on amd64, no issues noted.
You will probably need this diff for postgresql-previous to build
the package for postgresql.
Thanks,
Jeremy
Index: Makefile
===
RCS file: /cvs/ports/databases/postgresql-previous/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- Makefile12 Jul 2019 20:43:59 - 1.10
+++ Makefile3 Oct 2019 17:53:03 -
@@ -2,16 +2,15 @@
COMMENT= PostgreSQL RDBMS (previous version, for pg_upgrade)
-VERSION= 10.6
+VERSION= 11.5
DISTNAME= postgresql-${VERSION}
PKGNAME= postgresql-previous-${VERSION}
-REVISION= 0
CATEGORIES=databases
-SHARED_LIBS= ecpg7.8 \
- ecpg_compat 4.8 \
- pgtypes 4.7 \
- pq 6.9
+SHARED_LIBS= ecpg7.9 \
+ ecpg_compat 4.9 \
+ pgtypes 4.8 \
+ pq 6.10
HOMEPAGE= http://www.postgresql.org/
Index: distinfo
===
RCS file: /cvs/ports/databases/postgresql-previous/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo19 Feb 2019 05:09:58 - 1.3
+++ distinfo3 Oct 2019 18:02:25 -
@@ -1,2 +1,2 @@
-SHA256 (postgresql-10.6.tar.gz) = fMtwrJHZaOMvZCpPQKeIUkU1L6t+6FMO3OEn3qbmICs=
-SIZE (postgresql-10.6.tar.gz) = 26902911
+SHA256 (postgresql-11.5.tar.gz) = 9jmvD4w/HkcOQcgQjL2upYNrJzjK3UIhNaoqD+vIrng=
+SIZE (postgresql-11.5.tar.gz) = 25940612
Index: pkg/PLIST
===
RCS file: /cvs/ports/databases/postgresql-previous/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST 19 Feb 2019 05:09:58 - 1.3
+++ pkg/PLIST 3 Oct 2019 18:22:38 -
@@ -25,6 +25,7 @@ bin/${POSTGRESQL_DIR}/
@bin bin/${POSTGRESQL_DIR}/pg_test_fsync
@bin bin/${POSTGRESQL_DIR}/pg_test_timing
@bin bin/${POSTGRESQL_DIR}/pg_upgrade
+@bin bin/${POSTGRESQL_DIR}/pg_verify_checksums
@bin bin/${POSTGRESQL_DIR}/pg_waldump
@bin bin/${POSTGRESQL_DIR}/pgbench
@bin bin/${POSTGRESQL_DIR}/postgres
@@ -112,6 +113,7 @@ include/${POSTGRESQL_DIR}/server/access/
include/${POSTGRESQL_DIR}/server/access/rmgr.h
include/${POSTGRESQL_DIR}/server/access/rmgrlist.h
include/${POSTGRESQL_DIR}/server/access/sdir.h
+include/${POSTGRESQL_DIR}/server/access/session.h
include/${POSTGRESQL_DIR}/server/access/skey.h
include/${POSTGRESQL_DIR}/server/access/slru.h
include/${POSTGRESQL_DIR}/server/access/spgist.h
@@ -125,6 +127,7 @@ include/${POSTGRESQL_DIR}/server/access/
include/${POSTGRESQL_DIR}/server/access/tsmapi.h
include/${POSTGRESQL_DIR}/server/access/tupconvert.h
include/${POSTGRESQL_DIR}/server/access/tupdesc.h
+include/${POSTGRESQL_DIR}/server/access/tupdesc_details.h
include/${POSTGRESQL_DIR}/server/access/tupmacs.h
include/${POSTGRESQL_DIR}/server/access/tuptoaster.h
include/${POSTGRESQL_DIR}/server/access/twophase.h
@@ -157,75 +160,130 @@ include/${POSTGRESQL_DIR}/server/catalog
include/${POSTGRESQL_DIR}/server/catalog/opfam_internal.h
include/${POSTGRESQL_DIR}/server/catalog/partition.h
include/${POSTGRESQL_DIR}/server/catalog/pg_aggregate.h
+include/${POSTGRESQL_DIR}/server/catalog/pg_aggregate_d.h
include/${POSTGRESQL_DIR}/server/catalog/pg_am.h
+include/${POSTGRESQL_DIR}/server/catalog/pg_am_d.h
include/${POSTGRESQL_DIR}/server/catalog/pg_amop.h
+include/${POSTGRESQL_DIR}/server/catalog/pg_amop_d.h
include/${POSTGRESQL_DIR}/server/catalog/pg_amproc.h
+include/${POSTGRESQL_DIR}/server/catalog/pg_amproc_d.h
include/${POSTGRESQL_DIR}/server/catalog/pg_attrdef.h
+include/${POSTGRESQL_DIR}/server/catalog/pg_attrdef_d.h
include/${POSTGRESQL_DIR}/server/catalog/pg_attribute.h
+include/${POSTGRESQL_DIR}/server/catalog/pg_attribute_d.h
include/${POSTGRESQL_DIR}/server/catalog/pg_auth_members.h
+include/${POSTGRESQL_DIR}/server/catalog/pg_auth_members_d.h
include/${POSTGRESQL_DIR}/server/catalog/pg_authid.h
+include/${POSTGRESQL_DIR}/server/catalog/pg_authid_d.h
include/${POSTGRESQL_DIR}/server/catalog/pg_cast.h
+include/${POSTGRESQL_DIR}/server/catalog/pg_cast_d.h
include/${POSTGRESQL_DIR}/server/catalog/pg_class.h
+include/${POSTGRESQL_DIR}/server/catalog/pg_class_d.h
include/${POSTGRESQL_DIR}/server/catalog/pg_collation.h
-include/${POSTGRESQL_DIR}/server/catalog/pg_collation_fn.h
+include/${POSTGRESQL_DIR}/server/catalog/pg_collation_d.h
include/${POSTGRESQL_DIR}/server/catalog/pg_constraint.h
-include/${POSTGRESQL_DIR}/server/catalog/pg_constraint_fn.h
+include/${POSTGRESQL_DIR}/server/catalog/pg_constraint_d.h
include/${POSTGRESQL_DIR}/server/catalog/pg_control.h
include/${POSTGRESQL_DIR}/server/catalog/pg_conversion.h
-include/${POSTGRESQL_DIR}/server/catalog/pg_conversion_fn.h
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2019/10/03 11:57:50 Modified files: www/mozilla-firefox: Makefile distinfo www/firefox-i18n: Makefile.inc distinfo Log message: Update to firefox 69.0.2. See https://www.mozilla.org/en-US/firefox/69.0.2/releasenotes/
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2019/10/03 11:51:59 Modified files: sysutils/uefitool: Makefile Log message: Set PORTROACH to ignore A* and t* (pre) releases
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2019/10/03 11:38:16 Modified files: devel/p5-ExtUtils-CppGuess: Makefile distinfo Log message: Update ExtUtils-CppGuess to 0.20 no link -lstdc++ if -static-libstdc++ - thanks @andygrundman
Re: New/Replacement: Kicad 5.1.4
On October 3, 2019 10:52:24 AM MDT, "Anthony J. Bentley" wrote: >Hi Tracey, > >Tracey Emery writes: >> Could you explain >> the need for the conflict? Shouldn't it be okay to have both ngspice >and >> libngspice installed at the same time with the removal of the >includes >> and shares? > >libngspice and the new ngspice revision, yes. But think about the case >where someone has the old ngspice package installed, without running >pkg_add -U, and then tries to install libngspice. That's why the >@conflict marker lists only ngspice with a version less than p0 >(REVISION = 0), and also why the ngspice PLIST doesn't need a @conflict >marker (we can't retroactively add a @conflict to old copies of ngspice >that have the headers, and new ngspice doesn't conflict with anything). > >-- >Anthony J. Bentley Ah ha! Thanks for that explanation. -- Tracey Emery
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2019/10/03 11:09:08 Modified files: sysutils/entr : Makefile distinfo Log message: Update entr to 4.3 ok kn@
Re: UPDATE: sysutils/entr
OK kn
Re: New/Replacement: Kicad 5.1.4
Hi Tracey, Tracey Emery writes: > Could you explain > the need for the conflict? Shouldn't it be okay to have both ngspice and > libngspice installed at the same time with the removal of the includes > and shares? libngspice and the new ngspice revision, yes. But think about the case where someone has the old ngspice package installed, without running pkg_add -U, and then tries to install libngspice. That's why the @conflict marker lists only ngspice with a version less than p0 (REVISION = 0), and also why the ngspice PLIST doesn't need a @conflict marker (we can't retroactively add a @conflict to old copies of ngspice that have the headers, and new ngspice doesn't conflict with anything). -- Anthony J. Bentley
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: na...@cvs.openbsd.org 2019/10/03 10:49:11 Modified files: math/fftw3 : Makefile math/fftw3/pkg : PFRAG.double-main PFRAG.float-main PLIST-common Log message: Fix the subpackaging: The *.cmake files are not shared between the flavors; move them from -common to the flavored -main packages. ok sthen@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2019/10/03 10:30:45 Modified files: x11/qt5ct : Makefile distinfo Log message: Update qt5ct to 0.41 take maintainer, ok kn@
UPDATE: sysutils/entr
Update entr to 4.3.
- Remove second unreachable master site
- New WRKDIST is not more necessary
All tests are green on amd64.
OK?
Index: Makefile
===
RCS file: /cvs/ports/sysutils/entr/Makefile,v
retrieving revision 1.16
diff -u -p -u -p -r1.16 Makefile
--- Makefile12 Jul 2019 21:02:26 - 1.16
+++ Makefile3 Oct 2019 16:11:00 -
@@ -2,7 +2,7 @@
COMMENT = run arbitrary commands when files change
-DISTNAME = entr-4.2
+DISTNAME = entr-4.3
CATEGORIES = sysutils
@@ -13,16 +13,11 @@ PERMIT_PACKAGE = Yes
WANTLIB += c
-MASTER_SITES = http://entrproject.org/code/ \
- https://bitbucket.org/eradman/entr/get/
+MASTER_SITES = http://entrproject.org/code/
MAKE_FILE =Makefile.bsd
MAKE_FLAGS = CC="${CC}" \
LDFLAGS="${LDFLAGS}"
-WRKDIST = ${WRKDIR}/eradman-entr
FAKE_FLAGS = DESTDIR=""
-
-post-extract:
- mv ${WRKDIR}/eradman-entr-* ${WRKDIST}
.include
Index: distinfo
===
RCS file: /cvs/ports/sysutils/entr/distinfo,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 distinfo
--- distinfo4 May 2019 14:29:48 - 1.11
+++ distinfo3 Oct 2019 16:11:00 -
@@ -1,2 +1,2 @@
-SHA256 (entr-4.2.tar.gz) = JzACFd8Kq4t3MALaJce/YGgdjDkvXVcClGxGeY6bXXA=
-SIZE (entr-4.2.tar.gz) = 25599
+SHA256 (entr-4.3.tar.gz) = sIHB29rHcj6R9tUooNc2+Qyy+xRYiIqjtEZpnZ0mI1o=
+SIZE (entr-4.3.tar.gz) = 23756
Security: textproc/xpdf fix CVE-2019-16927
xpdf 4.02 fixed an out-of-bounds write, CVE-2019-16927.
The German Federal CERT classified the vulnerability as "high risk",
"remote attack", and "arbitrary code execution".
Based on the report and the vague response...
https://forum.xpdfreader.com/viewtopic.php?f=3=41885
... I extracted and adapted the fix from the diff between 4.01.01
and 4.02.
NIST lists this is conjunction with CVE-2019-9877:
https://nvd.nist.gov/vuln/search/results?form_type=Basic_type=overview=CVE-2019-9877_type=all
They're basically the same problem, one writing outside the vertical
something array, the other one outside the corresponding horizontal
array. 4.01.01 fixed -9877 by adjusting the lexer, so it wouldn't
overflow a floating point number, but the checks introduced in
response to -16927 should cover this as well.
This could use some more sanity testing over a collection of PDF
files.
While here, also update HOMEPAGE and the dead MASTER_SITES.
OK?
Index: Makefile
===
RCS file: /cvs/ports/textproc/xpdf/Makefile,v
retrieving revision 1.93
diff -u -p -r1.93 Makefile
--- Makefile12 Jul 2019 20:50:17 - 1.93
+++ Makefile3 Oct 2019 15:40:19 -
@@ -5,12 +5,11 @@ COMMENT= PDF viewer for X11
DISTNAME= xpdf-3.04
CATEGORIES=textproc x11
EPOCH= 0
-REVISION= 0
+REVISION= 1
-MASTER_SITES= ftp://ftp.foolabs.com/pub/xpdf/ \
- http://mirror.ctan.org/support/xpdf/
+MASTER_SITES= https://xpdfreader-dl.s3.amazonaws.com/old/
-HOMEPAGE= http://www.foolabs.com/xpdf/
+HOMEPAGE= https://www.xpdfreader.com/
# GPLv2 only or GPLv3 only or both (at our choice)
PERMIT_PACKAGE=Yes
Index: patches/patch-xpdf_TextOutputDev_cc
===
RCS file: patches/patch-xpdf_TextOutputDev_cc
diff -N patches/patch-xpdf_TextOutputDev_cc
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-xpdf_TextOutputDev_cc 3 Oct 2019 15:40:19 -
@@ -0,0 +1,20 @@
+$OpenBSD$
+
+CVE-2019-16927, CVE-2019-9877 from 4.02
+
+Index: xpdf/TextOutputDev.cc
+--- xpdf/TextOutputDev.cc.orig
xpdf/TextOutputDev.cc
+@@ -2472,6 +2472,12 @@ TextBlock *TextPage::split(GList *charsA, int rot) {
+
+ //- compute the horizontal and vertical profiles
+
++ if (xMin / splitPrecision < 0.5 * INT_MIN ||
++ xMax / splitPrecision > 0.5 * INT_MAX ||
++ yMin / splitPrecision < 0.5 * INT_MIN ||
++ xMax / splitPrecision > 0.5 * INT_MAX) {
++return NULL;
++ }
+ // add some slack to the array bounds to avoid floating point
+ // precision problems
+ xMinI = (int)floor(xMin / splitPrecision) - 1;
--
Christian "naddy" Weisgerber na...@mips.inka.de
PostgreSQL 12.0
PostgreSQL 12.0 was released today. Here's a diff to update to it.
Tested briefly on amd64, no issues noted.
Unless another kind soul takes care of it first, I will be working
on updating the rest of the ports tree to work with PostgreSQL 12
during p2k19.
Thanks,
Jeremy
Index: Makefile
===
RCS file: /cvs/ports/databases/postgresql/Makefile,v
retrieving revision 1.256
diff -u -p -r1.256 Makefile
--- Makefile27 Aug 2019 19:49:46 - 1.256
+++ Makefile3 Oct 2019 15:57:30 -
@@ -7,9 +7,8 @@ COMMENT-contrib=PostgreSQL RDBMS contrib
COMMENT-plpython=Python procedural language for PostgreSQL
COMMENT-pg_upgrade=Support for upgrading PostgreSQL data from previous version
-VERSION= 11.5
-PREV_MAJOR=10
-REVISION-server=0
+VERSION= 12.0
+PREV_MAJOR=11
DISTNAME= postgresql-${VERSION}
PKGNAME-main= postgresql-client-${VERSION}
PKGNAME-server=postgresql-server-${VERSION}
@@ -20,10 +19,10 @@ PKGNAME-pg_upgrade=postgresql-pg_upgrade
CATEGORIES=databases
-SHARED_LIBS= ecpg7.9 \
- ecpg_compat 4.9 \
- pgtypes 4.8 \
- pq 6.10
+SHARED_LIBS= ecpg7.10 \
+ ecpg_compat 4.10 \
+ pgtypes 4.9 \
+ pq 6.11
HOMEPAGE= http://www.postgresql.org/
Index: distinfo
===
RCS file: /cvs/ports/databases/postgresql/distinfo,v
retrieving revision 1.80
diff -u -p -r1.80 distinfo
--- distinfo12 Aug 2019 16:40:40 - 1.80
+++ distinfo3 Oct 2019 15:13:21 -
@@ -1,2 +1,2 @@
-SHA256 (postgresql-11.5.tar.gz) = 9jmvD4w/HkcOQcgQjL2upYNrJzjK3UIhNaoqD+vIrng=
-SIZE (postgresql-11.5.tar.gz) = 25940612
+SHA256 (postgresql-12.0.tar.gz) = FcfyZ7R212THlAHX9h85x2IiMUlR935ok6WFTbJrZhY=
+SIZE (postgresql-12.0.tar.gz) = 26393892
Index: patches/patch-src_bin_scripts_vacuumdb_c
===
RCS file:
/cvs/ports/databases/postgresql/patches/patch-src_bin_scripts_vacuumdb_c,v
retrieving revision 1.2
diff -u -p -r1.2 patch-src_bin_scripts_vacuumdb_c
--- patches/patch-src_bin_scripts_vacuumdb_c13 Nov 2017 17:17:30 -
1.2
+++ patches/patch-src_bin_scripts_vacuumdb_c2 Oct 2019 15:53:06 -
@@ -2,9 +2,9 @@ $OpenBSD: patch-src_bin_scripts_vacuumdb
Index: src/bin/scripts/vacuumdb.c
--- src/bin/scripts/vacuumdb.c.orig
+++ src/bin/scripts/vacuumdb.c
-@@ -10,6 +10,8 @@
- *-
- */
+@@ -14,6 +14,8 @@
+ #define FD_SETSIZE 1024 /* must set before winsock2.h
is included */
+ #endif
+#include /* FD_SETSIZE */
+
Index: patches/patch-src_include_storage_s_lock_h
===
RCS file:
/cvs/ports/databases/postgresql/patches/patch-src_include_storage_s_lock_h,v
retrieving revision 1.5
diff -u -p -r1.5 patch-src_include_storage_s_lock_h
--- patches/patch-src_include_storage_s_lock_h 18 Feb 2018 17:37:13 -
1.5
+++ patches/patch-src_include_storage_s_lock_h 2 Oct 2019 15:53:06 -
@@ -2,7 +2,7 @@ $OpenBSD: patch-src_include_storage_s_lo
Index: src/include/storage/s_lock.h
--- src/include/storage/s_lock.h.orig
+++ src/include/storage/s_lock.h
-@@ -717,6 +717,29 @@ typedef unsigned char slock_t;
+@@ -734,6 +734,29 @@ typedef unsigned char slock_t;
do { __asm__ __volatile__("" : : : "memory"); *(lock) = 0; } while (0)
#endif
Index: pkg/PLIST-contrib
===
RCS file: /cvs/ports/databases/postgresql/pkg/PLIST-contrib,v
retrieving revision 1.20
diff -u -p -r1.20 PLIST-contrib
--- pkg/PLIST-contrib 19 Feb 2019 05:09:18 - 1.20
+++ pkg/PLIST-contrib 18 Jun 2019 16:44:02 -
@@ -49,7 +49,6 @@ lib/postgresql/seg.so
lib/postgresql/sslinfo.so
lib/postgresql/tablefunc.so
lib/postgresql/tcn.so
-lib/postgresql/timetravel.so
lib/postgresql/tsm_system_rows.so
lib/postgresql/tsm_system_time.so
lib/postgresql/unaccent.so
@@ -252,9 +251,6 @@ share/postgresql/extension/tablefunc--un
share/postgresql/extension/tablefunc.control
share/postgresql/extension/tcn--1.0.sql
share/postgresql/extension/tcn.control
-share/postgresql/extension/timetravel--1.0.sql
-share/postgresql/extension/timetravel--unpackaged--1.0.sql
-share/postgresql/extension/timetravel.control
share/postgresql/extension/tsm_system_rows--1.0.sql
share/postgresql/extension/tsm_system_rows.control
share/postgresql/extension/tsm_system_time--1.0.sql
Index: pkg/PLIST-docs
===
RCS file: /cvs/ports/databases/postgresql/pkg/PLIST-docs,v
retrieving revision 1.92
diff -u -p -r1.92 PLIST-docs
--- pkg/PLIST-docs 12 Aug 2019 16:40:40 - 1.92
+++ pkg/PLIST-docs
UPDATE: x11/qt5ct
Simple update qt5ct to 0.41. I see no changelog but works fine on
amd64. Please keep in mind to set: QT_QPA_PLATFORMTHEME=qt5ct.
Take maintainer!
OK?
Index: Makefile
===
RCS file: /cvs/ports/x11/qt5ct/Makefile,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 Makefile
--- Makefile12 Jul 2019 20:51:20 - 1.6
+++ Makefile3 Oct 2019 15:51:13 -
@@ -2,11 +2,13 @@
COMMENT = Qt5 configuration tool
-DISTNAME = qt5ct-0.39
+DISTNAME = qt5ct-0.41
EXTRACT_SUFX = .tar.bz2
CATEGORIES = x11
+MAINTAINER = Rafael Sadowski
+
# BSD
PERMIT_PACKAGE=Yes
@@ -15,7 +17,7 @@ MODULES = devel/qmake x11/qt5
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=qt5ct/}
RUN_DEPENDS += devel/desktop-file-utils
-WANTLIB += ${COMPILER_LIBCXX} GL Qt5Core Qt5DBus Qt5Gui Qt5Widgets
-WANTLIB += c m
+WANTLIB += ${COMPILER_LIBCXX} GL Qt5Concurrent Qt5Core Qt5DBus
+WANTLIB += Qt5Gui Qt5Widgets c m
.include
Index: distinfo
===
RCS file: /cvs/ports/x11/qt5ct/distinfo,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 distinfo
--- distinfo5 May 2019 17:52:54 - 1.3
+++ distinfo3 Oct 2019 15:51:13 -
@@ -1,2 +1,2 @@
-SHA256 (qt5ct-0.39.tar.bz2) = N2ns3L34IdUvfx4BNTGpaSwourC65fEz0iy6dwIzPhk=
-SIZE (qt5ct-0.39.tar.bz2) = 70554
+SHA256 (qt5ct-0.41.tar.bz2) = 8kAw6Q2LkjtgwyCy21tMD8xH+fNaxMUgYKs8bkIwV9w=
+SIZE (qt5ct-0.41.tar.bz2) = 73009
Re: math/fftw3: fix subpackaging
On 2019/10/03 16:54, Stuart Henderson wrote: > On 2019/10/03 16:04, Christian Weisgerber wrote: > > Currently, if you try to build the "float" flavor of math/fftw3 before > > the "double" flavor, packaging will fail. The *.cmake files are in > > fact not shared between the flavors; there are separate FFTW3Config and > > FFTW3fConfig files. The patch below moves them from -common to the > > flavored -main packages. > > > > ok? > > OK. > > I thought it might need an @conflict on the old version, but I've checked > and pkg_add -u is happy as-is. > PS I see visa@ sent essentially the same diff a couple of months ago.
Re: math/fftw3: fix subpackaging
On 2019/10/03 16:04, Christian Weisgerber wrote: > Currently, if you try to build the "float" flavor of math/fftw3 before > the "double" flavor, packaging will fail. The *.cmake files are in > fact not shared between the flavors; there are separate FFTW3Config and > FFTW3fConfig files. The patch below moves them from -common to the > flavored -main packages. > > ok? OK. I thought it might need an @conflict on the old version, but I've checked and pkg_add -u is happy as-is.
Re: New/Replacement: Kicad 5.1.4
On Thu, Oct 03, 2019 at 02:58:28AM -0600, Anthony J. Bentley wrote: > Hi Tracey, > > Tracey Emery writes: > > Here's a crack at the ngspice port. > > Pretty close. Here are the changes I made: > > - used ?= for variable assignment within Makefile.inc (I think this > matters when the same variable is set in both Makefile.inc and a > project subdirectory's Makefile). > - removed duplicate MASTER_SITES in ngspice Makefile. > - moved include files to libngspice, set @conflict and bumped REVISION > - set @pkgpath for ngspice since the package moved. > - switched to my preferred wantlib whitespace style, namely the kind I > can copy and paste from port-lib-depends-check ;) > > The attached should be ready for import--ok? Thanks for the cleanup. Everything compiles fine. I've learned a lot from your guys' edits. Thanks for that. Could you explain the need for the conflict? Shouldn't it be okay to have both ngspice and libngspice installed at the same time with the removal of the includes and shares? I moved the conflict from libngspice to ngspice and both install. Thanks for any insight you can share. Perhaps I have cruft in mystuff after all this! hahahaha Attached is also a new kicad with the cad/ngspice/libngspice change. > > cad/qucs-s and meta/geda both have runtime dependencies on ngspice > which I'll switch to cad/ngspice/ngspice. > > -- > Anthony J. Bentley -- Tracey Emery kicad-5.1.4.tar.gz Description: Binary data ngspice.tar.gz Description: Binary data
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rob...@cvs.openbsd.org 2019/10/03 08:37:31 Modified files: x11/mate/utils : Makefile distinfo x11/mate/utils/pkg: PLIST Log message: update to 1.22.2
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rob...@cvs.openbsd.org 2019/10/03 08:37:18 Modified files: x11/mate/settings-daemon: Makefile distinfo x11/mate/settings-daemon/pkg: PLIST Log message: update to 1.22.1
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rob...@cvs.openbsd.org 2019/10/03 08:37:24 Modified files: x11/mate/system-monitor: Makefile distinfo x11/mate/system-monitor/pkg: PLIST Log message: update to 1.22.2
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rob...@cvs.openbsd.org 2019/10/03 08:37:07 Modified files: x11/mate/screensaver: Makefile distinfo x11/mate/screensaver/pkg: PLIST Log message: update to 1.22.2
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rob...@cvs.openbsd.org 2019/10/03 08:37:13 Modified files: x11/mate/session-manager: Makefile distinfo x11/mate/session-manager/pkg: PLIST Log message: update to 1.22.2
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rob...@cvs.openbsd.org 2019/10/03 08:37:00 Modified files: x11/mate/power-manager: Makefile distinfo x11/mate/power-manager/pkg: PLIST Log message: update to 1.22.2
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rob...@cvs.openbsd.org 2019/10/03 08:36:35 Modified files: x11/mate/menus : Makefile distinfo x11/mate/menus/pkg: PLIST Log message: update to 1.22.1
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rob...@cvs.openbsd.org 2019/10/03 08:36:48 Modified files: x11/mate/panel : Makefile distinfo x11/mate/panel/pkg: PLIST Log message: update to 1.22.2
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rob...@cvs.openbsd.org 2019/10/03 08:36:30 Modified files: x11/mate/media : Makefile distinfo x11/mate/media/pkg: PLIST Log message: update to 1.22.2
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rob...@cvs.openbsd.org 2019/10/03 08:36:42 Modified files: x11/mate/notification-daemon: Makefile distinfo x11/mate/notification-daemon/pkg: PLIST Log message: update to 1.22.1
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rob...@cvs.openbsd.org 2019/10/03 08:36:53 Modified files: x11/mate/pluma : Makefile distinfo x11/mate/pluma/pkg: PLIST Log message: update to 1.22.2
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rob...@cvs.openbsd.org 2019/10/03 08:36:19 Modified files: x11/mate/libmateweather: Makefile distinfo x11/mate/libmateweather/pkg: PLIST Log message: update to 1.22.1
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rob...@cvs.openbsd.org 2019/10/03 08:36:00 Modified files: x11/mate/caja-extensions: Makefile distinfo x11/mate/caja-extensions/pkg: PLIST Log message: update to 1.22.1
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rob...@cvs.openbsd.org 2019/10/03 08:35:49 Modified files: x11/mate/atril : Makefile distinfo x11/mate/atril/pkg: PLIST Log message: update to 1.22.2
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rob...@cvs.openbsd.org 2019/10/03 08:35:54 Modified files: x11/mate/caja : Makefile distinfo x11/mate/caja/pkg: PLIST Log message: update to 1.22.2
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rob...@cvs.openbsd.org 2019/10/03 08:36:07 Modified files: x11/mate/engrampa: Makefile distinfo x11/mate/engrampa/pkg: PLIST Log message: update to 1.22.2
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rob...@cvs.openbsd.org 2019/10/03 08:36:12 Modified files: x11/mate/eom : Makefile distinfo x11/mate/eom/pkg: PLIST Log message: update to 1.22.2
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rob...@cvs.openbsd.org 2019/10/03 08:36:25 Modified files: x11/mate/marco : Makefile distinfo Log message: update to 1.22.3
[Update] devel/p5-Error
I m testing 6.6 and porting some of my ports (like my ttyd)
I noticed that doxygen depends upon p5-Error, which does not server
0.17025 anymore on https://www.cpan.org/modules/by-module/Error/
Maybe a good time to update ?
(so far it's ok here)
Index: Makefile
===
RCS file: /cvs/ports/devel/p5-Error/Makefile,v
retrieving revision 1.20
diff -u -p -r1.20 Makefile
--- Makefile12 Jul 2019 20:44:52 - 1.20
+++ Makefile3 Oct 2019 14:05:36 -
@@ -4,7 +4,7 @@ COMMENT=error/exception handling in an
MODULES= cpan
PKG_ARCH= *
-DISTNAME = Error-0.17025
+DISTNAME = Error-0.17028
CATEGORIES=devel
# perl
Index: distinfo
===
RCS file: /cvs/ports/devel/p5-Error/distinfo,v
retrieving revision 1.13
diff -u -p -r1.13 distinfo
--- distinfo28 Apr 2018 13:53:21 - 1.13
+++ distinfo3 Oct 2019 14:05:36 -
@@ -1,2 +1,2 @@
-SHA256 (Error-0.17025.tar.gz) = bJ9HStPU/gyr/2tr5TLLHdNIJFmG1Ka2AK2SHVz9768=
-SIZE (Error-0.17025.tar.gz) = 32013
+SHA256 (Error-0.17028.tar.gz) = OthcXlizHIkDAGKYQkpRu6OfGEDjJPWuYS6ryLk16WA=
+SIZE (Error-0.17028.tar.gz) = 33234
cvs server: Diffing pkg
PS:
Most scary build ever
{{{
===> Building for p5-Error-0.17028
Building Error
===> Faking installation for p5-Error-0.17028
Building Error
}}}
math/fftw3: fix subpackaging
Currently, if you try to build the "float" flavor of math/fftw3 before
the "double" flavor, packaging will fail. The *.cmake files are in
fact not shared between the flavors; there are separate FFTW3Config and
FFTW3fConfig files. The patch below moves them from -common to the
flavored -main packages.
ok?
Index: Makefile
===
RCS file: /cvs/ports/math/fftw3/Makefile,v
retrieving revision 1.36
diff -u -p -r1.36 Makefile
--- Makefile12 Jul 2019 20:47:40 - 1.36
+++ Makefile3 Oct 2019 13:59:58 -
@@ -16,8 +16,7 @@ SHARED_LIBS= fftw3 7.1 \
fftw3f_threads 1.1
CATEGORIES=math
-REVISION-main= 0
-REVISION-common= 0
+REVISION= 1
HOMEPAGE= http://www.fftw.org/
Index: pkg/PFRAG.double-main
===
RCS file: /cvs/ports/math/fftw3/pkg/PFRAG.double-main,v
retrieving revision 1.4
diff -u -p -r1.4 PFRAG.double-main
--- pkg/PFRAG.double-main 23 Mar 2016 21:14:58 - 1.4
+++ pkg/PFRAG.double-main 3 Oct 2019 13:59:58 -
@@ -2,6 +2,8 @@
@pkgpath math/fftw3
@pkgpath math/fftw3,double
@bin bin/fftw-wisdom
+lib/cmake/fftw3/FFTW3Config.cmake
+lib/cmake/fftw3/FFTW3ConfigVersion.cmake
lib/libfftw3.a
lib/libfftw3.la
@lib lib/libfftw3.so.${LIBfftw3_VERSION}
Index: pkg/PFRAG.float-main
===
RCS file: /cvs/ports/math/fftw3/pkg/PFRAG.float-main,v
retrieving revision 1.4
diff -u -p -r1.4 PFRAG.float-main
--- pkg/PFRAG.float-main23 Mar 2016 21:14:58 - 1.4
+++ pkg/PFRAG.float-main3 Oct 2019 13:59:58 -
@@ -1,6 +1,8 @@
@comment $OpenBSD: PFRAG.float-main,v 1.4 2016/03/23 21:14:58 naddy Exp $
@pkgpath math/fftw3,float
@bin bin/fftwf-wisdom
+lib/cmake/fftw3/FFTW3fConfig.cmake
+lib/cmake/fftw3/FFTW3fConfigVersion.cmake
lib/libfftw3f.a
lib/libfftw3f.la
@lib lib/libfftw3f.so.${LIBfftw3f_VERSION}
Index: pkg/PLIST-common
===
RCS file: /cvs/ports/math/fftw3/pkg/PLIST-common,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST-common
--- pkg/PLIST-common18 Apr 2019 15:11:55 - 1.4
+++ pkg/PLIST-common3 Oct 2019 13:59:58 -
@@ -8,10 +8,8 @@ include/fftw3.h
include/fftw3l.f03
include/fftw3q.f03
@info info/fftw3.info
+lib/cmake/
+lib/cmake/fftw3/
@man man/man1/fftw-wisdom-to-conf.1
share/doc/fftw3/
share/doc/fftw3/fftw3.pdf
-lib/cmake/
-lib/cmake/fftw3/
-lib/cmake/fftw3/FFTW3Config.cmake
-lib/cmake/fftw3/FFTW3ConfigVersion.cmake
--
Christian "naddy" Weisgerber na...@mips.inka.de
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: na...@cvs.openbsd.org 2019/10/03 07:39:45 Added files: comms/gnuradio/patches: patch-gr-dtv_lib_CMakeLists_txt Log message: >From upstream: CMake will fail to properly run check_c_compiler_flag() on ARM when checking for -msse2; it will always pass, and subsequent builds will fail. Trying to compile actual code during CMake is a more reliable way to see if SSE2 is actually available.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2019/10/03 06:41:22 Modified files: databases/sqlports: Makefile databases/sqlports/files/scripts: show-reverse-deps Log message: Say pkgpath not path in show-reverse-deps usage Drop useless use of cat(1) and quote user input while here. OK espie
sqlports: show-reverse-deps: s/path/pkgpath/ in usage
There are no manual pages for these and not thinking along I passed $PWD
once; let's say "pkgpath" here as is common.
While here, drop useless use of cat(1) and quote user input.
OK?
Index: Makefile
===
RCS file: /cvs/ports/databases/sqlports/Makefile,v
retrieving revision 1.119
diff -u -p -r1.119 Makefile
--- Makefile20 Jul 2019 23:12:47 - 1.119
+++ Makefile3 Oct 2019 11:36:33 -
@@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.119 2019/07/20 23:12:47 espie Exp $
CATEGORIES = databases
-V =7.25
+V =7.26
DISTNAME = sqlports-$V
DISTFILES =
COMMENT = sqlite database of ports
Index: files/scripts/show-reverse-deps
===
RCS file: /cvs/ports/databases/sqlports/files/scripts/show-reverse-deps,v
retrieving revision 1.6
diff -u -p -r1.6 show-reverse-deps
--- files/scripts/show-reverse-deps 4 Jun 2019 16:05:52 - 1.6
+++ files/scripts/show-reverse-deps 3 Oct 2019 11:36:02 -
@@ -24,7 +24,7 @@
set -e
if [ $# -eq 0 ]
then
-echo 2>&1 "Usage: show-reverse-deps path [sqlite_db]"
+echo 2>&1 "Usage: show-reverse-deps pkgpath [sqlite_db]"
exit 1
fi
if [ $# -ge 2 ]
@@ -33,7 +33,7 @@ then
else
file=${TRUEPREFIX}/share/sqlports
fi
-cat <
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2019/10/03 04:29:32 Modified files: graphics/sxiv : Makefile distinfo graphics/sxiv/patches: patch-sxiv_1 graphics/sxiv/pkg: PLIST Added files: graphics/sxiv/patches: patch-exec_key-handler Removed files: graphics/sxiv/patches: patch-Makefile patch-icon_Makefile Log message: Update to sxiv 25 - Support font fallback for missing glyphs - Fix busy loop when built without inotify - Use background/foreground colors from X resource database Replace nonexistent realpath(1) with readlink(1) in key-handler helper and replace icon-Makefile patch with simpler DESTDIR passing while here. OK solene
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2019/10/03 04:29:00 Modified files: sysutils/raspberrypi-firmware: Makefile distinfo sysutils/raspberrypi-firmware/pkg: PLIST Log message: update to 1.20190925
Re: net/ejabberd remove or update?
On Wed, Oct 02, 2019 at 12:24:45PM +0200, Solene Rapenne wrote:
> Hi,
>
> our net/ejabberd port use v2.1.12 released in 02/2013
> https://github.com/processone/ejabberd/releases/tag/v2.1.12
>
> I think we should remove it because it's an outdated network daemon
> which, per github, received 4780 commits since our version.
> I can not find any CVE that apply for version >= 2.1.12 though.
>
> I'm not using it and there is no MAINTAINER, so I have no idea if
> running this very old version is safe or not.
>
> so I propose to remove it from ports, except/until someone wants
> to take care of updating it?
>
I starting working on it but it's become boring and I don't want to go
further. With this diff, ejabberd starts building with erlang21 and
autoconf.
Remove all patches in patches/ folder before trying to run make
Index: Makefile
===
RCS file: /data/cvs/ports/net/ejabberd/Makefile,v
retrieving revision 1.48
diff -u -p -r1.48 Makefile
--- Makefile12 Jul 2019 20:48:25 - 1.48
+++ Makefile3 Oct 2019 10:09:00 -
@@ -2,9 +2,9 @@
COMMENT= jabber server written in Erlang
-V= 2.1.12
-DISTNAME= ejabberd-$V
-REVISION= 12
+GH_ACCOUNT=processone
+GH_PROJECT=ejabberd
+GH_TAGNAME=19.09
CATEGORIES=net
@@ -15,9 +15,7 @@ PERMIT_PACKAGE= Yes
WANTLIB= crypto expat iconv ssl z
-MASTER_SITES= http://www.process-one.net/downloads/ejabberd/$V/
-EXTRACT_SUFX= .tgz
-
+MODERL_VERSION=21
MODULES= lang/erlang
LIB_DEPENDS= converters/libiconv
@@ -31,7 +29,11 @@ FAKE_FLAGS+= EJABBERDDIR=${WRKINST}/${P
ETCDIR=${WRKINST}/${PREFIX}/share/examples/ejabberd \
SPOOLDIR=${WRKINST}/${EJDBDIR}
-CONFIGURE_STYLE= gnu
+AUTOCONF_VERSION= 2.69
+AUTOMAKE_VERSION= 1.15
+AUTORECONF=./autogen.sh
+
+CONFIGURE_STYLE= autoreconf
CONFIGURE_ARGS+= --disable-pam \
--enable-mod_pubsub \
--enable-mod_irc \
@@ -52,8 +54,6 @@ JABBERDUSER=_ejabberd
JABBERDGROUP= _ejabberd
EJDBDIR= /var/db/ejabberd
EJLOGDIR= /var/log/ejabberd
-
-WRKSRC=${WRKDIST}/src
NO_TEST= Yes
Index: distinfo
===
RCS file: /data/cvs/ports/net/ejabberd/distinfo,v
retrieving revision 1.13
diff -u -p -r1.13 distinfo
--- distinfo5 May 2013 16:17:19 - 1.13
+++ distinfo3 Oct 2019 09:48:43 -
@@ -1,2 +1,2 @@
-SHA256 (ejabberd-2.1.12.tgz) = OPCCU0Z3PADIWmazNYbHXy0ZHR6w7Yrgn6FzaNbd/Rk=
-SIZE (ejabberd-2.1.12.tgz) = 1999224
+SHA256 (ejabberd-19.09.tar.gz) = 5GBV2Ix/wZQ7P+at5xn060gpwtviAIC8PZy9kJqfTes=
+SIZE (ejabberd-19.09.tar.gz) = 1845562
Then, it will fail downloading a git repository, maybe there are more, I
don't know. I don't want to work on it.
t480 /usr/ports/net/ejabberd $ make
===> ejabberd-19.09 depends on: erlang->=21v0,<22v0 -> erlang-21.2p2v0
===> ejabberd-19.09 depends on: metaauto-* -> metaauto-1.0p3
===> ejabberd-19.09 depends on: autoconf-2.69 -> autoconf-2.69p2
===> ejabberd-19.09 depends on: automake->=1.15,<1.16 -> automake-1.15.1
===> ejabberd-19.09 depends on: libtool-* -> libtool-2.4.2p0
===> ejabberd-19.09 depends on: gmake-* -> gmake-4.2.1p4
===> ejabberd-19.09 depends on: libiconv-* -> libiconv-1.16p0
===> Verifying specs: crypto expat iconv ssl z
===> found crypto.45.5 expat.12.0 iconv.7.0 ssl.47.6 z.5.0
===> Checking files for ejabberd-19.09
`/usr/ports/distfiles/ejabberd-19.09.tar.gz' is up to date.
>> (SHA256) ejabberd-19.09.tar.gz: OK
===> Extracting for ejabberd-19.09
===> Patching for ejabberd-19.09
===> Compiler link: clang -> /usr/bin/clang
===> Compiler link: clang++ -> /usr/bin/clang++
===> Compiler link: cc -> /usr/bin/cc
===> Compiler link: c++ -> /usr/bin/c++
===> Generating configure for ejabberd-19.09
Running autoreconf-2.69 in /usr/ports/pobj/ejabberd-19.09/ejabberd-19.09
===> Configuring for ejabberd-19.09
Using /usr/ports/pobj/ejabberd-19.09/config.site (generated)
configure: WARNING: unrecognized options: --enable-mod_pubsub,
--enable-mod_irc, --enable-mod_muc, --enable-eldap, --enable-web, --enable-tls,
--enable-ejabberd_zlib, --disable-silent-rules, --disable-gtk-doc
configure: loading site script /usr/ports/pobj/ejabberd-19.09/config.site
checking whether gmake sets $(MAKE)... yes
checking for a BSD-compatible install...
/usr/ports/pobj/ejabberd-19.09/bin/install -c
checking for a sed that does not truncate output... (cached) /usr/bin/sed
checking for erl... /usr/local/bin/erl21
checking for erlc... /usr/local/bin/erlc21
checking for epmd... no
checking for erl... /usr/local/bin/erl21
checking for erlc... /usr/local/bin/erlc21
checking Erlang/OTP
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2019/10/03 04:12:52 Modified files: devel/p5-Test-Command: Makefile Log message: Update my mail address
sxiv: update to 25
This update still sits in my tree; I forgot to send mail back then and
forgot about the update alltogether...
Just works as before:
- Support font fallback for missing glyphs
- Fix busy loop when built without inotify
- Use background/foreground colors from X resource database
I also replaced the Makefile patch with simpler DESTDIR='' passing in
our post-install.
The helper scripts moved from examples/ to exec/; here I noticed that
one of them uses realpath(1) which we do not have, so I patched that
to use readlink(1) instead.
Feedback? OK?
Index: Makefile
===
RCS file: /cvs/ports/graphics/sxiv/Makefile,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile
--- Makefile12 Jul 2019 20:47:10 - 1.15
+++ Makefile3 Oct 2019 10:04:20 -
@@ -4,17 +4,16 @@ COMMENT = simple X Image Viewer
GH_PROJECT = sxiv
GH_ACCOUNT = muennich
-GH_TAGNAME = v24
-REVISION = 2
+GH_TAGNAME = v25
CATEGORIES = graphics x11
-MAINTAINER = Klemens Nanni
+MAINTAINER = Klemens Nanni
# GPLv2+
PERMIT_PACKAGE = Yes
-WANTLIB += Imlib2 X11 Xft c exif gif lib/inotify/inotify
+WANTLIB += Imlib2 X11 Xft c exif fontconfig gif lib/inotify/inotify
RUN_DEPENDS = devel/desktop-file-utils \
x11/gtk+3,-guic
@@ -32,8 +31,12 @@ MAKE_FLAGS = CC="${CC}" \
NO_TEST = Yes
+# Git errors break version.h build; this makes it fall back to a hardcoded
value
+pre-build:
+ ln -sf /usr/bin/true ${WRKDIR}/bin/git
+
post-install:
- cd ${WRKSRC}/icon && make install
+ ${MAKE_PROGRAM} -C ${WRKSRC}/icon/ DESTDIR='' ${FAKE_TARGET}
${INSTALL_DATA_DIR} ${PREFIX}/share/applications
${INSTALL_DATA} ${WRKSRC}/sxiv.desktop ${PREFIX}/share/applications
Index: distinfo
===
RCS file: /cvs/ports/graphics/sxiv/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo12 Dec 2017 00:25:48 - 1.6
+++ distinfo5 May 2019 18:04:52 -
@@ -1,2 +1,2 @@
-SHA256 (sxiv-24.tar.gz) = UR3EXRKWKvnDHDBozmvKS4MqYmOUaye+/qSaSM8BkRA=
-SIZE (sxiv-24.tar.gz) = 47148
+SHA256 (sxiv-25.tar.gz) = FtGsoaF54cCHWETv4uUc+jlqRANGfDiffpIhpzOuXiY=
+SIZE (sxiv-25.tar.gz) = 48814
Index: patches/patch-Makefile
===
RCS file: patches/patch-Makefile
diff -N patches/patch-Makefile
--- patches/patch-Makefile 12 Dec 2017 00:25:48 - 1.5
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,31 +0,0 @@
-$OpenBSD: patch-Makefile,v 1.5 2017/12/12 00:25:48 jca Exp $
-Index: Makefile
Makefile.orig
-+++ Makefile
-@@ -60,19 +60,13 @@ clean:
- rm -f *.o sxiv
-
- install: all
-- @echo "INSTALL bin/sxiv"
-- mkdir -p $(DESTDIR)$(PREFIX)/bin
-- cp sxiv $(DESTDIR)$(PREFIX)/bin/
-- chmod 755 $(DESTDIR)$(PREFIX)/bin/sxiv
-- @echo "INSTALL sxiv.1"
-- mkdir -p $(DESTDIR)$(MANPREFIX)/man1
-- sed "s!PREFIX!$(PREFIX)!g; s!VERSION!$(VERSION)!g" sxiv.1 \
-- >$(DESTDIR)$(MANPREFIX)/man1/sxiv.1
-- chmod 644 $(DESTDIR)$(MANPREFIX)/man1/sxiv.1
-- @echo "INSTALL share/sxiv/"
-- mkdir -p $(DESTDIR)$(PREFIX)/share/sxiv/exec
-- cp exec/* $(DESTDIR)$(PREFIX)/share/sxiv/exec/
-- chmod 755 $(DESTDIR)$(PREFIX)/share/sxiv/exec/*
-+ ${BSD_INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/bin
-+ ${BSD_INSTALL_PROGRAM} sxiv ${DESTDIR}${PREFIX}/bin
-+ sed -i "s!PREFIX!$(PREFIX)!g; s!VERSION!$(VERSION)!g" sxiv.1
-+ ${BSD_INSTALL_MAN_DIR} ${DESTDIR}${MANPREFIX}/man1
-+ ${BSD_INSTALL_MAN} sxiv.1 ${DESTDIR}${MANPREFIX}/man1
-+ ${BSD_INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/sxiv
-+ ${BSD_INSTALL_DATA} exec/* ${DESTDIR}${PREFIX}/share/examples/sxiv
-
- uninstall:
- @echo "REMOVE bin/sxiv"
Index: patches/patch-exec_key-handler
===
RCS file: patches/patch-exec_key-handler
diff -N patches/patch-exec_key-handler
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-exec_key-handler 3 Oct 2019 10:09:14 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: exec/key-handler
+--- exec/key-handler.orig
exec/key-handler
+@@ -14,7 +14,7 @@
+
+ rotate() {
+ degree="$1"
+- tr '\n' '\0' | xargs -0 realpath | sort | uniq | while read file; do
++ tr '\n' '\0' | xargs -0 readlink -f | sort | uniq | while read file; do
+ case "$(file -b -i "$file")" in
+ image/jpeg*) jpegtran -rotate "$degree" -copy all -outfile
"$file" "$file" ;;
+ *) mogrify -rotate "$degree" "$file" ;;
Index: patches/patch-icon_Makefile
===
RCS file: patches/patch-icon_Makefile
diff -N patches/patch-icon_Makefile
--- patches/patch-icon_Makefile 6 May 2017 13:45:49 - 1.1
+++ /dev/null 1 Jan 1970
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2019/10/03 04:09:44 Modified files: x11/xfce4/xfce4-panel: Makefile distinfo Log message: Update to xfce4-panel 4.14.1
Re: Update devel/py-asn1 to 0.4.7
On 03/10/2019 06:07, Kurt Mosiejczuk wrote:
On Wed, Sep 25, 2019 at 01:40:16PM +0200, clematis wrote:
Here's the results (amd64):
/usr/ports/security/py-cryptography
test: 96549 passed, 10427 skipped
install: OK
/usr/ports/security/py-service_identity
test: OK (total of 99 passed)
install: OK
/usr/ports/security/py-paramiko
test: 137 ran, 67errors
install: OK
/usr/ports/security/letsencrypt/py-acme
test: No regression tests for py-acme-0.38.0
install: OK
/usr/ports/www/py-ndg-httpsclient
test: run=14 errors=8 failures=1 (as before)
install: OK
/usr/ports/security/py-rsa
test: OK 74 passed 1 error
install: OK
Looks good.
Comments? OK?
There's no need for the do-test definition. Tests run just fine without it.
Otherwise, OK kmos.
benoit? Any comments or objections? I'm including a new copy of the diff.
No, ok benoit@
--Kurt
Index: Makefile
===
RCS file: /cvs/ports/devel/py-asn1/Makefile,v
retrieving revision 1.32
diff -u -p -r1.32 Makefile
--- Makefile12 Jul 2019 20:45:17 - 1.32
+++ Makefile3 Oct 2019 04:07:21 -
@@ -2,12 +2,11 @@
COMMENT = ASN.1 library for Python
-MODPY_EGG_VERSION = 0.3.7
+MODPY_EGG_VERSION =0.4.7
DISTNAME =pyasn1-${MODPY_EGG_VERSION}
PKGNAME = ${DISTNAME:S/py/py-/}
CATEGORIES = devel
EPOCH = 0
-REVISION = 0
HOMEPAGE = https://github.com/etingof/pyasn1
@@ -25,8 +24,5 @@ FLAVORS = python3
FLAVOR ?=
TEST_ENV += PYTHONPATH=${WRKINST}/${MODPY_SITEPKG}
-
-do-test: fake
- @${MODPY_TEST_TARGET}
.include
Index: distinfo
===
RCS file: /cvs/ports/devel/py-asn1/distinfo,v
retrieving revision 1.18
diff -u -p -r1.18 distinfo
--- distinfo24 Oct 2017 05:53:09 - 1.18
+++ distinfo3 Oct 2019 04:07:21 -
@@ -1,2 +1,2 @@
-SHA256 (pyasn1-0.3.7.tar.gz) = GH8qZtYXaD+OgtXAADO3yKAofh2oip1XeuvsMhytSWU=
-SIZE (pyasn1-0.3.7.tar.gz) = 115350
+SHA256 (pyasn1-0.4.7.tar.gz) = qUlTVsodZu0Zeg9ytB6xgjz36otb0HGRZz6BR67PhgQ=
+SIZE (pyasn1-0.4.7.tar.gz) = 130424
Index: pkg/DESCR
===
RCS file: /cvs/ports/devel/py-asn1/pkg/DESCR,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 DESCR
--- pkg/DESCR 28 Sep 2006 17:13:32 - 1.1.1.1
+++ pkg/DESCR 3 Oct 2019 04:07:21 -
@@ -1,4 +1,4 @@
-pyasn1 is an implementation of ASN.1 types and codecs in Python
-programming language. It has been first written to support particular
-protocol (SNMP) but then generalized to be suitable for a wide range of
-protocols based on ASN.1 specification.
+pyasn1 is an implementation of ASN.1 types and DER/BER/CER codecs in
+Python programming language. It has been first written to support
+particular protocol (SNMP) but then generalized to be suitable for a
+wide range of protocols based on ASN.1 specification.
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/py-asn1/pkg/PLIST,v
retrieving revision 1.10
diff -u -p -r1.10 PLIST
--- pkg/PLIST 24 Oct 2017 05:53:09 - 1.10
+++ pkg/PLIST 3 Oct 2019 04:07:21 -
@@ -77,6 +77,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/pyasn1/type/${MODPY_PYCACHE}error.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/pyasn1/type/${MODPY_PYCACHE}namedtype.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/pyasn1/type/${MODPY_PYCACHE}namedval.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pyasn1/type/${MODPY_PYCACHE}opentype.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/pyasn1/type/${MODPY_PYCACHE}tag.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/pyasn1/type/${MODPY_PYCACHE}tagmap.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/pyasn1/type/${MODPY_PYCACHE}univ.${MODPY_PYC_MAGIC_TAG}pyc
@@ -87,6 +88,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/pyasn1/type/error.py
lib/python${MODPY_VERSION}/site-packages/pyasn1/type/namedtype.py
lib/python${MODPY_VERSION}/site-packages/pyasn1/type/namedval.py
+lib/python${MODPY_VERSION}/site-packages/pyasn1/type/opentype.py
lib/python${MODPY_VERSION}/site-packages/pyasn1/type/tag.py
lib/python${MODPY_VERSION}/site-packages/pyasn1/type/tagmap.py
lib/python${MODPY_VERSION}/site-packages/pyasn1/type/univ.py
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2019/10/03 03:32:35 Modified files: www/varnish: Makefile distinfo Removed files: www/varnish/patches: patch-lib_libvmod_unix_cred_compat_h Log message: Update to varnish 6.3.0 https://varnish-cache.org/security/VSV3-mitigation.html#vsv3-mitigation was fixed in 6.2.1 a month ago, 6.3.0 includes lots of fixes, see https://github.com/varnishcache/varnish-cache/blob/6.3/doc/changes.rst As jim@ is unresponsive and I intend to keep this port in good shape, replace his MAINTAINER line with mine. OK gonzalo
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2019/10/03 03:29:26 Modified files: devel : Makefile Log message: +py-rencode
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2019/10/03 03:25:16 Log message: Import py-rencode The rencode module is similar to bencode from the BitTorrent project. For complex, heterogeneous data structures with many small elements, r-encodings take up significantly less space than b-encodings. This version of rencode is a complete rewrite in Cython to attempt to increase the performance over the pure Python module written by Petru Paler, Connelly Barnes et al. Required dependency for an upcoming deluge update. OK sthen Status: Vendor Tag: kn Release Tags: kn_20191003 N ports/devel/py-rencode/distinfo N ports/devel/py-rencode/Makefile N ports/devel/py-rencode/pkg/DESCR N ports/devel/py-rencode/pkg/PLIST N ports/devel/py-rencode/patches/patch-setup_py No conflicts created by this import
Re: New/Replacement: Kicad 5.1.4
Hi Tracey, Tracey Emery writes: > Here's a crack at the ngspice port. Pretty close. Here are the changes I made: - used ?= for variable assignment within Makefile.inc (I think this matters when the same variable is set in both Makefile.inc and a project subdirectory's Makefile). - removed duplicate MASTER_SITES in ngspice Makefile. - moved include files to libngspice, set @conflict and bumped REVISION - set @pkgpath for ngspice since the package moved. - switched to my preferred wantlib whitespace style, namely the kind I can copy and paste from port-lib-depends-check ;) The attached should be ready for import--ok? cad/qucs-s and meta/geda both have runtime dependencies on ngspice which I'll switch to cad/ngspice/ngspice. -- Anthony J. Bentley ngspice.tar.gz Description: ngspice.tar.gz
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: fcam...@cvs.openbsd.org 2019/10/03 02:53:58 Modified files: audio/libopenmpt: Makefile distinfo Log message: Update libopenmpt to 0.4.9.
Re: update: cad/openscad
On Thu, 05 Sep 2019, Paco Esteban wrote:
> Hi ports@,
>
> This is an update for cad/openscad to the latest version that came out
> recently after some years.
As Rafael Sadowski suggested moving devel/double-conversion to
math/double-conversion, here's the updated diff for cad/openscad to
reflect that change.
Cheers,
Paco.
Index: Makefile
===
RCS file: /cvs/ports/cad/openscad/Makefile,v
retrieving revision 1.29
diff -u -p -r1.29 Makefile
--- Makefile12 Jul 2019 20:43:45 - 1.29
+++ Makefile3 Oct 2019 08:38:40 -
@@ -3,9 +3,8 @@
COMMENT = the programmer's solid 3D CAD modeller#'
BROKEN-sparc64=SIGILL on src/cgalutils.cc with CGAL-4.6.3
-V =2015.03-2
-DISTNAME = openscad-${V:S/-/./}
-REVISION = 9
+V =2019.05
+DISTNAME = openscad-${V}
CATEGORIES = cad
@@ -16,21 +15,23 @@ PERMIT_PACKAGE =Yes
WANTLIB += CGAL GL GLEW GLU ICE SM X11 Xext Xi Xinerama Xrender
WANTLIB += boost_filesystem-mt boost_program_options-mt boost_regex-mt
-WANTLIB += boost_system-mt boost_thread-mt c fontconfig freetype glib-2.0
-WANTLIB += gmp harfbuzz iconv intl m mpfr opencsg pthread qscintilla2_qt4
-WANTLIB += ${COMPILER_LIBCXX} z lib/qt4/QtGui lib/qt4/QtOpenGL
+WANTLIB += boost_system-mt boost_thread-mt c double-conversion fontconfig
+WANTLIB += freetype glib-2.0 gmp harfbuzz iconv intl m mpfr opencsg pthread
+WANTLIB += qscintilla2_qt4 ${COMPILER_LIBCXX} z lib/qt4/QtGui lib/qt4/QtOpenGL
COMPILER = base-clang ports-gcc base-gcc
MASTER_SITES = http://files.openscad.org/
-DISTFILES =openscad-${V}.src.tar.gz
+DISTFILES =${DISTNAME}.src.tar.gz
MODULES = devel/qmake \
x11/qt4
BUILD_DEPENDS =devel/bison \
+ math/double-conversion \
devel/gettext,-tools \
math/eigen3
LIB_DEPENDS = devel/boost \
+ math/double-conversion \
devel/gmp \
devel/harfbuzz \
devel/mpfr \
Index: distinfo
===
RCS file: /cvs/ports/cad/openscad/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo7 Dec 2015 07:52:32 - 1.5
+++ distinfo3 Oct 2019 08:38:40 -
@@ -1,2 +1,2 @@
-SHA256 (openscad-2015.03-2.src.tar.gz) =
olNbueJ9luEOHhkmillhVRZMcSnUEKDH+W7cLQlAAIM=
-SIZE (openscad-2015.03-2.src.tar.gz) = 13307974
+SHA256 (openscad-2019.05.src.tar.gz) =
ChbEJjzlI4CBndkcYJpxnTjxL2uMTaDoKNy+W3CZb1k=
+SIZE (openscad-2019.05.src.tar.gz) = 14604881
Index: patches/patch-boost_pri
===
RCS file: /cvs/ports/cad/openscad/patches/patch-boost_pri,v
retrieving revision 1.3
diff -u -p -r1.3 patch-boost_pri
--- patches/patch-boost_pri 7 Dec 2015 07:52:32 - 1.3
+++ patches/patch-boost_pri 3 Oct 2019 08:38:40 -
@@ -1,12 +0,0 @@
-$OpenBSD: patch-boost_pri,v 1.3 2015/12/07 07:52:32 jasper Exp $
boost.pri.orig Thu Mar 5 17:25:10 2015
-+++ boost.pri Sun Dec 6 14:04:47 2015
-@@ -71,7 +71,7 @@ boost {
-
- isEmpty(BOOST_LINK_FLAGS) {
- unix|macx {
-- BOOST_LINK_FLAGS = -lboost_thread -lboost_program_options
-lboost_filesystem -lboost_system -lboost_regex
-+ BOOST_LINK_FLAGS = -lboost_thread-mt -lboost_program_options-mt
-lboost_filesystem-mt -lboost_system-mt -lboost_regex-mt
- }
- }
-
Index: patches/patch-features_boost_prf
===
RCS file: patches/patch-features_boost_prf
diff -N patches/patch-features_boost_prf
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-features_boost_prf3 Oct 2019 08:38:40 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: features/boost.prf
+--- features/boost.prf.orig
features/boost.prf
+@@ -71,7 +71,7 @@ isEmpty(BOOST_LINK_FLAGS) {
+
+ isEmpty(BOOST_LINK_FLAGS) {
+ unix|macx {
+-BOOST_LINK_FLAGS = -lboost_thread -lboost_program_options
-lboost_filesystem -lboost_system -lboost_regex
++BOOST_LINK_FLAGS = -lboost_thread-mt -lboost_program_options-mt
-lboost_filesystem-mt -lboost_system-mt -lboost_regex-mt
+ }
+ }
+
Index: patches/patch-openscad_pro
===
RCS file: /cvs/ports/cad/openscad/patches/patch-openscad_pro,v
retrieving revision 1.1
diff -u -p -r1.1 patch-openscad_pro
--- patches/patch-openscad_pro 7 Dec 2015 07:52:32 - 1.1
+++ patches/patch-openscad_pro 3 Oct 2019 08:38:40 -
@@ -4,17 +4,18 @@ $OpenBSD: patch-openscad_pro,v 1.1 2015/
- don't use bundled Liberation fonts, use RDEP on fonts/liberation-fonts
instead
- fix manpage installation dir
openscad.pro.orig Mon Nov 16 06:13:56 2015
Re: varnish: update to 6.3.0 (DOS fix)
Yes, Jim is MIA years ago already. OK gonzalo@ > On 2. Oct 2019, at 15:00, Klemens Nanni wrote: > > https://varnish-cache.org/security/VSV3-mitigation.html#vsv3-mitigation > was fixed in 6.2.1 a month ago, 6.3.0 includes lots of fixes, see > https://github.com/varnishcache/varnish-cache/blob/6.3/doc/changes.rst > > Keeps working for me, but I'd like to get this in soon mostly because it > mitigates above linked DOS attack via crafted HTTP/1 requests which > cause the server to restart with a clean cache. > > That one patch was merged upstream (not by me); in the past Jim did not > respond to my mails and I'm interested in keeping the port in good shape > so swap his MAINAINER line for mine. > > Feedback? OK? > > > Index: Makefile > === > RCS file: /cvs/ports/www/varnish/Makefile,v > retrieving revision 1.48 > diff -u -p -r1.48 Makefile > --- Makefile12 Jul 2019 20:51:06 -1.48 > +++ Makefile2 Oct 2019 12:42:48 - > @@ -2,8 +2,7 @@ > > COMMENT =high-performance HTTP accelerator > > -DISTNAME =varnish-6.2.0 > -REVISION =0 > +DISTNAME =varnish-6.3.0 > > CATEGORIES =www > > @@ -11,7 +10,7 @@ SHARED_LIBS =varnishapi 2.0 # > > HOMEPAGE =https://www.varnish-cache.org/ > > -MAINTAINER =Jim Razmus II \ > +MAINTAINER =Klemens Nanni \ >Gonzalo L. Rodriguez > > # BSD > Index: distinfo > === > RCS file: /cvs/ports/www/varnish/distinfo,v > retrieving revision 1.22 > diff -u -p -r1.22 distinfo > --- distinfo3 May 2019 11:06:26 -1.22 > +++ distinfo2 Oct 2019 12:42:55 - > @@ -1,2 +1,2 @@ > -SHA256 (varnish-6.2.0.tgz) = w3rzU6yiWoPSL5xc4K6AD+Qz5NAuFFfgKIalhJ+YjlM= > -SIZE (varnish-6.2.0.tgz) = 3207400 > +SHA256 (varnish-6.3.0.tgz) = lczexfHcuotB0k5oWz8jefvGuXAdEGzHgBHU0JpzlH8= > +SIZE (varnish-6.3.0.tgz) = 3308117 > Index: patches/patch-lib_libvmod_unix_cred_compat_h > === > RCS file: patches/patch-lib_libvmod_unix_cred_compat_h > diff -N patches/patch-lib_libvmod_unix_cred_compat_h > --- patches/patch-lib_libvmod_unix_cred_compat_h3 May 2019 11:06:26 - >1.3 > +++ /dev/null1 Jan 1970 00:00:00 - > @@ -1,14 +0,0 @@ > -$OpenBSD: patch-lib_libvmod_unix_cred_compat_h,v 1.3 2019/05/03 11:06:26 > gonzalo Exp $ > - > -Index: lib/libvmod_unix/cred_compat.h > lib/libvmod_unix/cred_compat.h.orig > -+++ lib/libvmod_unix/cred_compat.h > -@@ -69,7 +69,7 @@ get_ids(int fd, uid_t *uid, gid_t *gid) > - > - #if defined(SO_PEERCRED) > - > --struct ucred ucred; > -+struct sockpeercred ucred; > -socklen_t l = sizeof(ucred); > - > -errno = 0; >
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2019/10/03 01:58:06 Log message: Import architecture-independent files for KiCad 5.1.4. Initially from Tracey Emery, with tweaks by sthen@ Status: Vendor Tag: bentley Release Tags: bentley_20191003 N ports/cad/kicad-share/Makefile N ports/cad/kicad-share/Makefile.inc N ports/cad/kicad-share/footprints/Makefile N ports/cad/kicad-share/footprints/distinfo N ports/cad/kicad-share/footprints/pkg/DESCR N ports/cad/kicad-share/footprints/pkg/PLIST N ports/cad/kicad-share/i18n/Makefile N ports/cad/kicad-share/i18n/distinfo N ports/cad/kicad-share/i18n/pkg/DESCR N ports/cad/kicad-share/i18n/pkg/PLIST N ports/cad/kicad-share/packages3D/Makefile N ports/cad/kicad-share/packages3D/distinfo N ports/cad/kicad-share/packages3D/pkg/DESCR N ports/cad/kicad-share/packages3D/pkg/PLIST N ports/cad/kicad-share/symbols/Makefile N ports/cad/kicad-share/symbols/distinfo N ports/cad/kicad-share/symbols/pkg/DESCR N ports/cad/kicad-share/symbols/pkg/PLIST N ports/cad/kicad-share/templates/Makefile N ports/cad/kicad-share/templates/distinfo N ports/cad/kicad-share/templates/pkg/DESCR N ports/cad/kicad-share/templates/pkg/PLIST No conflicts created by this import
[UPDATE] www/slowhttptest to 1.7
Hi ports@,
Here is a diff to update slowhttptest to 1.7 and take maintainership.
Notable changes:
- SlowHTTPTest is now hosted on GitHub
- Remove both patches, as upstream fixed those issues, see links below
https://github.com/shekyan/slowhttptest/commit/e30645b279a83278d158e0b024b74abf714e76ff
https://github.com/shekyan/slowhttptest/commit/af5dbb5aaa74ecb30cf2e650b913eb83fd048002
Comments? OK?
Index: Makefile
===
RCS file: /cvs/ports/www/slowhttptest/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- Makefile12 Jul 2019 20:51:05 - 1.12
+++ Makefile3 Oct 2019 07:45:45 -
@@ -2,26 +2,22 @@
COMMENT= test tool for slow HTTP reads/posts
-DISTNAME = slowhttptest-1.6
-REVISION = 3
+GH_ACCOUNT=shekyan
+GH_PROJECT=slowhttptest
+GH_TAGNAME=v1.7
CATEGORIES=www security
-HOMEPAGE= https://slowhttptest.googlecode.com/
+MAINTAINER=Frederic Cambus
# Apache 2.0
PERMIT_PACKAGE=Yes
-WANTLIB += c crypto m ssl ${COMPILER_LIBCXX}
+WANTLIB += c m ssl ${COMPILER_LIBCXX}
COMPILER = base-clang ports-gcc base-gcc
-MASTER_SITES= ${HOMEPAGE}files/
-
SEPARATE_BUILD=simple
CONFIGURE_STYLE= gnu
-LDFLAGS+= -lcrypto
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
-MAKE_FLAGS=LDFLAGS="${LDFLAGS}"
.include
Index: distinfo
===
RCS file: /cvs/ports/www/slowhttptest/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo1 Dec 2013 05:43:54 - 1.3
+++ distinfo3 Oct 2019 07:45:45 -
@@ -1,2 +1,2 @@
-SHA256 (slowhttptest-1.6.tar.gz) = d8VKZM+l8SqEcpgz2bmNXyf4KPUaXkKtWRRILQsr0NY=
-SIZE (slowhttptest-1.6.tar.gz) = 109829
+SHA256 (slowhttptest-1.7.tar.gz) = n9POSwp92i6WIQseQ4wMjskkoT5mmUEKyFMCJLKc+44=
+SIZE (slowhttptest-1.7.tar.gz) = 117115
Index: patches/patch-src_slowhttptest_cc
===
RCS file: patches/patch-src_slowhttptest_cc
diff -N patches/patch-src_slowhttptest_cc
--- patches/patch-src_slowhttptest_cc 8 Apr 2018 19:35:24 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,36 +0,0 @@
-$OpenBSD: patch-src_slowhttptest_cc,v 1.1 2018/04/08 19:35:24 jasper Exp $
-
-error: invalid suffix on literal; C++11 requires a space between literal and
identifier
-
-Index: src/slowhttptest.cc
src/slowhttptest.cc.orig
-+++ src/slowhttptest.cc
-@@ -560,20 +560,20 @@ void SlowHTTPTest::report_status(bool to_stats) {
- !is_dosed_ * num_connections_);
- }
- } else {
--slowlog(LOG_INFO, cLGN"\nslow HTTP test status on "cGRN"%d"cLGN"th
second:\n\n"
-- cLGN"initializing:" cLGN"%d\n"
-- cLGN"pending: " cLGN"%d\n"
-- cLGN"connected: " cLGN"%d\n"
-- cLGN"error: " cLGN"%d\n"
-- cLGN"closed: " cLGN"%d\n"
-- cLGN"service available:"cLGN" %s\n"cRST,
-+slowlog(LOG_INFO, cLGN "\nslow HTTP test status on " cGRN "%d" cLGN "th
second:\n\n"
-+ cLGN "initializing:" cLGN "%d\n"
-+ cLGN "pending: " cLGN "%d\n"
-+ cLGN "connected: " cLGN "%d\n"
-+ cLGN "error: " cLGN "%d\n"
-+ cLGN "closed: " cLGN "%d\n"
-+ cLGN "service available:" cLGN " %s\n" cRST,
- seconds_passed_,
- initializing_,
- connecting_,
- connected_,
- errored_,
- closed_,
--is_dosed_ ? cLRD"NO"cRST: cLGN"YES"cRST);
-+is_dosed_ ? cLRD "NO" cRST: cLGN "YES" cRST);
- }
- }
-
Index: patches/patch-src_slowhttptestmain_cc
===
RCS file: patches/patch-src_slowhttptestmain_cc
diff -N patches/patch-src_slowhttptestmain_cc
--- patches/patch-src_slowhttptestmain_cc 25 Apr 2018 20:13:04 -
1.2
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,29 +0,0 @@
-$OpenBSD: patch-src_slowhttptestmain_cc,v 1.2 2018/04/25 20:13:04 naddy Exp $
-
-error: invalid suffix on literal; C++11 requires a space between literal and
identifier
-
-Index: src/slowhttptestmain.cc
src/slowhttptestmain.cc.orig
-+++ src/slowhttptestmain.cc
-@@ -44,10 +44,10 @@ static void info() {
- }
- static void usage() {
- printf(
-- "\n"PACKAGE", a tool to test for slow HTTP "
-+ "\n" PACKAGE ", a tool to test for slow HTTP "
- "DoS vulnerabilities - version " VERSION "\n"
- "Usage: "
-- PACKAGE" [options ...]"
-+ PACKAGE " [options ...]"
- "\n"
- "Test modes:\n"
- " -H slow headers a.k.a. Slowloris (default)\n"
-@@ -158,7 +158,7 @@ int main(int argc, char **argv) {
- SlowTestType type = slowhttptest::eHeader;
- ProxyType proxy_type = slowhttptest::eNoProxy;
- long tmp;
-- char o;
-+ int o;
- while((o = getopt(argc, argv,
Re: update: devel/py-jedi (wip, need a bit of help)
On Fri, 27 Sep 2019, Paco Esteban wrote:
> Hi ports@,
>
> This is an update of devel/py-jedi from 0.13.2 to 0.15.1
> ...
Here's an updated version of the diff including some corrections kmos@
pointed out.
Cheers,
Paco.
Index: Makefile
===
RCS file: /cvs/ports/devel/py-jedi/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- Makefile12 Jul 2019 20:45:49 - 1.12
+++ Makefile3 Oct 2019 07:15:42 -
@@ -2,10 +2,9 @@
COMMENT = autocompletion tool for Python
-MODPY_EGG_VERSION =0.13.2
+MODPY_EGG_VERSION =0.15.1
DISTNAME = jedi-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
-REVISION = 1
CATEGORIES = devel
@@ -19,12 +18,14 @@ MODULES = lang/python
MODPY_PI = Yes
MODPY_SETUPTOOLS = Yes
MODPY_PYTEST = Yes
-MODPY_PYTEST_ARGS =jedi test
-RUN_DEPENDS = devel/py-parso${MODPY_FLAVOR}
+RUN_DEPENDS = devel/py-parso${MODPY_FLAVOR}>=0.5.0
TEST_DEPENDS = devel/py-docopt${MODPY_FLAVOR} \
devel/py-colorama${MODPY_FLAVOR}
+
+# some tests need HOME to be writable
+PORTHOME = /tmp
FLAVORS = python3
FLAVOR ?=
Index: distinfo
===
RCS file: /cvs/ports/devel/py-jedi/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo29 Dec 2018 11:45:58 - 1.6
+++ distinfo3 Oct 2019 07:15:42 -
@@ -1,2 +1,2 @@
-SHA256 (jedi-0.13.2.tar.gz) = VxcCtb0WeRH+kDblA5umf4INZQKDIoXN6MiBqyshSf0=
-SIZE (jedi-0.13.2.tar.gz) = 365792
+SHA256 (jedi-0.15.1.tar.gz) = uoWcdPo8lmoi8q7r4bdO4n4qRi9W0/X3ykpZr2G/5C4=
+SIZE (jedi-0.15.1.tar.gz) = 872898
Index: patches/patch-test_test_api_test_completion_py
===
RCS file: patches/patch-test_test_api_test_completion_py
diff -N patches/patch-test_test_api_test_completion_py
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-test_test_api_test_completion_py 3 Oct 2019 07:15:42
-
@@ -0,0 +1,34 @@
+$OpenBSD$
+
+the affected test tries to access:
+
+ /path/to/src/jedi-version/../jedi
+
+instead of
+
+ /path/to/src/jedi-version/../jedi-version
+
+This probably works because the default behaviour when cloning using git
+creates a folder named "jedi" and not "jedi-version" as we do on build.
+
+This is fixed upstream but still not released.
+
+Index: test/test_api/test_completion.py
+--- test/test_api/test_completion.py.orig
test/test_api/test_completion.py
+@@ -1,4 +1,5 @@
+-from os.path import join, sep as s
++from os.path import basename, join, sep as s
++from os import getcwd
+ import sys
+ from textwrap import dedent
+
+@@ -181,7 +182,7 @@ se = s * 2 if s == '\\' else s
+ ('test%sexample.py' % se, 'r"test%scomp"' % s, 5, ['t' + s]),
+ ('test%sexample.py' % se, 'r"test%scomp"' % s, 11, ['letion' + s]),
+ ('test%sexample.py' % se, '"%s"' % join('test', 'completion',
'basi'), 21, ['c.py']),
+-('example.py', 'rb"' + join('..', 'jedi', 'tes'), None, ['t' + s]),
++('example.py', 'rb"' + join('..', basename(getcwd()), 'tes'), None,
['t' + s]),
+
+ # Absolute paths
+ (None, '"' + join(root_dir, 'test', 'test_ca'), None, ['che.py"']),
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/py-jedi/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- pkg/PLIST 15 Jul 2018 23:04:32 - 1.4
+++ pkg/PLIST 3 Oct 2019 07:15:42 -
@@ -14,6 +14,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/jedi/${MODPY_PYCACHE}_compatibility.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/jedi/${MODPY_PYCACHE}cache.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/jedi/${MODPY_PYCACHE}debug.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jedi/${MODPY_PYCACHE}file_io.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/jedi/${MODPY_PYCACHE}parser_utils.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/jedi/${MODPY_PYCACHE}refactoring.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/jedi/${MODPY_PYCACHE}settings.${MODPY_PYC_MAGIC_TAG}pyc
@@ -27,6 +28,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/jedi/api/${MODPY_PYCACHE}completion.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/jedi/api/${MODPY_PYCACHE}environment.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/jedi/api/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jedi/api/${MODPY_PYCACHE}file_name.${MODPY_PYC_MAGIC_TAG}pyc
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: giova...@cvs.openbsd.org2019/10/03 00:22:29 Modified files: mail/opensmtpd-filters: Makefile Log message: +spamassassin
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: giova...@cvs.openbsd.org2019/10/03 00:18:33 Log message: opensmtpd-filter-spamassassin is a smtpd(1) filter to integrate with Apache SpamAssassin. upstream code, help and ok jung@ pkg/DESCR: filter-spamassassin is an opensmtpd filter that passes mail through Apache SpamAssassin to flag or reject spam messages at session time. Status: Vendor Tag: giovanni Release Tags: giovanni_20191003 U ports/mail/opensmtpd-filters/spamassassin/Makefile U ports/mail/opensmtpd-filters/spamassassin/distinfo U ports/mail/opensmtpd-filters/spamassassin/pkg/DESCR U ports/mail/opensmtpd-filters/spamassassin/pkg/PLIST U ports/mail/opensmtpd-filters/spamassassin/pkg/README No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: giova...@cvs.openbsd.org2019/10/03 00:14:15 Log message: import opensmtpd-filter-spamassassin, an smtpd(1) filter for Apache SpamAssassin help, upstream code and ok jung@ pkg/DESCR: filter-spamassassin is an opensmtpd filter that passes mail through Apache SpamAssassin to flag or reject spam messages at session time. Status: Vendor Tag: giovanni Release Tags: giovanni_20191003 N ports/mail/opensmtpd-filters/spamassassin/Makefile N ports/mail/opensmtpd-filters/spamassassin/distinfo N ports/mail/opensmtpd-filters/spamassassin/pkg/DESCR N ports/mail/opensmtpd-filters/spamassassin/pkg/PLIST N ports/mail/opensmtpd-filters/spamassassin/pkg/README No conflicts created by this import
