patch: www/mozilla-firefox www/firefox-esr for lang/rust 1.29.0
Hi,
Here are patches for mozilla-firefox and firefox-esr to copte with
rustc-1.29.0.
`rustc --print target-list' in 1.29.0 outputs triplets with only 2
compoments (like `x86_64-fuchsia') and mozilla's configure scripts
doesn't expect it.
landry@ pointed to me the right commit to backport. It addresses
https://bugzilla.mozilla.org/show_bug.cgi?id=1479540 .
I built successfully mozilla-firefox with rust 1.29.0. For firefox-esr,
I only checked the configure step works with the patch.
Thanks.
--
Sebastien Marie
Index: mozilla-firefox/Makefile
===
RCS file: /cvs/ports/www/mozilla-firefox/Makefile,v
retrieving revision 1.359
diff -u -p -r1.359 Makefile
--- mozilla-firefox/Makefile5 Sep 2018 16:19:01 - 1.359
+++ mozilla-firefox/Makefile16 Sep 2018 05:06:24 -
@@ -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 = 79.0
Index: mozilla-firefox/patches/patch-build_moz_configure_init_configure
===
RCS file: mozilla-firefox/patches/patch-build_moz_configure_init_configure
diff -N mozilla-firefox/patches/patch-build_moz_configure_init_configure
--- /dev/null 1 Jan 1970 00:00:00 -
+++ mozilla-firefox/patches/patch-build_moz_configure_init_configure16 Sep
2018 05:06:24 -
@@ -0,0 +1,21 @@
+$OpenBSD$
+backport of https://hg.mozilla.org/mozilla-central/rev/36f4ba2fb6f5
+to address https://bugzilla.mozilla.org/show_bug.cgi?id=1479540
+Index: build/moz.configure/init.configure
+--- build/moz.configure/init.configure.orig
build/moz.configure/init.configure
+@@ -591,7 +591,13 @@ def split_triplet(triplet, allow_unknown=False):
+ # There is also a quartet form:
+ # CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
+ # But we can consider the "KERNEL-OPERATING_SYSTEM" as one.
+-cpu, manufacturer, os = triplet.split('-', 2)
++parts = triplet.split('-', 2)
++if len(parts) == 3:
++cpu, _, os = parts
++elif len(parts) == 2:
++cpu, os = parts
++else:
++die("Unexpected triplet string: %s" % triplet)
+
+ # Autoconf uses config.sub to validate and canonicalize those triplets,
+ # but the granularity of its results has never been satisfying to our
Index: firefox-esr/Makefile
===
RCS file: /cvs/ports/www/firefox-esr/Makefile,v
retrieving revision 1.80
diff -u -p -r1.80 Makefile
--- firefox-esr/Makefile5 Sep 2018 16:20:26 - 1.80
+++ firefox-esr/Makefile16 Sep 2018 05:06:24 -
@@ -8,6 +8,8 @@ MOZILLA_BRANCH =release
MOZILLA_PROJECT = firefox
MOZILLA_CODENAME = browser
+REVISION = 0
+
WRKDIST = ${WRKDIR}/${MOZILLA_DIST}-${MOZILLA_DIST_VERSION:C/esr//}
HOMEPAGE = https://www.mozilla.org/firefox/organizations/
PKGNAME = ${MOZILLA_PROJECT}-esr-${MOZILLA_VERSION:S/esr//}
Index: firefox-esr/patches/patch-build_moz_configure_init_configure
===
RCS file: firefox-esr/patches/patch-build_moz_configure_init_configure
diff -N firefox-esr/patches/patch-build_moz_configure_init_configure
--- /dev/null 1 Jan 1970 00:00:00 -
+++ firefox-esr/patches/patch-build_moz_configure_init_configure16 Sep
2018 05:06:24 -
@@ -0,0 +1,21 @@
+$OpenBSD$
+backport of https://hg.mozilla.org/mozilla-central/rev/36f4ba2fb6f5
+to address https://bugzilla.mozilla.org/show_bug.cgi?id=1479540
+Index: build/moz.configure/init.configure
+--- build/moz.configure/init.configure.orig
build/moz.configure/init.configure
+@@ -591,7 +591,13 @@ def split_triplet(triplet, allow_unknown=False):
+ # There is also a quartet form:
+ # CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
+ # But we can consider the "KERNEL-OPERATING_SYSTEM" as one.
+-cpu, manufacturer, os = triplet.split('-', 2)
++parts = triplet.split('-', 2)
++if len(parts) == 3:
++cpu, _, os = parts
++elif len(parts) == 2:
++cpu, os = parts
++else:
++die("Unexpected triplet string: %s" % triplet)
+
+ # Autoconf uses config.sub to validate and canonicalize those triplets,
+ # but the granularity of its results has never been satisfying to our
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs
Module name:ports
Changes by: b...@cvs.openbsd.org2018/09/15 22:55:44
Modified files:
devel/git-cola : Makefile
devel/git-cola/pkg: PLIST
Log message:
Let git-cola use qtpy from ports instead of bundled version.
Per kn@'s advice add ${MODPY_FLAVOR} to deps having py flavors. Take
MAINTAINER.
OK kn@
lang/erlang versions 20 and 21
Hey,
This diff adds erlang major versions 20 and 21. Tested by building
elixir and running the test suite.
Given that erlang 16 is no longer supported, it may be a good idea
to remove that, however I haven't included that change in my diff.
The 20 and 21 dirs are included in the tarball.
Please CC me, since I'm not subscribed to ports@
Index: Makefile
===
RCS file: /cvs/ports/lang/erlang/Makefile,v
retrieving revision 1.67
diff -u -p -r1.67 Makefile
--- Makefile30 Jun 2016 07:19:23 - 1.67
+++ Makefile15 Sep 2018 23:35:00 -
@@ -5,5 +5,7 @@
SUBDIR += 17
SUBDIR += 18
SUBDIR += 19
+SUBDIR += 20
+SUBDIR += 21
.include
Index: erlang.port.mk
===
RCS file: /cvs/ports/lang/erlang/erlang.port.mk,v
retrieving revision 1.23
diff -u -p -r1.23 erlang.port.mk
--- erlang.port.mk 30 Jun 2016 07:19:23 - 1.23
+++ erlang.port.mk 15 Sep 2018 23:35:00 -
@@ -13,9 +13,9 @@ MODERL_DEFAULT_VERSION =16
# If the port already has flavors, append ours to it unless the port requires
# a specific version of Erlang.
.if !defined(MODERL_VERSION) && !defined(FLAVORS)
-FLAVORS ?= erlang17 erlang18 erlang19
+FLAVORS ?= erlang17 erlang18 erlang19 erlang20 erlang21
.else
-FLAVORS += erlang17 erlang18 erlang19
+FLAVORS += erlang17 erlang18 erlang19 erlang20 erlang21
.endif
FLAVOR?= # empty
@@ -30,6 +30,12 @@ _MODERL_FLAVOR = ${FLAVOR}
.elif ${FLAVOR:Merlang19}
MODERL_VERSION = 19
_MODERL_FLAVOR = ${FLAVOR}
+.elif ${FLAVOR:Merlang20}
+MODERL_VERSION = 20
+_MODERL_FLAVOR = ${FLAVOR}
+.elif ${FLAVOR:Merlang21}
+MODERL_VERSION = 21
+_MODERL_FLAVOR = ${FLAVOR}
.else
MODERL_VERSION ?= ${MODERL_DEFAULT_VERSION}
_MODERL_FLAVOR ?= # empty
@@ -43,6 +49,10 @@ _MODERL_FLAVOR = erlang17
_MODERL_FLAVOR = erlang18
.elif ${MODERL_VERSION} == 19
_MODERL_FLAVOR = erlang19
+.elif ${MODERL_VERSION} == 20
+_MODERL_FLAVOR = erlang20
+.elif ${MODERL_VERSION} == 21
+_MODERL_FLAVOR = erlang21
.else
ERRORS += "Invalid MODERL_VERSION set: ${MODERL_VERSION}."
.endif
erlang2021.tar.gz
Description: Binary data
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: na...@cvs.openbsd.org 2018/09/15 17:12:23 Modified files: devel/mygui: Makefile Added files: devel/mygui/patches: patch-MyGUIEngine_include_MyGUI_Prerequest_h Log message: For modern compilers, don't redefine nullptr to 0. It causes havoc deep in the C++ standard library header files. Patch taken from an intermediate upstream version.
Re: UPDATE mail/s-nail
Landry Breuil wrote in <20180915075116.gj46...@twilight.rhaalovely.net>: |On Fri, Sep 14, 2018 at 10:26:06PM +0100, Stuart Henderson wrote: |> I think it might be a good idea if Steffen takes over as MAINTAINER \ |> for this port .. | |In the meantime ive pushed the update - but sure :) --End of <20180915075116.gj46...@twilight.rhaalovely.net> Thank you very much, Stuart and Landry! Will update accordingly next time. Ciao, and a nice Sunday everybody, --steffen | |Der Kragenbaer,The moon bear, |der holt sich munter he cheerfully and one by one |einen nach dem anderen runter wa.ks himself off |(By Robert Gernhardt)
Re: UPDATE devel/git-cola
On Sat, Sep 15, 2018 at 10:12:39PM +0200, Björn Ketelaars wrote:
> Discussed with kn@ off list:
>
> New diff adding ${MODPY_FLAVOR} to deps having py flavors.
OK kn
UPDATE: games/mirrormagic 2.0.2 => 3.0.0
Hi ports --
Attached is an update to games/mirrormagic. Lots of churn in this
one--there's a move from SDL to SDL2 and there are now 2 sets of assets.
When you first launch the game, it says it's Rocks n Diamonds. But it's
not. Upstream just made a mistake here.
No MAINTAINER, just doing my part to take things off the portroach queue.
OK?
~Brian
Index: Makefile
===
RCS file: /cvs/ports/games/mirrormagic/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- Makefile 23 Oct 2017 17:10:49 - 1.10
+++ Makefile 15 Sep 2018 20:49:35 -
@@ -1,31 +1,40 @@
# $OpenBSD: Makefile,v 1.10 2017/10/23 17:10:49 sthen Exp $
COMMENT= game like Deflektor (C64) / Mindbender (Amiga)
-DISTNAME= mirrormagic-2.0.2
-REVISION = 3
+DISTNAME= mirrormagic-3.0.0
CATEGORIES= games x11
-MASTER_SITES= http://www.artsoft.org/RELEASES/unix/mirrormagic/
-HOMEPAGE= http://www.artsoft.org/mirrormagic/
+HOMEPAGE= https://www.artsoft.org/mirrormagic/
-# GPL
+# GPLv2 only
PERMIT_PACKAGE_CDROM= Yes
-WANTLIB= SDL X11 Xext c m pthread usbhid xcb \
- SDL_mixer SDL_image
-LIB_DEPENDS= devel/sdl-mixer \
- devel/sdl-image
+WANTLIB += SDL2 SDL2_image SDL2_mixer SDL2_net c m
+
+MASTER_SITES= https://www.artsoft.org/RELEASES/unix/mirrormagic/
+
+LIB_DEPENDS= devel/sdl2-image \
+ devel/sdl2-mixer \
+ devel/sdl2-net
NO_TEST= Yes
USE_GMAKE= Yes
-ALL_TARGET= sdl
+ALL_TARGET= sdl2
+MAKE_FLAGS= OPTIONS="${CFLAGS}"
+
+# Upstream left from .orig files behind.
+post-extract:
+ @rm -f ${WRKSRC}/levels/Classic_Games/classic_mindbender/*.orig
-N=mirrormagic
+# Upstream named the binary incorrectly.
do-install:
${INSTALL_DATA_DIR} ${PREFIX}/bin
- ${INSTALL_PROGRAM} ${WRKSRC}/${N} ${PREFIX}/bin
- ${INSTALL_DATA_DIR} ${PREFIX}/share/${N}
- @cp -R ${WRKSRC}/{graphics,levels,music,sounds} ${PREFIX}/share/${N}
- @chmod a+r ${PREFIX}/share/$N/music/mod.*
+ ${INSTALL_PROGRAM} ${WRKSRC}/rocksndiamonds \
+ ${PREFIX}/bin/mirrormagic
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/mirrormagic
+ @cp -R ${WRKSRC}/{graphics,levels,music,sounds} \
+ ${PREFIX}/share/mirrormagic
+ @chmod a+r \
+ ${PREFIX}/share/mirrormagic/music/mus_{classic,mirrormagic}/mod.*
.include
Index: distinfo
===
RCS file: /cvs/ports/games/mirrormagic/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo 18 Jan 2015 03:14:00 - 1.3
+++ distinfo 15 Sep 2018 20:49:35 -
@@ -1,2 +1,2 @@
-SHA256 (mirrormagic-2.0.2.tar.gz) = ebPxPUk1I0OO65iL7/wnLIBLx6Q2G4MWeggsd+dLPOI=
-SIZE (mirrormagic-2.0.2.tar.gz) = 1168098
+SHA256 (mirrormagic-3.0.0.tar.gz) = x5rRnUYcCAAR4S9bnmsdPeS4Ml5FLvS7bopjpizp/+w=
+SIZE (mirrormagic-3.0.0.tar.gz) = 4052452
Index: patches/patch-Makefile
===
RCS file: /cvs/ports/games/mirrormagic/patches/patch-Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 patch-Makefile
--- patches/patch-Makefile 23 May 2010 01:05:38 - 1.2
+++ patches/patch-Makefile 15 Sep 2018 20:49:35 -
@@ -1,36 +1,34 @@
$OpenBSD: patch-Makefile,v 1.2 2010/05/23 01:05:38 espie Exp $
Makefile.orig Tue Mar 19 02:59:43 2002
-+++ Makefile Sat May 22 16:33:12 2010
-@@ -8,19 +8,19 @@
- #-#
+Index: Makefile
+--- Makefile.orig
Makefile
+@@ -15,25 +15,25 @@
- # specify your favorite ANSI C compiler
+ # command name of your favorite ANSI C compiler
+ # (this must be set to "cc" for some systems)
-CC = gcc
+#CC = gcc
- # specify path to X11 on your system
- # if undefined, use system defaults (works with Linux/gcc/libc5)
--X11_PATH = /usr/X11
-+X11_PATH = ${X11BASE}
+ # command name of GNU make on your system
+ # (this must be set to "gmake" for some systems)
+-MAKE = make
++#MAKE = make
- # specify directory for read-only game data (like graphics, sounds, levels)
- # default is '.', so you can play without installing game data somewhere
--# RO_GAME_DIR = /usr/games
+ # directory for read-only game data (like graphics, sounds, levels)
+ # (this directory is usually the game's installation directory)
+ # default is '.' to be able to run program without installation
+ # RO_GAME_DIR = .
+ # use the following setting for Debian / Ubuntu installations:
+-# RO_GAME_DIR = /usr/share/games/rocksndiamonds
+RO_GAME_DIR = ${PREFIX}/share/mirrormagic
- # specify directory for writable game data (like highscore files)
- # default is '.', so you can play without installing game data somewhere
--# RW_GAME_DIR = /var/games
+ # directory for writable game data (like highscore files)
+ # (if no "scores" directory exists, scores are saved in user data directory)
+ # default is '.' to be able to run program without installation
+ # RW_GAME_DIR = .
+ # use the following setting for Debian / Ubuntu installations:
+-# RW_GAME_DIR = /var/games/rocksndiamonds
+RW_GAME_DIR =
Re: UPDATE devel/git-cola
On Sat 15/09/2018 18:28, Klemens Nanni wrote:
> On Sat, Sep 15, 2018 at 05:15:45PM +0200, Björn Ketelaars wrote:
> > Instead of using the bundled qtpy use the version in ports. No issues
> > found on amd64.
> Sounds good. What about this from upstream README:
>
> Set QT_API=pyqt4 in your environment if you have both versions
> of PyQt installed and want to ensure that PyQt4 is used.
>
> Dependencies are lacking ${MODPY_FLAVOR}.
>
> git-cola runs fine with your diff but I still see this:
>
> /usr/local/lib/python2.7/site-packages/qtpy/__init__.py:211:
> RuntimeWarning: Selected binding "pyqt5" could not be found, using "pyqt"
> 'using "{}"'.format(initial_api, API), RuntimeWarning)
>
>
> As a side note, git-cola does not seem to work with Python 3 on our site:
>
> $ git-cola
> Traceback (most recent call last):
> File "/usr/local/lib/python3.6/site-packages/qtpy/__init__.py", line
> 199, in
> from PySide import __version__ as PYSIDE_VERSION # analysis:ignore
> ModuleNotFoundError: No module named 'PySide'
>
> During handling of the above exception, another exception occurred:
>
> Traceback (most recent call last):
> File "/usr/local/bin/git-cola", line 53, in
> from cola.main import main
> File "/usr/local/share/git-cola/lib/cola/main.py", line 6, in
> from . import app
> File "/usr/local/share/git-cola/lib/cola/app.py", line 15, in
> from qtpy import QtCore
> File "/usr/local/lib/python3.6/site-packages/qtpy/__init__.py", line
> 205, in
> raise PythonQtError('No Qt bindings could be found')
> qtpy.PythonQtError: No Qt bindings could be found
Discussed with kn@ off list:
New diff adding ${MODPY_FLAVOR} to deps having py flavors.
Tested a build with both py-qt4 and py-qt5 installed:
- Starting git-cola results in py-qt5 being used
- removing py-qt5, and starting git-cola again results in py-qt4 being
used
Above is expected behaviour. Please note that one can force use of
py-qt4 by setting QT_API=pyqt4 in the environment.
OK?
Index: Makefile
===
RCS file: /cvs/ports/devel/git-cola/Makefile,v
retrieving revision 1.24
diff -u -p -r1.24 Makefile
--- Makefile8 Sep 2018 03:55:10 - 1.24
+++ Makefile15 Sep 2018 20:01:13 -
@@ -4,6 +4,7 @@ COMMENT = python powered git gui
MODPY_EGG_VERSION= 3.2
DISTNAME = ${GH_PROJECT}-${MODPY_EGG_VERSION}
+REVISION = 0
GH_ACCOUNT = git-cola
GH_PROJECT = git-cola
@@ -13,6 +14,8 @@ CATEGORIES = devel x11
HOMEPAGE = https://git-cola.github.io/
+MAINTAINER = Bjorn Ketelaars
+
# GPLv2 only
PERMIT_PACKAGE_CDROM= Yes
@@ -21,17 +24,21 @@ MODULES = lang/python
BUILD_DEPENDS =devel/gettext-tools \
devel/git \
textproc/xxdiff \
- x11/py-qt4
+ x11/py-qt4 \
+ x11/py-qtpy${MODPY_FLAVOR}
RUN_DEPENDS = devel/desktop-file-utils \
devel/git \
textproc/xxdiff \
- x11/py-qt4
+ x11/py-qt4 \
+ x11/py-qtpy${MODPY_FLAVOR}
-TEST_DEPENDS = devel/py-mock \
- devel/py-test
+TEST_DEPENDS = devel/py-mock${MODPY_FLAVOR} \
+ devel/py-test${MODPY_FLAVOR}
USE_GMAKE =Yes
+
+MAKE_ENV = GIT_COLA_NO_VENDOR_LIBS=1
MODPY_ADJ_FILES= share/git-cola/bin/git-xbase
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/git-cola/pkg/PLIST,v
retrieving revision 1.13
diff -u -p -r1.13 PLIST
--- pkg/PLIST 8 Sep 2018 03:55:10 - 1.13
+++ pkg/PLIST 15 Sep 2018 20:01:13 -
@@ -297,50 +297,6 @@ share/git-cola/lib/cola/widgets/toolbar.
share/git-cola/lib/cola/widgets/toolbar.pyc
share/git-cola/lib/cola/widgets/toolbarcmds.py
share/git-cola/lib/cola/widgets/toolbarcmds.pyc
-share/git-cola/lib/qtpy/
-share/git-cola/lib/qtpy/QtCore.py
-share/git-cola/lib/qtpy/QtCore.pyc
-share/git-cola/lib/qtpy/QtDesigner.py
-share/git-cola/lib/qtpy/QtDesigner.pyc
-share/git-cola/lib/qtpy/QtGui.py
-share/git-cola/lib/qtpy/QtGui.pyc
-share/git-cola/lib/qtpy/QtHelp.py
-share/git-cola/lib/qtpy/QtHelp.pyc
-share/git-cola/lib/qtpy/QtMultimedia.py
-share/git-cola/lib/qtpy/QtMultimedia.pyc
-share/git-cola/lib/qtpy/QtNetwork.py
-share/git-cola/lib/qtpy/QtNetwork.pyc
-share/git-cola/lib/qtpy/QtOpenGL.py
-share/git-cola/lib/qtpy/QtOpenGL.pyc
-share/git-cola/lib/qtpy/QtPrintSupport.py
-share/git-cola/lib/qtpy/QtPrintSupport.pyc
-share/git-cola/lib/qtpy/QtSql.py
-share/git-cola/lib/qtpy/QtSql.pyc
-share/git-cola/lib/qtpy/QtSvg.py
-share/git-cola/lib/qtpy/QtSvg.pyc
-share/git-cola/lib/qtpy/QtTest.py
-share/git-cola/lib/qtpy/QtTest.pyc
-share/git-cola/lib/qtpy/QtWebEngineWidgets.py
-share/git-cola/lib/qtpy/QtWebEngineWidgets.pyc
-share/git-cola/lib/qtpy/QtWidgets.py
Re: [UPDATE] games/bzflag 2.4.12 -> 2.4.14
On 09/15/18 01:22, Charlene Wendling wrote: Hi ports! Here is an update for BZFlag, a multiplayer tank game. The changelog is there [1], the most notable change being that antialiasing works when starting the client windowed. What's new in the port: - port-lib-depends-check wasn't happy with our WANTLIB, so it has been modified. Testing (amd64): I've played for about an hour without any issue*, including audio. Any comment/feedback is welcome! Committed, thanks. Since I was already there, I tweaked the license marker (LGPLv2.1 only or MPL 2.0) and updated the COMPILER comment (C++11). ~Brian Charlène. [1] https://github.com/BZFlag-Dev/bzflag/releases/tag/v2.4.14 * Other than motion sickness ;)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bcal...@cvs.openbsd.org 2018/09/15 13:26:50 Modified files: games/bzflag : Makefile distinfo Log message: Update bzflag to 2.4.14 >From Charlene Wendling While here, update license marker and COMPILER comment.
Re: [NEW] devel/wabt
On 09/03/18 15:54, Brian Callahan wrote: On 09/03/18 15:30, Fabian Raetz wrote: On Fri, Aug 31, 2018 at 05:38:53PM -0400, Brian Callahan wrote: On 08/31/18 12:25, Fabian Raetz wrote: On Fri, Aug 31, 2018 at 02:40:26PM +0200, Raphael Graf wrote: Hi Fabian On 08/31/18 02:00, Fabian Raetz wrote: On Thu, Aug 30, 2018 at 06:49:34PM -0400, Brian Callahan wrote: On 08/30/18 18:35, Brian Callahan wrote: Hi Fabian -- On 08/30/18 17:28, Fabian Raetz wrote: On Thu, Aug 30, 2018 at 05:12:35PM -0400, Brian Callahan wrote: Hi Fabian -- On 08/30/18 16:42, Fabian Raetz wrote: Hi all. i've been using the "WebAssembly Binary Toolkit" lately and thought i create a proper port for it. The port doesn't support running the tests as they require some git submodules including the gtest source. Sadly, my cmake skills are not good enough to make the build system use gtest from ports so i decided against it for the moment. In case you wanna compile a small WebAssembly programm yourself, take a look at https://jameshfisher.com/2017/10/13/webassembly-hello-world.html Cheers, Fabian HOMEPAGE: https://github.com/WebAssembly/wabt DESCR: WABT (we pronounce it "wabbit") is a suite of tools for WebAssembly, including: wat2wasm: translate from WebAssembly text format to the WebAssembly binary format wasm2wat: the inverse of wat2wasm, translate from the binary format back to the text format (also known as a .wat) wasm-objdump: print information about a wasm binary. Similiar to objdump. wasm-interp: decode and run a WebAssembly binary file using a stack-based interpreter wat-desugar: parse .wat text form as supported by the spec interpreter (s-expressions, flat syntax, or mixed) and print "canonical" flat format wasm2c: convert a WebAssembly binary file to a C source and header Is this different from the wabt port I ok'd here? https://marc.info/?l=openbsd-ports=152950481400669=2 There are some subtle differences. The port I sent is in the category "devel" instead of "lang". Also, I packaged version 1.0.5 where the local patch is already included. DESCR is also slightly different with regards to formating. Otherwise both port are equal :) I changed the DESCR formatting to be different than both of them: --- WABT (we pronounce it "wabbit") is a suite of tools for WebAssembly, including: wat2wasm: translate from WebAssembly text format to the WebAssembly binary format wasm2wat: the inverse of wat2wasm, translate from the binary format back to the text format (also known as a .wat) wasm-objdump: print information about a wasm binary. Similiar to objdump. wasm-interp: decode and run a WebAssembly binary file using a stack-based interpreter wat-desugar: parse .wat text form as supported by the spec interpreter (s-expressions, flat syntax, or mixed) and print "canonical" flat format wasm2c: convert a WebAssembly binary file to a C source and header --- Thanks for your review :) I attached a new tar which integrates your feedback. Some comments inline ... It reads better for my eyes but I guess these things eventually become a matter of opinion. On the more necessary side of things: * the build picks up a -Werror that has to go I patched the CMakeLists.txt. Is there a better way to this? * CMake will pick up re2c if you have it installed so either set -DRUN_RE2C=OFF in CONFIGURE_ARGS or add a BDEP on re2c. Added the BDEP because the option is on by default. re2c is only needed when you make changes to the lexer, I would prefer not to make this a build dependency. Hi. Yes, you're right. Attached is a new tarball which uses the included lexer by adding -DRUN_RE2C=OFF and removed the BUILD_DEPENDS. A few more things, then I think it's ok for import. * Bonus newline at the end of pkg/DESCR * Usually I see COMPILER=base-clang ports-gcc but I don't know how much that matters nowadays * Judging by the CMakeLists.txt, python is only used running the tests, since we are using the prebuilt stuff. So maybe better is to remove the find_package for Python from CMakeLists.txt and then we can get rid of the python MODULE. Hi. I've incorporated your feedback and attached a new tar. Thank you. This version is ok for me. General ping that I have yet to receive an ok for this. ~Brian ~Brian Thanks, Fabian ~Brian Thanks, Fabian * It's C++11, so needs a COMPILER line. Done. * It looks for, and finds, python. Do we need to add MODULES=lang/python? There's no MAINTAINER. Either of you want to do it? I would take it and added myself as MAINTAINER if that's ok for Raphael sure.. And now that I think about it, I think I like this living in lang/. devel/ is overloaded, and we can at least justify this one living somewhere else. Done. ~Brian ~Brian I'm still waiting for an OK to import that one. ~Brian
Re: UPDATE: games/ezquake 3.1
On 09/12/18 16:13, Tom Murphy wrote:
Hi,
games/ezquake now has a source tarball in /releases/ on github
so it no longer needs GH_TAG. Pasted below is the diff. I've bumped
the REVISION up to 1, but nothing has changed in the release itself,
just the structure of the tarball. (I had to set WRKDIST to WRKDIR
since the source tarball has no subdirectory for the source code now.)
Committed, with some variable rearranging to put everything in its usual
place.
~Brian
Thanks,
Tom
Index: Makefile
===
RCS file: /cvs/ports/games/ezquake/Makefile,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 Makefile
--- Makefile4 Sep 2018 12:53:16 - 1.3
+++ Makefile12 Sep 2018 20:10:17 -
@@ -1,12 +1,12 @@
# $OpenBSD: Makefile,v 1.3 2018/09/04 12:53:16 espie Exp $
+V = 3.1
COMMENT = modern QuakeWorld client
-DISTNAME = ezquake-${GH_TAGNAME}
+DISTNAME = ezquake-source-${V}
+PKGNAME = ezquake-${V}
-GH_ACCOUNT = ezQuake
-GH_PROJECT = ezquake-source
-GH_TAGNAME = 3.1
-REVISION = 0
+MASTER_SITES =
https://github.com/ezQuake/ezquake-source/releases/download/${V}/
+REVISION = 1
CATEGORIES = games
@@ -29,6 +29,7 @@ LIB_DEPENDS = audio/speex \
USE_GMAKE = Yes
MAKE_ENV =V=1
+WRKDIST = ${WRKDIR}
NO_TEST = Yes
Index: distinfo
===
RCS file: /cvs/ports/games/ezquake/distinfo,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 distinfo
--- distinfo3 Sep 2018 19:51:52 - 1.2
+++ distinfo12 Sep 2018 20:10:17 -
@@ -1,2 +1,2 @@
-SHA256 (ezquake-3.1.tar.gz) = WKAllPDUpjLDvjCKuxiwXN7YWiPijmsqX8P0nNTc0k4=
-SIZE (ezquake-3.1.tar.gz) = 3738048
+SHA256 (ezquake-source-3.1.tar.gz) =
NGW6FyAXOzBOoppVfO6KFl9tUe7GgNoMqsnST4iqko4=
+SIZE (ezquake-source-3.1.tar.gz) = 3613947
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bcal...@cvs.openbsd.org 2018/09/15 12:54:54 Modified files: games/ezquake : Makefile distinfo Log message: Upstream rolled their own tarball; use that instead of the GitHub autogen'd stuff. >From MAINTAINER
Re: pgsql readme: update auth method
Perfect. Thanks. You don't know how many times I've had to re-do after grabbing that first line without UTF-8. Happier, Chris Bennett
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bcal...@cvs.openbsd.org 2018/09/15 12:03:49 Modified files: lang : Makefile Log message: +gpc
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bcal...@cvs.openbsd.org 2018/09/15 12:03:31 Log message: Import lang/gpc, the GNU Pascal Compiler. ok daniel@ GNU Pascal (GPC) is a Pascal compiler built on top of GCC. GNU Pascal is ISO 7185 compatible, and implements most of the ISO 10206 Extended Pascal standard. GPC also supports Borland Pascal 7.0 and parts of Borland Delphi, Mac Pascal, and Pascal-SC (PXSC). Status: Vendor Tag: bcallah Release Tags: bcallah_20180915 N ports/lang/gpc/Makefile N ports/lang/gpc/distinfo N ports/lang/gpc/pkg/PLIST N ports/lang/gpc/pkg/DESCR N ports/lang/gpc/pkg/PFRAG.PPC No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: v...@cvs.openbsd.org2018/09/15 11:38:16 Modified files: archivers/zstd : Makefile Log message: Fix a cyclic dependency. The devel/llvm port depends indirectly on archivers/zstd (devel/llvm -> devel/cmake -> archivers/libarchive -> archivers/zstd), so ports-clang should not be used in zstd's COMPILER. Otherwise, zstd build is blocked if clang is not readily available, as is the case with bulk builds on gcc architectures. The dependency archivers/libarchive -> archivers/zstd was added recently. OK bket@ sthen@
Re: UPDATE devel/git-cola
On 2018/09/15 18:28, Klemens Nanni wrote:
> On Sat, Sep 15, 2018 at 05:15:45PM +0200, Björn Ketelaars wrote:
> > Instead of using the bundled qtpy use the version in ports. No issues
> > found on amd64.
> Sounds good. What about this from upstream README:
>
> Set QT_API=pyqt4 in your environment if you have both versions
> of PyQt installed and want to ensure that PyQt4 is used.
>
> Dependencies are lacking ${MODPY_FLAVOR}.
>
> git-cola runs fine with your diff but I still see this:
>
> /usr/local/lib/python2.7/site-packages/qtpy/__init__.py:211:
> RuntimeWarning: Selected binding "pyqt5" could not be found, using "pyqt"
> 'using "{}"'.format(initial_api, API), RuntimeWarning)
>
>
> As a side note, git-cola does not seem to work with Python 3 on our site:
>
> $ git-cola
> Traceback (most recent call last):
> File "/usr/local/lib/python3.6/site-packages/qtpy/__init__.py", line
> 199, in
> from PySide import __version__ as PYSIDE_VERSION # analysis:ignore
> ModuleNotFoundError: No module named 'PySide'
That's because you don't have any supported qt backend installed - IIRC if
you install py3-qt5 it works. git-cola uses the first one it finds out
of py-qt5, py-qt4, pyside - if none of them are found it shows the
"module not found" error for the last one it tried.
(pyside isn't in ports, py-qt4 doesn't have a py3 flavour, py-qt5 does).
>
> During handling of the above exception, another exception occurred:
>
> Traceback (most recent call last):
> File "/usr/local/bin/git-cola", line 53, in
> from cola.main import main
> File "/usr/local/share/git-cola/lib/cola/main.py", line 6, in
> from . import app
> File "/usr/local/share/git-cola/lib/cola/app.py", line 15, in
> from qtpy import QtCore
> File "/usr/local/lib/python3.6/site-packages/qtpy/__init__.py", line
> 205, in
> raise PythonQtError('No Qt bindings could be found')
> qtpy.PythonQtError: No Qt bindings could be found
>
Re: backuppc FastCgiExternalServer error on apache2
1. there is a full dependency of the current backuppc package in ports on
samba, even if your backups are only tar or rsync based.
The backuppc process won't run if it can't find
/usr/local/bin/smbclient.
We should really add samba to the backuppc package dependencies as a result.
No, look at the Makefile:
# XXX one of them needed as runtime dep... buildep to get them found by
# configure
BUILD_DEPENDS = archivers/gtar \
net/samba \
net/rsync \
devel/p5-File-RsyncP
What if you dont want to backup windows clients ? you dont need samba
dependency.
I based my statement on below error when starting BackupPC:
# /usr/local/bin/BackupPC
2018-09-15 11:59:15 $Conf{NmbLookupPath} = '/usr/local/bin/nmblookup' is
not a valid executable program
However, you are absolutely right, this error only happens if
$Conf{SmbClientPath}
and
$Conf{NmbLookupPath}
are uncommented. Which they are by default in the
/etc/backuppc/config.pl that comes with the package.
If we care to improve this so backupc just runs after installation
without samba, a potential change would be to have these lines commented
out in the installer package and add a comment to
/usr/local/share/doc/pkg-readmes
explaining a need to uncomment these (and obviously get the samba
package) in case smb based backups are desired.
This would allow the backuppc package to behave similar when samba is
not installed as it does when rsync is not installed (i.e. backuppc
installs and runs after a pgk_add and can use other available mechanisms)
2. wwbackuppc.fcgi is no longer needed as a daemon in case of
apache due to the deprecation of fastcgi.
That rc script can be removed from /etc/rc.d.
moving to another web server (be it apache2 or nginx or httpd) doesnt
mean 'deprecation of fastcgi'.
Fair enough.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2018/09/15 10:53:52 Modified files: x11/lxqt/about : Makefile Log message: Unbreak lxqt/about build Fix by Elias M. Mariani (mainatiner), Spotted by ajacoutot@
Re: CVS: cvs.openbsd.org: ports
I sent a fix to ports@. https://marc.info/?l=openbsd-ports=153702904711136 Thanks Antoine for the headsup. 2018-09-15 12:51 GMT-03:00 Antoine Jacoutot : > On Fri, Sep 14, 2018 at 09:17:27AM -0600, Rafael Sadowski wrote: >> CVSROOT: /cvs >> Module name: ports >> Changes by: rsadow...@cvs.openbsd.org 2018/09/14 09:17:27 >> >> Log message: >> Import lxqt 0.13.0 > > Running configure in x11/lxqt/about at 1537014771 > ===> x11/lxqt/about > ===> Configuring for lxqt-about-0.13.0 > -- The C compiler identification is Clang 6.0.0 > -- The CXX compiler identification is Clang 6.0.0 > -- Check for working C compiler: /exopi-obj/pobj/lxqt-about-0.13.0/bin/cc > -- Check for working C compiler: /exopi-obj/pobj/lxqt-about-0.13.0/bin/cc -- > works > -- Detecting C compiler ABI info > -- Detecting C compiler ABI info - done > -- Detecting C compile features > -- Detecting C compile features - done > -- Check for working CXX compiler: /exopi-obj/pobj/lxqt-about-0.13.0/bin/c++ > -- Check for working CXX compiler: /exopi-obj/pobj/lxqt-about-0.13.0/bin/c++ > -- works > -- Detecting CXX compiler ABI info > -- Detecting CXX compiler ABI info - done > -- Detecting CXX compile features > -- Detecting CXX compile features - done > CMake Error at > /usr/local/share/cmake/Modules/CMakeFindDependencyMacro.cmake:48 > (find_package): > By not providing "Findlxqt-build-tools.cmake" in CMAKE_MODULE_PATH this > project has asked CMake to find a package configuration file provided by > "lxqt-build-tools", but CMake did not find one. > > Could not find a package configuration file provided by "lxqt-build-tools" > (requested version 0.5.0) with any of the following names: > > lxqt-build-toolsConfig.cmake > lxqt-build-tools-config.cmake > > Add the installation prefix of "lxqt-build-tools" to CMAKE_PREFIX_PATH or > set "lxqt-build-tools_DIR" to a directory containing one of the above > files. If "lxqt-build-tools" provides a separate development package or > SDK, be sure it has been installed. > Call Stack (most recent call first): > /usr/local/share/cmake/lxqt/lxqt-config.cmake:41 (find_dependency) > CMakeLists.txt:24 (find_package) > > > -- Configuring incomplete, errors occurred! > See also > "/exopi-obj/pobj/lxqt-about-0.13.0/build-amd64/CMakeFiles/CMakeOutput.log". > ===> Exiting x11/lxqt/about with an error > >
Re: UPDATE: shells/zsh
On Sat, Sep 15, 2018 at 10:04:26AM +0200, Rafael Sadowski wrote:
> +MASTER_SITES=${MASTER_SITE_SOURCEFORGE:=zsh/} \
> + http://www.zsh.org/pub/
Has TLS.
Re: New: games/weidu - a program to manage modifications for Infinity Engine (GemRB) games
On Wed, Aug 29, 2018 at 07:35:51PM -0700, Thomas Frohwein wrote: > Hi, > > This is a new port of WeiDU, a tool to manage modifications for Infinity > Engine > games which for OpenBSD is essentially all that run with the gemrb port. Main > use case is likely installation of the widescreen mod for those games with > weinstill. This is outlined as an example in the README. It also allows > patching > these games with weidu. > > This port has been a little more on the complicated side: It requires elkhound > for building. elkhound doesn't seem to have a lot of use cases from what I've > heard and upstream has been pretty much inactive for about 10 years. > Therefore, > I added elkhound as a subdir in the tarball that creates the binary just for > building weidu, as opposed to creating a separate elkhound port. Then that > binary is used for the build process, but not installed. > > Compilation: > - contains do-build which just builds elkhound first and weidu second. > - elkhound has a lot of hardcoded g++. Changed to c++ with sed. Also needs > cc/c++ hardcoded in a few Makefile.in > - Several hardcoded -O2 replaced with CFLAGS in elkhound. Not sure if this may > have been a waste of time given that it's only used during the build... > > Tests and functionality: > - Tested all 3 binaries. > - weidu tested to successfully decompile a .dlg file and compile a .d file > - weinstall tested with installing widescreen mod with Baldur's Gate 1&2 and > Planescape: Torment > - Comes with a binary 'tolower' that converts all filenames in the directory > to lower case recursively. > > Package and hosting: > - elkhound is not installed (only needed for building). > - Includes a README with installation of widescreen mod as example (this will > most likely be the most common use case) > - Can someone host the tarball for me again? > > ok? ping - No one interested in running their Baldur's Gate or Planescape Torment in HD? weidu.tgz Description: Binary data
Re: [Maintainer tweak] x11/lxqt/about
Forgot to mention: Spotted by ajacoutot@ Thanks! 2018-09-15 13:29 GMT-03:00 Elias M. Mariani : > Ups... my bad, sorry. > Missing BDEP = x11/lxqt/build-tools. > > I think that a REVISION bump is not needed because is a BDEP? > > Cheers. > Elias.
[Maintainer tweak] x11/lxqt/about
Ups... my bad, sorry. Missing BDEP = x11/lxqt/build-tools. I think that a REVISION bump is not needed because is a BDEP? Cheers. Elias. lxqt-about.diff Description: Binary data
Re: UPDATE devel/git-cola
On Sat, Sep 15, 2018 at 05:15:45PM +0200, Björn Ketelaars wrote:
> Instead of using the bundled qtpy use the version in ports. No issues
> found on amd64.
Sounds good. What about this from upstream README:
Set QT_API=pyqt4 in your environment if you have both versions
of PyQt installed and want to ensure that PyQt4 is used.
Dependencies are lacking ${MODPY_FLAVOR}.
git-cola runs fine with your diff but I still see this:
/usr/local/lib/python2.7/site-packages/qtpy/__init__.py:211:
RuntimeWarning: Selected binding "pyqt5" could not be found, using "pyqt"
'using "{}"'.format(initial_api, API), RuntimeWarning)
As a side note, git-cola does not seem to work with Python 3 on our site:
$ git-cola
Traceback (most recent call last):
File "/usr/local/lib/python3.6/site-packages/qtpy/__init__.py", line
199, in
from PySide import __version__ as PYSIDE_VERSION # analysis:ignore
ModuleNotFoundError: No module named 'PySide'
During handling of the above exception, another exception occurred:
Traceback (most recent call last):
File "/usr/local/bin/git-cola", line 53, in
from cola.main import main
File "/usr/local/share/git-cola/lib/cola/main.py", line 6, in
from . import app
File "/usr/local/share/git-cola/lib/cola/app.py", line 15, in
from qtpy import QtCore
File "/usr/local/lib/python3.6/site-packages/qtpy/__init__.py", line
205, in
raise PythonQtError('No Qt bindings could be found')
qtpy.PythonQtError: No Qt bindings could be found
Re: pgsql readme: update auth method
On Sat, 15 Sep 2018 05:11:19 -0700, Chris Bennett
wrote:
> could we make UTF8 the default
Sounds sane to me.
> and mention ASCII as another possible option instead?
I'd prefer to zap it altogether. I hope users look up in the pgsql doc
what the arguments are for.
Does this diff would work for you?
Cheers,
Daniel
Index: Makefile
===
RCS file: /cvs/ports/databases/postgresql/Makefile,v
retrieving revision 1.240
diff -u -p -r1.240 Makefile
--- Makefile6 Sep 2018 19:08:59 - 1.240
+++ Makefile15 Sep 2018 16:00:00 -
@@ -17,7 +17,7 @@ PKGNAME-contrib=postgresql-contrib-${VER
PKGNAME-plpython=postgresql-plpython-${VERSION}
PKGNAME-pg_upgrade=postgresql-pg_upgrade-${VERSION}
REVISION-main= 0
-REVISION-server=1
+REVISION-server=2
CATEGORIES=databases
SHARED_LIBS= ecpg7.9 \
Index: pkg/README-server
===
RCS file: /cvs/ports/databases/postgresql/pkg/README-server,v
retrieving revision 1.24
diff -u -p -r1.24 README-server
--- pkg/README-server 4 Sep 2018 12:46:10 - 1.24
+++ pkg/README-server 15 Sep 2018 16:00:00 -
@@ -14,21 +14,12 @@ initialized using the initdb command.
If you are installing PostgreSQL for the first time, you have to create
a default database first. In the following example we install a database
-in /var/postgresql/data with a dba account 'postgres' and md5 authentication.
-We will be prompted for a password to protect the dba account:
+in /var/postgresql/data with a dba account 'postgres' and scram-sha-256
+authentication. We will be prompted for a password to protect the dba account:
# su - _postgresql
$ mkdir /var/postgresql/data
- $ initdb -D /var/postgresql/data -U postgres -A md5 -W
-
-Please note that by default the cluster's encoding will be SQL_ASCII. If
-you want to have another default encoding, use the option -E with initdb:
-
- $ initdb -D /var/postgresql/data -U postgres -E UTF8 -A md5 -W
-
-If your cluster is already created, you can specify another encoding when
-you create a new database with this command:
- CREATE DATABASE xxx TEMPLATE template0 ENCODING 'xxx' ;
+ $ initdb -D /var/postgresql/data -U postgres -A scram-sha-256 -E UTF8 -W
It is strongly advised that you do not work with the postgres dba account
other than creating more users and/or databases or for administrative tasks.
@@ -127,9 +118,10 @@ to the current version.
4) Backup your old data directory:
# mv /var/postgresql/data /var/postgresql/data-${PREV_MAJOR}
-5) Create a new data directory (adding -E UTF8 to the initdb line if needed):
+5) Create a new data directory:
# su _postgresql -c "mkdir /var/postgresql/data"
-# su _postgresql -c "initdb -D /var/postgresql/data -U postgres -A md5 -W"
+# su _postgresql -c \
+"initdb -D /var/postgresql/data -U postgres -A scram-sha-256 -E UTF8 -W"
6) Restore your old pg_hba.conf and (if used) SSL certificates
# su _postgresql -c \
@@ -151,7 +143,7 @@ Option 2: pg_upgrade
This will work for an upgrade from the previous major version of
PostgreSQL supported by OpenBSD to the current version, and should be
-faster than a dump and reload, especially for large databases.
+faster than a dump and reload, especially for large databases.
1) Shutdown the server:
# rcctl stop postgresql
@@ -162,9 +154,10 @@ faster than a dump and reload, especiall
3) Backup your old data directory:
# mv /var/postgresql/data /var/postgresql/data-${PREV_MAJOR}
-4) Create a new data directory (adding -E UTF8 to the initdb line if needed):
+4) Create a new data directory:
# su _postgresql -c "mkdir /var/postgresql/data"
-# su _postgresql -c "initdb -D /var/postgresql/data -U postgres -A md5 -W"
+# su _postgresql -c \
+"initdb -D /var/postgresql/data -U postgres -A scram-sha-256 -E UTF8 -W"
5) Restore your old pg_hba.conf and (if used) SSL certificates
# su _postgresql -c \
Re: CVS: cvs.openbsd.org: ports
On Fri, Sep 14, 2018 at 09:17:27AM -0600, Rafael Sadowski wrote: > CVSROOT: /cvs > Module name: ports > Changes by: rsadow...@cvs.openbsd.org 2018/09/14 09:17:27 > > Log message: > Import lxqt 0.13.0 >>> Running configure in x11/lxqt/about at 1537014771 ===> x11/lxqt/about ===> Configuring for lxqt-about-0.13.0 -- The C compiler identification is Clang 6.0.0 -- The CXX compiler identification is Clang 6.0.0 -- Check for working C compiler: /exopi-obj/pobj/lxqt-about-0.13.0/bin/cc -- Check for working C compiler: /exopi-obj/pobj/lxqt-about-0.13.0/bin/cc -- works -- Detecting C compiler ABI info -- Detecting C compiler ABI info - done -- Detecting C compile features -- Detecting C compile features - done -- Check for working CXX compiler: /exopi-obj/pobj/lxqt-about-0.13.0/bin/c++ -- Check for working CXX compiler: /exopi-obj/pobj/lxqt-about-0.13.0/bin/c++ -- works -- Detecting CXX compiler ABI info -- Detecting CXX compiler ABI info - done -- Detecting CXX compile features -- Detecting CXX compile features - done CMake Error at /usr/local/share/cmake/Modules/CMakeFindDependencyMacro.cmake:48 (find_package): By not providing "Findlxqt-build-tools.cmake" in CMAKE_MODULE_PATH this project has asked CMake to find a package configuration file provided by "lxqt-build-tools", but CMake did not find one. Could not find a package configuration file provided by "lxqt-build-tools" (requested version 0.5.0) with any of the following names: lxqt-build-toolsConfig.cmake lxqt-build-tools-config.cmake Add the installation prefix of "lxqt-build-tools" to CMAKE_PREFIX_PATH or set "lxqt-build-tools_DIR" to a directory containing one of the above files. If "lxqt-build-tools" provides a separate development package or SDK, be sure it has been installed. Call Stack (most recent call first): /usr/local/share/cmake/lxqt/lxqt-config.cmake:41 (find_dependency) CMakeLists.txt:24 (find_package) -- Configuring incomplete, errors occurred! See also "/exopi-obj/pobj/lxqt-about-0.13.0/build-amd64/CMakeFiles/CMakeOutput.log". ===> Exiting x11/lxqt/about with an error
mod_perl -> httpd, replace advice for best cookies, headers, password security appreciated
I was spoiled by having so much built into mod_perl and I hand ported p5-Apache-AuthCookie for my own use. Right now I have been using PostgreSQL for all of my passwords, usernames and products bought through PayPal IPN. Works great but no longer. PostgreSQL can indeed be accessed with a socket inside of chroot, so that looks like best versus http (yes, best?). There are a ton of Perl modules to handle all of the stuff I need to replace, but as usual, there are good modules and crap modules and I don't have a clue what to use and what NOT to use. I have been steadily moving all of my http into the database, which I really like. I've begun moving things under -current for testing, which is nice. I have most of my websites in English and Spanish, which was using Apache MultiViews plus browser preferences, links on pages for the other language or adding ?lang=es or ?lang=en if I am producing the new links on the fly. As far as my tastes, I found CGI.pm way of producing http, well, distasteful. But I don't know what else it can and cannot do for what I need. I am currently using cookies for password protected areas. I could also add those for languages, but many people refuse cookies for other uses. Who can really blame them being tracked, etc. Any help appreciated. If the best choices have not been ported, let me know and I will endeavor to bring those into ports. Thanks, Chris Bennett
Re: [REMOVE] devel/py-dtopt [2/2]
If someone applies this remember to unhook devel/py-dtopt form devel/Makefile. That is not in the diff. 2018-09-15 12:18 GMT-03:00 Elias M. Mariani : > With the removal of the dependency on devel/py-dtopt from > www/py-webtest that I just sent to ports@: > https://marc.info/?l=openbsd-ports=153702339109853 > > + Now devel/py-dtopt is free of consumers. > + The project hasn't been updated since Aug 10, 2007. > + I think that the py3 version has errors, there is no comments on the > compatibility with python 3 on the pypi site. > + The repository seems to be down for a while now... > + I don't think that is useful anymore. > > I sent a REVISION in June about py-dtopt because it has a file > conflicting between py- and py3-. > https://marc.info/?l=openbsd-ports=152954658208188 > > Now Marc asked us to look into the conflicts: > https://marc.info/?l=openbsd-ports=153700642606415 > > So, 3 options after applying the UPDATE to www/py-webtest: > - Remove devel/py-dtopt (My recommendation) > - Remove the python3 flavor from devel/py-dtopt. > - Change devel/py-dtopt to avoid the conflicting file between flavors. > (Really not recommended given that I don't think that py-dtopt is > actually python3 compatible). > > The attached diff removes devel/py-dtopt and bumps devel/quirks with > the reason for removal. > > Cheers. > Elias.
[REMOVE] devel/py-dtopt [2/2]
With the removal of the dependency on devel/py-dtopt from www/py-webtest that I just sent to ports@: https://marc.info/?l=openbsd-ports=153702339109853 + Now devel/py-dtopt is free of consumers. + The project hasn't been updated since Aug 10, 2007. + I think that the py3 version has errors, there is no comments on the compatibility with python 3 on the pypi site. + The repository seems to be down for a while now... + I don't think that is useful anymore. I sent a REVISION in June about py-dtopt because it has a file conflicting between py- and py3-. https://marc.info/?l=openbsd-ports=152954658208188 Now Marc asked us to look into the conflicts: https://marc.info/?l=openbsd-ports=153700642606415 So, 3 options after applying the UPDATE to www/py-webtest: - Remove devel/py-dtopt (My recommendation) - Remove the python3 flavor from devel/py-dtopt. - Change devel/py-dtopt to avoid the conflicting file between flavors. (Really not recommended given that I don't think that py-dtopt is actually python3 compatible). The attached diff removes devel/py-dtopt and bumps devel/quirks with the reason for removal. Cheers. Elias. py-dtopt.diff Description: Binary data
UPDATE devel/git-cola
Instead of using the bundled qtpy use the version in ports. No issues
found on amd64.
While here take MAINTAINER.
ok?
Index: Makefile
===
RCS file: /cvs/ports/devel/git-cola/Makefile,v
retrieving revision 1.24
diff -u -p -r1.24 Makefile
--- Makefile8 Sep 2018 03:55:10 - 1.24
+++ Makefile15 Sep 2018 15:13:46 -
@@ -4,6 +4,7 @@ COMMENT = python powered git gui
MODPY_EGG_VERSION= 3.2
DISTNAME = ${GH_PROJECT}-${MODPY_EGG_VERSION}
+REVISION = 0
GH_ACCOUNT = git-cola
GH_PROJECT = git-cola
@@ -13,6 +14,8 @@ CATEGORIES = devel x11
HOMEPAGE = https://git-cola.github.io/
+MAINTAINER = Bjorn Ketelaars
+
# GPLv2 only
PERMIT_PACKAGE_CDROM= Yes
@@ -21,17 +24,21 @@ MODULES = lang/python
BUILD_DEPENDS =devel/gettext-tools \
devel/git \
textproc/xxdiff \
- x11/py-qt4
+ x11/py-qt4 \
+ x11/py-qtpy
RUN_DEPENDS = devel/desktop-file-utils \
devel/git \
textproc/xxdiff \
- x11/py-qt4
+ x11/py-qt4 \
+ x11/py-qtpy
TEST_DEPENDS = devel/py-mock \
devel/py-test
USE_GMAKE =Yes
+
+MAKE_ENV = GIT_COLA_NO_VENDOR_LIBS=1
MODPY_ADJ_FILES= share/git-cola/bin/git-xbase
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/git-cola/pkg/PLIST,v
retrieving revision 1.13
diff -u -p -r1.13 PLIST
--- pkg/PLIST 8 Sep 2018 03:55:10 - 1.13
+++ pkg/PLIST 15 Sep 2018 15:13:46 -
@@ -297,50 +297,6 @@ share/git-cola/lib/cola/widgets/toolbar.
share/git-cola/lib/cola/widgets/toolbar.pyc
share/git-cola/lib/cola/widgets/toolbarcmds.py
share/git-cola/lib/cola/widgets/toolbarcmds.pyc
-share/git-cola/lib/qtpy/
-share/git-cola/lib/qtpy/QtCore.py
-share/git-cola/lib/qtpy/QtCore.pyc
-share/git-cola/lib/qtpy/QtDesigner.py
-share/git-cola/lib/qtpy/QtDesigner.pyc
-share/git-cola/lib/qtpy/QtGui.py
-share/git-cola/lib/qtpy/QtGui.pyc
-share/git-cola/lib/qtpy/QtHelp.py
-share/git-cola/lib/qtpy/QtHelp.pyc
-share/git-cola/lib/qtpy/QtMultimedia.py
-share/git-cola/lib/qtpy/QtMultimedia.pyc
-share/git-cola/lib/qtpy/QtNetwork.py
-share/git-cola/lib/qtpy/QtNetwork.pyc
-share/git-cola/lib/qtpy/QtOpenGL.py
-share/git-cola/lib/qtpy/QtOpenGL.pyc
-share/git-cola/lib/qtpy/QtPrintSupport.py
-share/git-cola/lib/qtpy/QtPrintSupport.pyc
-share/git-cola/lib/qtpy/QtSql.py
-share/git-cola/lib/qtpy/QtSql.pyc
-share/git-cola/lib/qtpy/QtSvg.py
-share/git-cola/lib/qtpy/QtSvg.pyc
-share/git-cola/lib/qtpy/QtTest.py
-share/git-cola/lib/qtpy/QtTest.pyc
-share/git-cola/lib/qtpy/QtWebEngineWidgets.py
-share/git-cola/lib/qtpy/QtWebEngineWidgets.pyc
-share/git-cola/lib/qtpy/QtWidgets.py
-share/git-cola/lib/qtpy/QtWidgets.pyc
-share/git-cola/lib/qtpy/__init__.py
-share/git-cola/lib/qtpy/__init__.pyc
-share/git-cola/lib/qtpy/_patch/
-share/git-cola/lib/qtpy/_patch/__init__.py
-share/git-cola/lib/qtpy/_patch/__init__.pyc
-share/git-cola/lib/qtpy/_patch/qcombobox.py
-share/git-cola/lib/qtpy/_patch/qcombobox.pyc
-share/git-cola/lib/qtpy/_patch/qheaderview.py
-share/git-cola/lib/qtpy/_patch/qheaderview.pyc
-share/git-cola/lib/qtpy/_version.py
-share/git-cola/lib/qtpy/_version.pyc
-share/git-cola/lib/qtpy/compat.py
-share/git-cola/lib/qtpy/compat.pyc
-share/git-cola/lib/qtpy/py3compat.py
-share/git-cola/lib/qtpy/py3compat.pyc
-share/git-cola/lib/qtpy/uic.py
-share/git-cola/lib/qtpy/uic.pyc
share/locale/cs/LC_MESSAGES/git-cola.mo
share/locale/de/LC_MESSAGES/git-cola.mo
share/locale/es/LC_MESSAGES/git-cola.mo
UPDATE news/py-yenc
Enclosed a diff for bringing py-yenc to 0.4.0, which is meant to be
backward compatible with 0.3 [0]. Tested ok with its consumer
news/sabnzbd, and 'make test' runs successfully on amd64.
- HOMEPAGE gives a 404. Instead use pip
- Drop MAINTAINER as mails bounce with 'message wasn't delivered to
osk...@sefirosu.org because the domain sefirosu.org couldn't be found'
- Drop patches as these have been addressed upstream
ok?
[0] https://bitbucket.org/dual75/yenc/overview
diff --git Makefile Makefile
index c7d3be8b0d8..10c8dd350c2 100644
--- Makefile
+++ Makefile
@@ -2,26 +2,21 @@
COMMENT= yEnc encoding/decoding extension for Python
-DISTNAME= yenc-0.3
+MODPY_EGG_VERSION= 0.4.0
+DISTNAME= yenc-${MODPY_EGG_VERSION}
PKGNAME= py-${DISTNAME}
-REVISION = 5
CATEGORIES=news
-HOMEPAGE= http://www.hellanzb.com/
-MASTER_SITES= ${HOMEPAGE}hellanzb-content/
-
-MAINTAINER=Mikko Tolmunen
-
# GPLv2
PERMIT_PACKAGE_CDROM= Yes
-MODULES= lang/python
-
WANTLIB= pthread ${MODPY_WANTLIB}
-TEST_DEPENDS= news/py-yenc
+MODULES= lang/python
+MODPY_PI= Yes
+MODPY_SETUPTOOLS= Yes
-CFLAGS+= -g -O2
+TEST_DEPENDS= news/py-yenc
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/py-yenc
diff --git distinfo distinfo
index f47bd36b3fb..0ed668472d5 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (yenc-0.3.tar.gz) = +wT+p8WCE0Vgj6AXKM5TVrbfstPkaeWeP9MbiPRfsxM=
-SIZE (yenc-0.3.tar.gz) = 42740
+SHA256 (yenc-0.4.0.tar.gz) = LCSiSdYnr4zhylpLW9I3o0tshZ9x9V8LCe02n3Sf1Nk=
+SIZE (yenc-0.4.0.tar.gz) = 64237
diff --git patches/patch-setup_py patches/patch-setup_py
deleted file mode 100644
index af615d499ea..000
--- patches/patch-setup_py
+++ /dev/null
@@ -1,11 +0,0 @@
-$OpenBSD: patch-setup_py,v 1.1.1.1 2007/12/17 00:57:35 merdely Exp $
setup.py.orig Fri Dec 14 06:50:56 2007
-+++ setup.py Fri Dec 14 06:51:30 2007
-@@ -38,6 +38,6 @@ setup(
- license = "GPL",
- package_dir = { '': 'lib' },
- py_modules = ["yenc"],
-- ext_modules =
[Extension("_yenc",["src/_yenc.c"],extra_compile_args=["-O2","-g"])]
-+ ext_modules = [Extension("_yenc",["src/_yenc.c"])]
- )
-
diff --git patches/patch-test_test_py patches/patch-test_test_py
deleted file mode 100644
index f009533d0dd..000
--- patches/patch-test_test_py
+++ /dev/null
@@ -1,11 +0,0 @@
test/test.py.orig Thu Feb 19 01:11:46 2004
-+++ test/test.py Tue Dec 11 19:36:46 2007
-@@ -32,7 +32,7 @@ from binascii import crc32
- from stat import *
-
- def main():
-- os.system("dd if=/dev/urandom of=sampledata bs=1M count=1")
-+ os.system("dd if=/dev/urandom of=sampledata bs=1048576 count=1")
- file_in = open("sampledata","r")
- file_out = open("sampledata.out","w")
- data = file_in.read()
diff --git pkg/PLIST pkg/PLIST
index 07c9a77664a..74b5626aea2 100644
--- pkg/PLIST
+++ pkg/PLIST
@@ -1,14 +1,19 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2007/12/17 00:57:35 merdely Exp $
lib/python${MODPY_VERSION}/site-packages/_yenc.so
-lib/python${MODPY_VERSION}/site-packages/yenc-0.3-py${MODPY_VERSION}.egg-info
+lib/python${MODPY_VERSION}/site-packages/yenc-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
+lib/python${MODPY_VERSION}/site-packages/yenc-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
+lib/python${MODPY_VERSION}/site-packages/yenc-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
+lib/python${MODPY_VERSION}/site-packages/yenc-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
+lib/python${MODPY_VERSION}/site-packages/yenc-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
lib/python${MODPY_VERSION}/site-packages/yenc.py
lib/python${MODPY_VERSION}/site-packages/yenc.pyc
-share/doc/py-yenc/
-share/doc/py-yenc/README
-share/doc/py-yenc/yenc-draft.1.3.txt
-share/examples/py-yenc/
-share/examples/py-yenc/logo.ync
-share/examples/py-yenc/ydecode.py
-share/examples/py-yenc/ydecode_Decoder.py
-share/examples/py-yenc/yencode.py
-share/examples/py-yenc/yencode_Encoder.py
+share/doc/${MODPY_PY_PREFIX}yenc/
+share/doc/${MODPY_PY_PREFIX}yenc/README
+share/doc/${MODPY_PY_PREFIX}yenc/yenc-draft.1.3.txt
+share/examples/${MODPY_PY_PREFIX}yenc/
+share/examples/${MODPY_PY_PREFIX}yenc/logo.gif
+share/examples/${MODPY_PY_PREFIX}yenc/logo.ync
+share/examples/${MODPY_PY_PREFIX}yenc/ydecode.py
+share/examples/${MODPY_PY_PREFIX}yenc/ydecode_Decoder.py
+share/examples/${MODPY_PY_PREFIX}yenc/yencode.py
+share/examples/${MODPY_PY_PREFIX}yenc/yencode_Encoder.py
[UPDATE] www/py-webtest 2.0.29 -> 2.0.30 [1/2]
https://github.com/Pylons/webtest/blob/2.0.30/CHANGELOG.rst
No problems with the changes.
Testing passing except for those depending on (three) dependencies
that we don't have on ports.
Not interested in the update itself, actually is just because I passed
by to remove devel/py-dtopt as a test dependency, witch is not a
dependency for a long time... 2011...
https://github.com/Pylons/webtest/commit/a7ed7485b3784218d255ff60e49b86379f7de561
Also fixed the do-test hook to use "nosetests${MODPY_BIN_SUFFIX}"
accordingly to the python version and not "nosetests".
Too much text for such little changes, read the next mail to see why...
Cheers.
Elias.
py-webtest.diff
Description: Binary data
Re: backuppc FastCgiExternalServer error on apache2
On Sat, Sep 15, 2018 at 09:25:05AM -0400, Maarten Lippmann wrote: > On 9/13/2018 6:53 AM, Stuart Henderson wrote: > > On 2018/09/12 22:00, Maarten Lippmann wrote: > > > I'm curious if the example backuppc.conf file is out of date and > > > dependencies have changed, but I am having a hard time figuring out an > > > appropriate alternative apache2 directive to get the backuppc web > interface > > > working on openbsd. > > > > I can't help with config but I can tell you this file *is* out of date, > > it is for apache 1.x. > > I've been able to get the full configuration to work properly with a couple > of changes, see below. > This removes the dependency on the deprecated fastcgi package. > > I have to admit I'm not yet too familiar with port maintenance. I would love > it if someone could point me to documentation I can follow so I can bring > these changes (including relevant doc changes) back to the ports package for > a future release. I didn't find a name of the current maintainer, will > gladly discuss below proposed changes with them as well. > > It may be an idea to investigate how to make backuppc work with the builtin > httpd service (it seems possible, the builtin service supports fastcgi) and > eventually leverage that instead of apache by default. All this would be very much welcome, as this port doesnt have a current maintainer (i ported it ages ago but i dont use it anymore). > 1. there is a full dependency of the current backuppc package in ports on > samba, even if your backups are only tar or rsync based. > The backuppc process won't run if it can't find > /usr/local/bin/smbclient. > We should really add samba to the backuppc package dependencies as a result. No, look at the Makefile: # XXX one of them needed as runtime dep... buildep to get them found by # configure BUILD_DEPENDS = archivers/gtar \ net/samba \ net/rsync \ devel/p5-File-RsyncP What if you dont want to backup windows clients ? you dont need samba dependency. > 2. wwbackuppc.fcgi is no longer needed as a daemon in case of > apache due to the deprecation of fastcgi. > That rc script can be removed from /etc/rc.d. moving to another web server (be it apache2 or nginx or httpd) doesnt mean 'deprecation of fastcgi'.
Re: backuppc FastCgiExternalServer error on apache2
On 9/13/2018 6:53 AM, Stuart Henderson wrote: On 2018/09/12 22:00, Maarten Lippmann wrote: I'm curious if the example backuppc.conf file is out of date and dependencies have changed, but I am having a hard time figuring out an appropriate alternative apache2 directive to get the backuppc web interface working on openbsd. I can't help with config but I can tell you this file *is* out of date, it is for apache 1.x. I've been able to get the full configuration to work properly with a couple of changes, see below. This removes the dependency on the deprecated fastcgi package. I have to admit I'm not yet too familiar with port maintenance. I would love it if someone could point me to documentation I can follow so I can bring these changes (including relevant doc changes) back to the ports package for a future release. I didn't find a name of the current maintainer, will gladly discuss below proposed changes with them as well. It may be an idea to investigate how to make backuppc work with the builtin httpd service (it seems possible, the builtin service supports fastcgi) and eventually leverage that instead of apache by default. -- Below the proposed changes. 1. there is a full dependency of the current backuppc package in ports on samba, even if your backups are only tar or rsync based. The backuppc process won't run if it can't find /usr/local/bin/smbclient. We should really add samba to the backuppc package dependencies as a result. 2. wwbackuppc.fcgi is no longer needed as a daemon in case of apache due to the deprecation of fastcgi. That rc script can be removed from /etc/rc.d. 3. /usr/local/bin/BackupPC_Admin needs to be copied to or linked in /var/www/cgi-bin/ File BackupPC_Admin in cgi-bin should either be setuid _backuppc group www or apache2 needs to be run as user_backuppc. This is because BackupPC_Admin currently verifies if it's run as user _backuppc and will exit if not. 3. add these ports dependencies: p5-CGI ap2-mod_perl p5-CGI-Fast 4. Change the backuppc.conf example in /var/www/conf/modules.sample/ to look something like below instead. (I took some of this code from the backuppc source package, and modified it to match folder locations of the current openBSD ports package.) LoadModule cgi_module /usr/local/lib/apache2/mod_cgi.so LoadModule perl_module /usr/local/lib/apache2/mod_perl.so # # This section tells apache which machines can access the interface. # You can change the allow line to allow access from your local # network, or comment out this region to allow access from all # machines. # order deny,allow deny from all allow from 127.0.0.1 # # You can change the authorization method to LDAP or another method # besides htaccess here if you are so inclined. # AuthType Basic AuthUserFile /etc/backuppc/backuppc.users AuthName "BackupPC Community Edition Administrative Interface" require valid-user Require all granted Alias /backuppc /var/www/backuppc/ ScriptAlias /BackupPC_Admin /var/www/cgi-bin/BackupPC_Admin -- Again, if folks are ok with the proposed changes I will gladly take ownership in pushing them to the backuppc ports package for the future. I will need a pointer to relevant documentation for that process.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2018/09/15 07:27:29 Modified files: math/z3: Makefile math/z3/pkg: PLIST Added files: math/z3/patches: patch-scripts_mk_util_py Log message: fix SHARED_LIB setup Initial diff and test by Fabian Raetz with advanced fixes by me.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2018/09/15 07:17:32 Modified files: devel : Makefile Log message: Link devel/pasmo.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2018/09/15 07:16:01 Log message: Import devel/pasmo. ---8<--- Pasmo is a Z80 cross assembler, written in standard C++ that compiles easily in multiple platforms. It can generate object code in the following formats: raw binary, Intel HEX, PRL for CP/M Plus RSX, Plus3Dos (Spectrum +3 disk), TAP, TZX and CDT (Spectrum and Amstrad CPC emulators tape images), AmsDos (Amstrad CPC disk) and MSX (for use with BLOAD from disk in Basic). --->8--- OK benoit@, thanks! Status: Vendor Tag: edd Release Tags: edd_20180915 N ports/devel/pasmo/Makefile N ports/devel/pasmo/distinfo N ports/devel/pasmo/pkg/DESCR N ports/devel/pasmo/pkg/PLIST No conflicts created by this import
Re: pgsql readme: update auth method
May want to be careful with this as not all applications and libraries
have been updated for the new encryption and will result in errors.
With that said I do think there should be a note to use real standards,
SCRAM-SHA-256, rather than their hand rolled MD5 implementation.
On 2018-09-14 21:41, Daniel Jakots wrote:
Hi,
With the version 10, pgsql comes with a new auth method called
scram-sha-256.
https://www.postgresql.org/docs/10/static/auth-methods.html#AUTH-PASSWORD
I think we should advise users to pick that one rather than md5. In the
upgrade part, the user has to copy the pg_hba.conf and this file lists
the auth method. Luckily there's no need to sed it, because according
to the docs:
To ease transition from the md5 method to the newer SCRAM method, if
md5 is specified as a method in pg_hba.conf but the user's password
on the server is encrypted for SCRAM (see below), then SCRAM-based
authentication will automatically be chosen instead.
The other thing is that iiuc, the library has to support this new
auth method but this should affect only the superuser and the
superuser shouldn't be used by any application directly so I think it's
fine.
What do you think?
Cheers,
Daniel
Index: Makefile
===
RCS file: /cvs/ports/databases/postgresql/Makefile,v
retrieving revision 1.240
diff -u -p -r1.240 Makefile
--- Makefile6 Sep 2018 19:08:59 - 1.240
+++ Makefile15 Sep 2018 02:11:11 -
@@ -17,7 +17,7 @@ PKGNAME-contrib=postgresql-contrib-${VER
PKGNAME-plpython=postgresql-plpython-${VERSION}
PKGNAME-pg_upgrade=postgresql-pg_upgrade-${VERSION}
REVISION-main=0
-REVISION-server=1
+REVISION-server=2
CATEGORIES= databases
SHARED_LIBS= ecpg7.9 \
Index: pkg/README-server
===
RCS file: /cvs/ports/databases/postgresql/pkg/README-server,v
retrieving revision 1.24
diff -u -p -r1.24 README-server
--- pkg/README-server 4 Sep 2018 12:46:10 - 1.24
+++ pkg/README-server 15 Sep 2018 02:11:11 -
@@ -14,17 +14,17 @@ initialized using the initdb command.
If you are installing PostgreSQL for the first time, you have to create
a default database first. In the following example we install a database
-in /var/postgresql/data with a dba account 'postgres' and md5 authentication.
-We will be prompted for a password to protect the dba account:
+in /var/postgresql/data with a dba account 'postgres' and scram-sha-256
+authentication. We will be prompted for a password to protect the dba account:
# su - _postgresql
$ mkdir /var/postgresql/data
- $ initdb -D /var/postgresql/data -U postgres -A md5 -W
+ $ initdb -D /var/postgresql/data -U postgres -A scram-sha-256 -W
Please note that by default the cluster's encoding will be SQL_ASCII. If
you want to have another default encoding, use the option -E with initdb:
- $ initdb -D /var/postgresql/data -U postgres -E UTF8 -A md5 -W
+ $ initdb -D /var/postgresql/data -U postgres -E UTF8 -A scram-sha-256 -W
If your cluster is already created, you can specify another encoding when
you create a new database with this command:
@@ -129,7 +129,8 @@ to the current version.
5) Create a new data directory (adding -E UTF8 to the initdb line if needed):
# su _postgresql -c "mkdir /var/postgresql/data"
-# su _postgresql -c "initdb -D /var/postgresql/data -U postgres -A md5 -W"
+# su _postgresql -c \
+"initdb -D /var/postgresql/data -U postgres -A scram-sha-256 -W"
6) Restore your old pg_hba.conf and (if used) SSL certificates
# su _postgresql -c \
@@ -151,7 +152,7 @@ Option 2: pg_upgrade
This will work for an upgrade from the previous major version of
PostgreSQL supported by OpenBSD to the current version, and should be
-faster than a dump and reload, especially for large databases.
+faster than a dump and reload, especially for large databases.
1) Shutdown the server:
# rcctl stop postgresql
@@ -164,7 +165,8 @@ faster than a dump and reload, especiall
4) Create a new data directory (adding -E UTF8 to the initdb line if needed):
# su _postgresql -c "mkdir /var/postgresql/data"
-# su _postgresql -c "initdb -D /var/postgresql/data -U postgres -A md5 -W"
+# su _postgresql -c \
+"initdb -D /var/postgresql/data -U postgres -A scram-sha-256 -W"
5) Restore your old pg_hba.conf and (if used) SSL certificates
# su _postgresql -c \
Re: math/z3: add missing SHARED_LIBS
On Sat, Sep 15, 2018 at 12:19:43PM +0200, Rafael Sadowski wrote:
> On Tue Sep 04, 2018 at 01:55:54AM +0200, Fabian Raetz wrote:
> > Hi @ports.
> >
> > I've added math/z3 as a LIB_DEPENDS to lang/solidity in openbsd-wip. It
> > seems
> > that libz3 is not setup correctly?
> >
> > Here's my attempt to fix it. Does that make sense?
> >
> > Cheers,
> > Fabian
> >
> >
>
> Hi Fabian Raetz,
>
> nice catch. All in all, okay but you remove libz3 from ${LOCALBASE}/lib.
>
> New diff below, could you test with your solidity wip port?
Hi Rafael,
Thanks for taking a look at this. I tested your diff with solidity
and everything seems to work fine.
Cheers,
Fabian
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/math/z3/Makefile,v
> retrieving revision 1.7
> diff -u -p -u -p -r1.7 Makefile
> --- Makefile 19 Jun 2018 17:48:49 - 1.7
> +++ Makefile 15 Sep 2018 10:14:27 -
> @@ -4,10 +4,13 @@ COMMENT = z3 theorem prover
>
> VERSION =4.7.1
> DISTNAME = z3-${VERSION}
> +REVISION = 0
>
> GH_ACCOUNT = Z3Prover
> GH_PROJECT = z3
>
> +SHARED_LIBS =z3 0.0
> +
> CATEGORIES = math
>
> WANTLIB += c m pthread ${COMPILER_LIBCXX}
> @@ -26,6 +29,9 @@ COMPILER = base-clang ports-gcc
> MODULES =lang/python
>
> WRKDIST =${WRKDIR}/z3-${DISTNAME}
> +
> +pre-configure:
> + ${SUBST_CMD} ${WRKSRC}/scripts/mk_util.py
>
> do-build:
> cd ${WRKSRC}/build && make
> Index: patches/patch-scripts_mk_util_py
> ===
> RCS file: patches/patch-scripts_mk_util_py
> diff -N patches/patch-scripts_mk_util_py
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-scripts_mk_util_py 15 Sep 2018 10:14:27 -
> @@ -0,0 +1,23 @@
> +$OpenBSD$
> +
> +Index: scripts/mk_util.py
> +--- scripts/mk_util.py.orig
> scripts/mk_util.py
> +@@ -49,7 +49,7 @@ C_COMPILERS=['gcc', 'clang']
> + CSC_COMPILERS=['csc', 'mcs']
> + JAVAC=None
> + JAR=None
> +-PYTHON_PACKAGE_DIR=distutils.sysconfig.get_python_lib()
> ++PYTHON_PACKAGE_DIR=distutils.sysconfig.get_python_lib(prefix=getenv("LOCALBASE",
> None))
> + BUILD_DIR='build'
> + REV_BUILD_DIR='..'
> + SRC_DIR='src'
> +@@ -2528,7 +2528,7 @@ def mk_config():
> + elif sysname == 'OpenBSD':
> + CXXFLAGS = '%s -D_OPENBSD_' % CXXFLAGS
> + OS_DEFINES = '-D_OPENBSD_'
> +-SO_EXT = '.so'
> ++SO_EXT = '.so.${LIBz3_VERSION}'
> + SLIBFLAGS = '-shared'
> + elif sysname.startswith('CYGWIN'):
> + CXXFLAGS = '%s -D_CYGWIN' % CXXFLAGS
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/math/z3/pkg/PLIST,v
> retrieving revision 1.2
> diff -u -p -u -p -r1.2 PLIST
> --- pkg/PLIST 10 Apr 2018 08:17:38 - 1.2
> +++ pkg/PLIST 15 Sep 2018 10:14:27 -
> @@ -14,12 +14,12 @@ include/z3_polynomial.h
> include/z3_rcf.h
> include/z3_spacer.h
> include/z3_v1.h
> -lib/libz3.so
> +@lib lib/libz3.so.${LIBz3_VERSION}
> lib/python${MODPY_VERSION}/site-packages/z3/
> lib/python${MODPY_VERSION}/site-packages/z3/__init__.py
> lib/python${MODPY_VERSION}/site-packages/z3/__init__.pyc
> lib/python${MODPY_VERSION}/site-packages/z3/lib/
> -lib/python${MODPY_VERSION}/site-packages/z3/lib/libz3.so
> +@lib
> lib/python${MODPY_VERSION}/site-packages/z3/lib/libz3.so.${LIBz3_VERSION}
> lib/python${MODPY_VERSION}/site-packages/z3/z3.py
> lib/python${MODPY_VERSION}/site-packages/z3/z3.pyc
> lib/python${MODPY_VERSION}/site-packages/z3/z3consts.py
Re: pgsql readme: update auth method
IMHO, I am no expert at all in which encoding is most commonly used in practice, but I cannot even imagine myself ever wanting to choose ASCII first. Since we might change the readme right now, could we make UTF8 the default and mention ASCII as another possible option instead? I have one old and unimportant database that I created with ASCII when I used postgresql for the first time after following the instructions as given. I regret the choice, not that it really ever mattered for that database. Thanks, Chris Bennett
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: es...@cvs.openbsd.org 2018/09/15 06:01:59 Added files: x11/kde/i18n3/pkg: PFRAG.conflict Removed files: x11/kde/i18n3/pkg: PFRAG-conflict Log message: oopsie, fixed for real
Re: math/z3: add missing SHARED_LIBS
On Tue Sep 04, 2018 at 01:55:54AM +0200, Fabian Raetz wrote:
> Hi @ports.
>
> I've added math/z3 as a LIB_DEPENDS to lang/solidity in openbsd-wip. It seems
> that libz3 is not setup correctly?
>
> Here's my attempt to fix it. Does that make sense?
>
> Cheers,
> Fabian
>
>
Hi Fabian Raetz,
nice catch. All in all, okay but you remove libz3 from ${LOCALBASE}/lib.
New diff below, could you test with your solidity wip port?
Index: Makefile
===
RCS file: /cvs/ports/math/z3/Makefile,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 Makefile
--- Makefile19 Jun 2018 17:48:49 - 1.7
+++ Makefile15 Sep 2018 10:14:27 -
@@ -4,10 +4,13 @@ COMMENT = z3 theorem prover
VERSION = 4.7.1
DISTNAME = z3-${VERSION}
+REVISION = 0
GH_ACCOUNT = Z3Prover
GH_PROJECT = z3
+SHARED_LIBS = z3 0.0
+
CATEGORIES = math
WANTLIB += c m pthread ${COMPILER_LIBCXX}
@@ -26,6 +29,9 @@ COMPILER =base-clang ports-gcc
MODULES = lang/python
WRKDIST = ${WRKDIR}/z3-${DISTNAME}
+
+pre-configure:
+ ${SUBST_CMD} ${WRKSRC}/scripts/mk_util.py
do-build:
cd ${WRKSRC}/build && make
Index: patches/patch-scripts_mk_util_py
===
RCS file: patches/patch-scripts_mk_util_py
diff -N patches/patch-scripts_mk_util_py
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-scripts_mk_util_py15 Sep 2018 10:14:27 -
@@ -0,0 +1,23 @@
+$OpenBSD$
+
+Index: scripts/mk_util.py
+--- scripts/mk_util.py.orig
scripts/mk_util.py
+@@ -49,7 +49,7 @@ C_COMPILERS=['gcc', 'clang']
+ CSC_COMPILERS=['csc', 'mcs']
+ JAVAC=None
+ JAR=None
+-PYTHON_PACKAGE_DIR=distutils.sysconfig.get_python_lib()
++PYTHON_PACKAGE_DIR=distutils.sysconfig.get_python_lib(prefix=getenv("LOCALBASE",
None))
+ BUILD_DIR='build'
+ REV_BUILD_DIR='..'
+ SRC_DIR='src'
+@@ -2528,7 +2528,7 @@ def mk_config():
+ elif sysname == 'OpenBSD':
+ CXXFLAGS = '%s -D_OPENBSD_' % CXXFLAGS
+ OS_DEFINES = '-D_OPENBSD_'
+-SO_EXT = '.so'
++SO_EXT = '.so.${LIBz3_VERSION}'
+ SLIBFLAGS = '-shared'
+ elif sysname.startswith('CYGWIN'):
+ CXXFLAGS = '%s -D_CYGWIN' % CXXFLAGS
Index: pkg/PLIST
===
RCS file: /cvs/ports/math/z3/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 PLIST
--- pkg/PLIST 10 Apr 2018 08:17:38 - 1.2
+++ pkg/PLIST 15 Sep 2018 10:14:27 -
@@ -14,12 +14,12 @@ include/z3_polynomial.h
include/z3_rcf.h
include/z3_spacer.h
include/z3_v1.h
-lib/libz3.so
+@lib lib/libz3.so.${LIBz3_VERSION}
lib/python${MODPY_VERSION}/site-packages/z3/
lib/python${MODPY_VERSION}/site-packages/z3/__init__.py
lib/python${MODPY_VERSION}/site-packages/z3/__init__.pyc
lib/python${MODPY_VERSION}/site-packages/z3/lib/
-lib/python${MODPY_VERSION}/site-packages/z3/lib/libz3.so
+@lib lib/python${MODPY_VERSION}/site-packages/z3/lib/libz3.so.${LIBz3_VERSION}
lib/python${MODPY_VERSION}/site-packages/z3/z3.py
lib/python${MODPY_VERSION}/site-packages/z3/z3.pyc
lib/python${MODPY_VERSION}/site-packages/z3/z3consts.py
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2018/09/15 04:13:55 ports/math/z3/patches Update of /cvs/ports/math/z3/patches In directory cvs.openbsd.org:/tmp/cvs-serv38210/patches Log Message: Directory /cvs/ports/math/z3/patches added to the repository
package conflicts to fix or process somehow
(resend, something burped on the first try, I can't find it in the archives) The python stuff seems to be files to rename or remove. Chicken and mono do install stuff that's WAY too short. The rest, well, that's for maintainer to decide. Anyway, those are unregistered conflicts right now. If not fixed soon, they should be marked as conflicting. cftp-0.12p2(net/cftp),py-twisted-18.7.0(devel/py-twisted) /usr/local/bin/cftp chicken-4.13.0p0(lang/chicken/core),mono-5.12.0.226(lang/mono) /usr/local/bin/csc /usr/local/bin/csi cmark-0.28.3(textproc/cmark),py-commonmark-0.7.4(textproc/py-commonmark) /usr/local/bin/cmark fcitx-4.2.9.5p2(inputmethods/fcitx,-main),scim-fcitx-3.1.1p5(inputmethods/scim-fcitx) /usr/local/bin/createPYMB /usr/local/bin/mb2txt /usr/local/bin/txt2mb google-cloud-sdk-215.0.0(sysutils/google-cloud-sdk),gsutil-3.1(telephony/gsutil) /usr/local/bin/gsutil py-dtopt-0.1p6(devel/py-dtopt),py3-dtopt-0.1p6(devel/py-dtopt,python3) /usr/local/share/doc/py-dtopt/index.txt py-setuptools_trial-0.6.0(devel/py-setuptools_trial),py3-setuptools_trial-0.6.0(devel/py-setuptools_trial,python3) /usr/local/share/doc/python-setuptools_trial/COPYING.SPL.txt /usr/local/share/doc/python-setuptools_trial/README.rst
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: es...@cvs.openbsd.org 2018/09/15 04:09:10 Added files: x11/kde/i18n3/pkg: PFRAG-conflict Log message: forgotten add
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2018/09/15 03:59:34 Modified files: net/py-botocore: Makefile distinfo Log message: Update to py-botocore-1.12.4.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2018/09/15 03:59:45 Modified files: sysutils/awscli: Makefile distinfo Log message: Update to awscli-1.16.14.
Re: CVS: cvs.openbsd.org: ports
On Fri, Sep 14, 2018 at 05:37:30AM -0600, Marc Espie wrote: > CVSROOT: /cvs > Module name: ports > Changes by: es...@cvs.openbsd.org 2018/09/14 05:37:30 > > Modified files: > x11/kde/i18n3 : Makefile.inc > x11/kde4/l10n : Makefile.inc > x11/kde4/l10n/pkg: PFRAG.conflict > > Log message: > stop adding kde5 tools without checking for conflicts, please... This broke all i18n3 kde ports. E=x11/kde/i18n3/lt(exopi-8) x11/kde/i18n3/km(exopi-3) x11/kde/i18n3/eu(exopi-7) x11/kde/i18n3/cy(exopi-7) x11/kde/i18n3/pa(exopi-5) x11/kde/i18n3/rw(exopi-7) x11/kde/i18n3/hi(exopi-3) x11/kde/i1 8n3/af(exopi-5) x11/kde/i18n3/kk(exopi-9) x11/kde/i18n3/gl(exopi-8) x11/kde/i18n3/bs(exopi-5) x11/kde/i18n3/nn(exopi-3) x11/kde/i18n3/az(exopi-7) x11/kde/i18n3/ko(exopi-3) x11/kde/i18n3/th(exopi -6) x11/kde/i18n3/be(exopi-7) x11/kde/i18n3/eo(exopi-1) x11/kde/i18n3/uz(exopi-8) x11/kde/i18n3/uz@cyrillic(exopi-5) x11/kde/i18n3/vi(exopi-9) x11/kde/i18n3/bn(exopi-3) x11/kde/i18n3/lv(exopi-7) x11/kde/i18n3/fy(exopi-6) x11/kde/i18n3/se(exopi-8) x11/kde/i18n3/mn(exopi-1) x11/kde/i18n3/wa(exopi-5) x11/kde/i18n3/csb(exopi-9) x11/kde/i18n3/ss(exopi-7) x11/kde/i18n3/te(exopi-1) ===> Building package for kde-i18n-af-3.5.10p5 Create /exopi-cvs/ports/packages/amd64/all/kde-i18n-af-3.5.10p5.tgz Creating package kde-i18n-af-3.5.10p5 reading plist| Fatal error: can't read packing-list /exopi-cvs/ports/x11/kde/i18n3/af/../pkg/PFRAG.conflict at /usr/libdata/perl5/OpenBSD/PkgCreate.pm line 1351. -- Antoine
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2018/09/15 03:45:15 Modified files: net/py-boto3 : Makefile distinfo Log message: Update to py-boto3-1.9.4.
UPDATE: devel/bison
Straightforward update to the latest stable version.
Test results:
492 tests were successful.
23 tests were skipped.
I don't know if this is supposed to go in before 6.4. To many consumers
so I think someone should put that in a bulk build.
Best regards,
Rafael
Index: Makefile
===
RCS file: /cvs/ports/devel/bison/Makefile,v
retrieving revision 1.55
diff -u -p -u -p -r1.55 Makefile
--- Makefile15 Jul 2018 13:10:46 - 1.55
+++ Makefile15 Sep 2018 08:35:54 -
@@ -2,7 +2,7 @@
COMMENT= GNU parser generator
-DISTNAME= bison-3.0.5
+DISTNAME= bison-3.1
CATEGORIES=devel
MASTER_SITES= ${MASTER_SITE_GNU:=bison/}
Index: distinfo
===
RCS file: /cvs/ports/devel/bison/distinfo,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 distinfo
--- distinfo15 Jul 2018 13:10:46 - 1.11
+++ distinfo15 Sep 2018 08:35:54 -
@@ -1,2 +1,2 @@
-SHA256 (bison-3.0.5.tar.gz) = zTmdK+4zr6cSusSx9ENOIDeem0CZvORxieCadnWi1WY=
-SIZE (bison-3.0.5.tar.gz) = 3580830
+SHA256 (bison-3.1.tar.gz) = p8s2tVMW7uxiaGXAPSpEIQYXoXx9OT7mPYVT4GSe6UY=
+SIZE (bison-3.1.tar.gz) = 3638310
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/bison/pkg/PLIST,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 PLIST
--- pkg/PLIST 15 Jul 2018 13:10:46 - 1.11
+++ pkg/PLIST 15 Sep 2018 08:35:54 -
@@ -39,17 +39,21 @@ share/doc/bison/README
share/doc/bison/THANKS
share/doc/bison/TODO
share/doc/bison/examples/
+share/doc/bison/examples/README
share/doc/bison/examples/calc++/
-share/doc/bison/examples/calc++/calc++-driver.cc
-share/doc/bison/examples/calc++/calc++-driver.hh
-share/doc/bison/examples/calc++/calc++-parser.yy
-share/doc/bison/examples/calc++/calc++-scanner.ll
+share/doc/bison/examples/calc++/Makefile
+share/doc/bison/examples/calc++/README
share/doc/bison/examples/calc++/calc++.cc
+share/doc/bison/examples/calc++/driver.cc
+share/doc/bison/examples/calc++/driver.hh
+share/doc/bison/examples/calc++/parser.yy
+share/doc/bison/examples/calc++/scanner.ll
share/doc/bison/examples/mfcalc/
share/doc/bison/examples/mfcalc/calc.h
share/doc/bison/examples/mfcalc/mfcalc.y
share/doc/bison/examples/rpcalc/
share/doc/bison/examples/rpcalc/rpcalc.y
+share/doc/bison/examples/variant.yy
share/locale/ast/
share/locale/ast/LC_MESSAGES/
share/locale/ast/LC_MESSAGES/bison-runtime.mo
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2018/09/15 02:08:09 Modified files: multimedia/gstreamer-0.10/plugins-ffmpeg: Makefile multimedia/gstreamer-0.10/plugins-ffmpeg/patches: patch-gst-libs_ext_libav_configure Added files: multimedia/gstreamer-0.10/plugins-ffmpeg/patches: patch-gst-libs_ext_libav_libavcodec_arm_asm_S Log message: First step to getting the old FFmpeg code in gst-ffmpeg building on Clang on ARM. Backport a diff to deal with Clang's assembler. from Brad
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2018/09/15 02:05:48 Modified files: sysutils/amazon-ssm-agent: Makefile Log message: Set ONLY_FOR_ARCHS=amd64. Doesn't build on i386 and I don't think we care for AWS. reported by sthen@
Re: UPDATE: shells/zsh
On Sat Sep 08, 2018 at 08:36:29AM +0200, Rafael Sadowski wrote:
> Hi All.
>
> please find below a simple diff to update ZSH to the latest stable
> version. This release includes security fixes: CVE-2018-0502,
> CVE-2018-13259.
>
> Notable port changes:
>
> - Use configure elements instead of post-install tasks.
> -- Avoid version in path name. I don't see any reasons for that, I only
>provide one ZSH version.
> - We need gmake :-(
> - fix tabs
>
> Tested over the last few days.
>
> Best regards,
>
> Rafael Sadowski
>
My final 5.6.2 diff.
Index: Makefile
===
RCS file: /cvs/ports/shells/zsh/Makefile,v
retrieving revision 1.88
diff -u -p -u -p -r1.88 Makefile
--- Makefile21 Apr 2018 09:24:06 - 1.88
+++ Makefile15 Sep 2018 07:59:39 -
@@ -2,7 +2,7 @@
COMMENT= Z shell, Bourne shell-compatible
-V= 5.5.1
+V= 5.6.2
DISTNAME= zsh-$V
CATEGORIES=shells
@@ -10,8 +10,10 @@ MAINTAINER= Pierre-Emmanuel Andre https://www.zsh.org/
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=zsh/}
-MASTER_SITES+= http://www.zsh.org/pub/
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=zsh/} \
+ http://www.zsh.org/pub/
+
+EXTRACT_SUFX= .tar.xz
# BSD
PERMIT_PACKAGE_CDROM= Yes
@@ -23,15 +25,17 @@ LIB_DEPENDS=converters/libiconv \
AUTOCONF_VERSION=2.69
CONFIGURE_STYLE=autoconf
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
-LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib"
+
CONFIGURE_ARGS=--enable-zsh-mem \
--enable-zsh-secure-free \
--enable-maildir-support \
- --with-tcsetpgrp \
+ --enable-function-subdirs \
--enable-multibyte \
--enable-pcre \
- --disable-gdbm
+ --disable-gdbm \
+ --with-tcsetpgrp
SUBST_VARS=V
@@ -42,22 +46,18 @@ TEST_FLAGS= INSTALL_PROGRAM="install -c
INSTALL="install -c" \
TMPPREFIX=${WRKBUILD}/tmp \
TERM=xterm
-EXTFILES= Misc/checkmail Misc/run-help \
- Misc/sticky-note Misc/zcalc \
- Misc/zed Misc/zkbd \
- Calendar/calendar_add Example/cat Example/zless
+
+EXTFILES= Functions/Misc/checkmail Functions/Misc/run-help \
+ Functions/Misc/run-help-ip Functions/Misc/sticky-note \
+ Functions/Misc/zcalc Functions/Misc/zed Functions/Misc/zkbd \
+ Functions/Calendar/calendar_add Functions/Example/cat \
+ Functions/Example/zless Test/ztst.zsh Test/runtests.zsh \
+ Util/reporter Util/check-tmux-state Doc/zsh.texi
pre-configure:
.for i in ${EXTFILES}
sed -i -e "s,/bin/zsh,${TRUEPREFIX}/bin/zsh,g" \
- ${WRKSRC}/Functions/${i}
+ ${WRKSRC}/${i}
.endfor
- @find ${WRKSRC} -name "*.orig" -delete
-
-post-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/zsh/$V/scripts/
-
-pre-test:
- rm -f ${WRKDIR}/bin/chgrp
.include
Index: distinfo
===
RCS file: /cvs/ports/shells/zsh/distinfo,v
retrieving revision 1.28
diff -u -p -u -p -r1.28 distinfo
--- distinfo21 Apr 2018 09:24:34 - 1.28
+++ distinfo15 Sep 2018 07:59:39 -
@@ -1,2 +1,2 @@
-SHA256 (zsh-5.5.1.tar.gz) = d0yqieeupfM8MDPL/9k+KHB/crpRSceXCeSObC0u4IA=
-SIZE (zsh-5.5.1.tar.gz) = 4578700
+SHA256 (zsh-5.6.2.tar.xz) = pQvWbAVX6OyjuPok6F0N5TPnddeiLfBC2pBIhiN1Lp4=
+SIZE (zsh-5.6.2.tar.xz) = 3077368
Index: pkg/PLIST
===
RCS file: /cvs/ports/shells/zsh/pkg/PLIST,v
retrieving revision 1.49
diff -u -p -u -p -r1.49 PLIST
--- pkg/PLIST 21 Apr 2018 09:24:06 - 1.49
+++ pkg/PLIST 15 Sep 2018 07:59:39 -
@@ -61,1103 +61,1165 @@ lib/zsh/${V}/zsh/zutil.so
share/zsh/
share/zsh/${V}/
share/zsh/${V}/functions/
-share/zsh/${V}/functions/VCS_INFO_adjust
-share/zsh/${V}/functions/VCS_INFO_bydir_detect
-share/zsh/${V}/functions/VCS_INFO_check_com
-share/zsh/${V}/functions/VCS_INFO_detect_bzr
-share/zsh/${V}/functions/VCS_INFO_detect_cdv
-share/zsh/${V}/functions/VCS_INFO_detect_cvs
-share/zsh/${V}/functions/VCS_INFO_detect_darcs
-share/zsh/${V}/functions/VCS_INFO_detect_fossil
-share/zsh/${V}/functions/VCS_INFO_detect_git
-share/zsh/${V}/functions/VCS_INFO_detect_hg
-share/zsh/${V}/functions/VCS_INFO_detect_mtn
-share/zsh/${V}/functions/VCS_INFO_detect_p4
-share/zsh/${V}/functions/VCS_INFO_detect_svk
-share/zsh/${V}/functions/VCS_INFO_detect_svn
-share/zsh/${V}/functions/VCS_INFO_detect_tla
-share/zsh/${V}/functions/VCS_INFO_formats
-share/zsh/${V}/functions/VCS_INFO_get_cmd
-share/zsh/${V}/functions/VCS_INFO_get_data_bzr
-share/zsh/${V}/functions/VCS_INFO_get_data_cdv
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2018/09/15 02:00:06 Modified files: sysutils/sysclean: Makefile distinfo Log message: Update to sysclean-2.7. changelog: https://github.com/semarie/sysclean/releases/tag/2.7 from semarie (maintainer)
Re: update: sysutils/sysclean 2.7
On Sat, Sep 15, 2018 at 09:19:33AM +0200, Sebastien Marie wrote:
> Hi,
>
> Here an update for sysclean.
Committed, thanks :-)
>
> It was mostly a release with some stuff waiting in my local
> repository... thanks to aja@ and jmc@ for help and contributions.
>
> ChangeLog:
>
> - add new expected/ignored files
> - letsencrypt-privkey.pem and letsencrypt-staging-privkey.pem
> - pubkeys/ directories for iked an isakmpd (when enabled)
> - run/ and zones/ directory for nsd (when enabled)
>
> - reorder options in man page
>
>
> And while here, a small recall about stuff for iked(8), isakmpd(8) and
> nsd(8): some files are *conditionally* considered in order to let users
> to have simple sysclean.ignore file.
>
> Currently, several base daemons has such configuration in sysclean:
> - accounting (ok, it isn't a daemon)
> - apmd
> - hotplugd
> - iked
> - isakmpd
> - lpd
> - nsd
> - smptd
> - unbound
> - xendom
>
> It means several files or directories for these daemons will, by
> default, not be reported, if the daemon is enabled with rcctl(8).
>
> For example, if you have hotplugd(8) enabled, you will have
> /etc/hotplug/attach or /etc/hotplug/detach automatically skipped in
> sysclean processing (and as soon you disable hotplugd(8), the files
> will be reported).
>
> But it isn't magical ! The list of files per daemon is static and no
> processing of configuration files is done. So if you call
> /etc/my-hotplug-script.sh from /etc/hotplug/attach,
> /etc/my-hotplug-script.sh will be reported. It is only a help for users
> having simple configuration, and /etc/sysclean.ignore should (must ?)
> still be used.
>
> For files/directories from ports, if the port's PLIST is correctly
> configured, sysclean should be aware that some file belong to the port
> and not report them. See @extra and @sample annotation from
> pkg_create(1) man page. But again, nothing magical: some port will need
> manual addition in /etc/sysclean.ignore.
>
> Have fun !
> --
> Sebastien Marie
>
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/sysutils/sysclean/Makefile,v
> retrieving revision 1.17
> diff -u -p -r1.17 Makefile
> --- Makefile 27 Feb 2018 14:05:06 - 1.17
> +++ Makefile 15 Sep 2018 05:25:20 -
> @@ -2,9 +2,8 @@
>
> COMMENT =list obsolete files between OpenBSD upgrades
>
> -V = 2.6
> +V = 2.7
> DISTNAME = sysclean-${V}
> -REVISION = 0
>
> CATEGORIES = sysutils
> HOMEPAGE = https://github.com/semarie/sysclean/
> Index: distinfo
> ===
> RCS file: /cvs/ports/sysutils/sysclean/distinfo,v
> retrieving revision 1.15
> diff -u -p -r1.15 distinfo
> --- distinfo 6 Nov 2017 09:26:48 - 1.15
> +++ distinfo 15 Sep 2018 05:25:26 -
> @@ -1,2 +1,2 @@
> -SHA256 (sysclean-2.6.tar.gz) = PYTQH8gS0D4inwSknz50b9PtWErX2AhmgrHPgkQ3qjs=
> -SIZE (sysclean-2.6.tar.gz) = 5855
> +SHA256 (sysclean-2.7.tar.gz) = 4Ga47353LKWMVodxVYfm85SyZye3ulhcmUZW04LQD0g=
> +SIZE (sysclean-2.7.tar.gz) = 5945
>
--
Antoine
Re: UPDATE mail/s-nail
On Fri, Sep 14, 2018 at 10:26:06PM +0100, Stuart Henderson wrote: > I think it might be a good idea if Steffen takes over as MAINTAINER for this > port .. In the meantime ive pushed the update - but sure :)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2018/09/15 01:40:31 Modified files: sysutils/terraform/provider-alicloud: Makefile distinfo Log message: Update to terraform-provider-alicloud-1.14.0.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2018/09/15 01:26:43 Modified files: security/vault : Makefile distinfo Log message: Update to vault-0.11.1.
update: sysutils/sysclean 2.7
Hi,
Here an update for sysclean.
It was mostly a release with some stuff waiting in my local
repository... thanks to aja@ and jmc@ for help and contributions.
ChangeLog:
- add new expected/ignored files
- letsencrypt-privkey.pem and letsencrypt-staging-privkey.pem
- pubkeys/ directories for iked an isakmpd (when enabled)
- run/ and zones/ directory for nsd (when enabled)
- reorder options in man page
And while here, a small recall about stuff for iked(8), isakmpd(8) and
nsd(8): some files are *conditionally* considered in order to let users
to have simple sysclean.ignore file.
Currently, several base daemons has such configuration in sysclean:
- accounting (ok, it isn't a daemon)
- apmd
- hotplugd
- iked
- isakmpd
- lpd
- nsd
- smptd
- unbound
- xendom
It means several files or directories for these daemons will, by
default, not be reported, if the daemon is enabled with rcctl(8).
For example, if you have hotplugd(8) enabled, you will have
/etc/hotplug/attach or /etc/hotplug/detach automatically skipped in
sysclean processing (and as soon you disable hotplugd(8), the files
will be reported).
But it isn't magical ! The list of files per daemon is static and no
processing of configuration files is done. So if you call
/etc/my-hotplug-script.sh from /etc/hotplug/attach,
/etc/my-hotplug-script.sh will be reported. It is only a help for users
having simple configuration, and /etc/sysclean.ignore should (must ?)
still be used.
For files/directories from ports, if the port's PLIST is correctly
configured, sysclean should be aware that some file belong to the port
and not report them. See @extra and @sample annotation from
pkg_create(1) man page. But again, nothing magical: some port will need
manual addition in /etc/sysclean.ignore.
Have fun !
--
Sebastien Marie
Index: Makefile
===
RCS file: /cvs/ports/sysutils/sysclean/Makefile,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile
--- Makefile27 Feb 2018 14:05:06 - 1.17
+++ Makefile15 Sep 2018 05:25:20 -
@@ -2,9 +2,8 @@
COMMENT = list obsolete files between OpenBSD upgrades
-V =2.6
+V =2.7
DISTNAME = sysclean-${V}
-REVISION = 0
CATEGORIES = sysutils
HOMEPAGE = https://github.com/semarie/sysclean/
Index: distinfo
===
RCS file: /cvs/ports/sysutils/sysclean/distinfo,v
retrieving revision 1.15
diff -u -p -r1.15 distinfo
--- distinfo6 Nov 2017 09:26:48 - 1.15
+++ distinfo15 Sep 2018 05:25:26 -
@@ -1,2 +1,2 @@
-SHA256 (sysclean-2.6.tar.gz) = PYTQH8gS0D4inwSknz50b9PtWErX2AhmgrHPgkQ3qjs=
-SIZE (sysclean-2.6.tar.gz) = 5855
+SHA256 (sysclean-2.7.tar.gz) = 4Ga47353LKWMVodxVYfm85SyZye3ulhcmUZW04LQD0g=
+SIZE (sysclean-2.7.tar.gz) = 5945
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2018/09/15 01:13:37 Modified files: sysutils/consul: Makefile distinfo Log message: Update to consul-1.2.3.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2018/09/15 01:13:26 Modified files: sysutils/packer: Makefile distinfo Log message: Update to packer-1.3.1.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2018/09/15 01:00:09 Modified files: sysutils/terraform/provider-vault: Makefile distinfo Log message: Update to terraform-provider-vault-1.1.2.
