Re: NEW: devel/py-future
On 10/18/17 11:27, Sebastian Reitenbach wrote: Hi remi@ pointed out he just sent a port here a few days ago, find attached the merged version of mine and his version of the port. cheers, Sebastian On Tuesday, October 17, 2017 23:44 CEST, "Sebastian Reitenbach" wrote: cat pkg/DESCR future is the missing compatibility layer between Python 2 and Python 3. It allows you to use a single, clean Python 3.x-compatible codebase to support both Python 2 and Python 3 with minimal overhead. this is a new requirement for textproc/py-commonmark, which is a requirement for www/puppetboard update. comments, OK? Hi, ok rpointel@. Cheers, Remi.
Re: [update] security/polarssl
On Fri, Oct 20 2017, Juan Francisco Cantero Hurtado wrote: [...] > Works fine with hiawatha configured for https. > > Here is a new diff with a little change in CMakeLists.txt. The port was > building with -O0. Hah, I this why I couldn't reproduce. You used DEBUG=-g, didn't you? cmake.port.mk has this: .if defined(DEBUG) CONFIGURE_ARGS += -DCMAKE_BUILD_TYPE:String=Debug MODCMAKE_BUILD_SUFFIX = -debug.cmake .else CONFIGURE_ARGS += -DCMAKE_BUILD_TYPE:String=Release MODCMAKE_BUILD_SUFFIX = -release.cmake .endif So the CMakeLists change is probably a good thing, when I set DEBUG=-g I don't expect the optimization level to be turned down. > OK juanfra@. Thanks for the update. Thanks, committed. There's a bunch of things to backport to 6.2... -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: UPDATE: Aria2-1.33.0
Hi Gonzalo -- On 10/20/17 21:51, Gonzalo L. Rodriguez wrote: Hallo, Update for Aria2 to 1.33.0: https://github.com/aria2/aria2/releases/tag/release-1.33.0 Ok? Comments? Cheers.- I think you need to add back the COMPILER line. This needs C++11, so something like COMPILER = base-clang ports-clang ports-gcc ought to do, to make sure archs that don't have clang in base can still build it. ~Brian
UPDATE: Aria2-1.33.0
Hallo,
Update for Aria2 to 1.33.0:
https://github.com/aria2/aria2/releases/tag/release-1.33.0
Ok? Comments?
Cheers.-
--
Sending from my toaster.
Index: Makefile
===
RCS file: /cvs/ports/www/aria2/Makefile,v
retrieving revision 1.50
diff -u -p -r1.50 Makefile
--- Makefile26 Jul 2017 22:45:31 - 1.50
+++ Makefile21 Oct 2017 01:41:45 -
@@ -3,11 +3,10 @@
BROKEN-alpha = MetalinkParserStateV4Impl.cc:219:1: internal compiler error:
Segmentation fault
COMMENT = lightweight multi-protocol & multi-source download
utility
-V =1.32.0
+V =1.33.0
DISTNAME = aria2-${V}
CATEGORIES = www
HOMEPAGE = https://aria2.github.io/
-REVISION = 0
MAINTAINER = Gonzalo L. R.
@@ -15,8 +14,6 @@ MAINTAINER = Gonzalo L. R. https://github.com/aria2/aria2/releases/download/release-${V}/
-
-COMPILER = gcc
LIB_DEPENDS = databases/sqlite3 \
devel/gettext \
Index: distinfo
===
RCS file: /cvs/ports/www/aria2/distinfo,v
retrieving revision 1.30
diff -u -p -r1.30 distinfo
--- distinfo18 May 2017 16:58:06 - 1.30
+++ distinfo21 Oct 2017 01:41:45 -
@@ -1,2 +1,2 @@
-SHA256 (aria2-1.32.0.tar.gz) = r0Noin+mnye40Va5MqzNrKhHlksIU6YuEz2NhNL50Mo=
-SIZE (aria2-1.32.0.tar.gz) = 3773322
+SHA256 (aria2-1.33.0.tar.gz) = 8ZMRqupBTjHcbt9kG9xDoXP55LDjuuiP6AwNYkhcir0=
+SIZE (aria2-1.33.0.tar.gz) = 3787069
Re: [update] security/polarssl
On Thu, Oct 19, 2017 at 09:51:29AM +0200, Jeremie Courreges-Anglas wrote:
>
> Here's an update to the latest version, tested on amd64. make test
> passes. Some symbols aren't exported any more in all three libraries,
> hence the major bump. Also a patch is needed to build the test suite,
> I took the simple approach. In the end libc may be a better place to
> fix this.
>
> I'd like to push this in before enabling the mbedtls flavor in
> net/openvpn. It looks like some of the changes in this update could
> warrant a backport of some security fixes, I did not investigate this.
> Volunteers welcome.
>
> juanfra, any opinion?
>
> ok?
>
>
> Index: Makefile
> ===
> RCS file: /d/cvs/ports/security/polarssl/Makefile,v
> retrieving revision 1.17
> diff -u -p -r1.17 Makefile
> --- Makefile 18 Oct 2017 19:11:40 - 1.17
> +++ Makefile 19 Oct 2017 07:49:49 -
> @@ -2,22 +2,19 @@
>
> COMMENT= SSL library with an intuitive API and readable source code
>
> -DISTNAME=mbedtls-2.2.1
> -REVISION=1
> +DISTNAME=mbedtls-2.6.0
> EXTRACT_SUFX=-gpl.tgz
>
> # check SOVERSION
> -SHARED_LIBS += mbedtls 2.1
> -SHARED_LIBS += mbedcrypto0.0 # 2.1
> -SHARED_LIBS += mbedx509 0.0 # 2.1
> +SHARED_LIBS += mbedtls 3.0 # 2.6
> +SHARED_LIBS += mbedcrypto1.0 # 2.6
> +SHARED_LIBS += mbedx509 1.0 # 2.6
>
> CATEGORIES= security
>
> HOMEPAGE=https://tls.mbed.org/
>
> -# Dual licensed: GPLv2+/Commercial
> -# name changed from PolarSSL to mbed TLS after the ARM acquisition and a
> -# future update will change the license to Apache.
> +# Dual licensed: GPLv2+/Commercial, Apache v2 is available too
> PERMIT_PACKAGE_CDROM=Yes
>
> # libssl/libcrypto are used for polarssl_o_p_test only
> Index: distinfo
> ===
> RCS file: /d/cvs/ports/security/polarssl/distinfo,v
> retrieving revision 1.10
> diff -u -p -r1.10 distinfo
> --- distinfo 6 Jan 2016 10:59:59 - 1.10
> +++ distinfo 19 Oct 2017 07:32:44 -
> @@ -1,2 +1,2 @@
> -SHA256 (mbedtls-2.2.1-gpl.tgz) = uxv/o6xasUO+Kq49RaepKzYRKIjvRlAk2Dckhl/mKXQ=
> -SIZE (mbedtls-2.2.1-gpl.tgz) = 1848038
> +SHA256 (mbedtls-2.6.0-gpl.tgz) = qZlZ1zYN7yL5EI0tSHyd44T+dsNJaXF2sfIjcAgNWBA=
> +SIZE (mbedtls-2.6.0-gpl.tgz) = 1958070
> Index: patches/patch-CMakeLists_txt
> ===
> RCS file: /d/cvs/ports/security/polarssl/patches/patch-CMakeLists_txt,v
> retrieving revision 1.4
> diff -u -p -r1.4 patch-CMakeLists_txt
> --- patches/patch-CMakeLists_txt 12 Sep 2015 20:30:00 - 1.4
> +++ patches/patch-CMakeLists_txt 19 Oct 2017 07:32:44 -
> @@ -1,7 +1,8 @@
> $OpenBSD: patch-CMakeLists_txt,v 1.4 2015/09/12 20:30:00 sthen Exp $
> CMakeLists.txt.orig Fri Sep 4 13:38:26 2015
> -+++ CMakeLists.txt Tue Sep 8 20:19:54 2015
> -@@ -32,7 +32,6 @@ if(CMAKE_COMPILER_IS_GNUCC)
> +Index: CMakeLists.txt
> +--- CMakeLists.txt.orig
> CMakeLists.txt
> +@@ -70,7 +70,6 @@ if(CMAKE_COMPILER_IS_GNUCC)
> if (GCC_VERSION VERSION_GREATER 4.8 OR GCC_VERSION VERSION_EQUAL 4.8)
> set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wshadow")
> endif()
> @@ -9,7 +10,7 @@ $OpenBSD: patch-CMakeLists_txt,v 1.4 201
> set(CMAKE_C_FLAGS_DEBUG "-O0 -g3")
> set(CMAKE_C_FLAGS_COVERAGE"-O0 -g3 --coverage")
> set(CMAKE_C_FLAGS_ASAN"-Werror -fsanitize=address -fno-common
> -O3")
> -@@ -43,7 +42,6 @@ endif(CMAKE_COMPILER_IS_GNUCC)
> +@@ -81,7 +80,6 @@ endif(CMAKE_COMPILER_IS_GNUCC)
>
> if(CMAKE_COMPILER_IS_CLANG)
> set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -W
> -Wdeclaration-after-statement -Wwrite-strings -Wpointer-arith
> -Wimplicit-fallthrough -Wshadow")
> Index: patches/patch-include_mbedtls_config_h
> ===
> RCS file:
> /d/cvs/ports/security/polarssl/patches/patch-include_mbedtls_config_h,v
> retrieving revision 1.1
> diff -u -p -r1.1 patch-include_mbedtls_config_h
> --- patches/patch-include_mbedtls_config_h27 Aug 2016 07:46:50 -
> 1.1
> +++ patches/patch-include_mbedtls_config_h19 Oct 2017 07:32:44 -
> @@ -3,9 +3,10 @@ $OpenBSD: patch-include_mbedtls_config_h
> MBEDTLS_THREADING_PTHREAD and MBEDTLS_THREADING_C are required by
> www/hiawatha.
>
> include/mbedtls/config.h.origSat Aug 27 03:17:22 2016
> -+++ include/mbedtls/config.h Sat Aug 27 03:18:03 2016
> -@@ -1246,7 +1246,7 @@
> +Index: include/mbedtls/config.h
> +--- include/mbedtls/config.h.orig
> include/mbedtls/config.h
> +@@ -1385,7 +1385,7 @@
>*
>* Uncomment this to enable pthread mutexes.
>*/
> @@ -14,7 +15,7 @@ www/hiawatha.
>
> /**
>* \def MBEDTLS_VERSION_FEATURES
> -@@ -2261,7 +2261,7 @@
> +@@
Re: net/zabbix SSH flavor?
+cc maintainer
On Fri, Oct 20 2017, William Leuschner wrote:
> I discovered an issue with my patch for compiling net/zabbix with SSH by
> default. Namely, I didn't bump the REVISION, so openup automatically
> reinstalled it. Below is an updated version of the patch, with a
> REVISION bump. Also, portcheck reported an absolute path in
> pkg/README-server, so I rectified that as well.
Looks good and seems to build properly (but REVISION starts at 0).
> Index: Makefile
> ===
> RCS file: /cvs/ports/net/zabbix/Makefile,v
> retrieving revision 1.128
> diff -u -p -r1.128 Makefile
> --- Makefile 26 Jul 2017 17:54:44 - 1.128
> +++ Makefile 20 Oct 2017 18:31:00 -
> @@ -5,6 +5,7 @@ COMMENT-server = network and application
> COMMENT-web =network and application monitoring - web
> frontend
>
> VERSION =3.2.7
> +REVISION = 1
> DISTNAME = zabbix-${VERSION}
> FULLPKGNAME-main = zabbix-agent-${VERSION}
> FULLPKGPATH-main = net/zabbix,-main
> @@ -46,12 +47,13 @@ RUN_DEPENDS-main =
> LIB_DEPENDS-server = ${LIB_DEPENDS} \
> textproc/libxml \
> net/net-snmp \
> - textproc/iksemel
> + textproc/iksemel \
> + security/libssh2
> RUN_DEPENDS-server = net/fping
> # we want the _zabbix user&group as well as README-main
> RUN_DEPENDS-server +=net/zabbix,-main>=${VERSION}
> WANTLIB-server = ${WANTLIB} crypto ssl z netsnmp iksemel pthread \
> - xml2
> + xml2 ssh2
>
> CONFIGURE_STYLE =gnu
> CONFIGURE_ARGS = --enable-server \
> @@ -62,7 +64,8 @@ CONFIGURE_ARGS =--enable-server \
> --with-libxml2 \
> --with-net-snmp \
> --with-ldap \
> - --with-jabber="${LOCALBASE}"
> + --with-jabber="${LOCALBASE}" \
> + --with-ssh2
> CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include" \
> LDFLAGS="-L${LOCALBASE}/lib -lexecinfo" \
> ac_cv_search___res_query=no
> Index: pkg/README-server
> ===
> RCS file: /cvs/ports/net/zabbix/pkg/README-server,v
> retrieving revision 1.11
> diff -u -p -r1.11 README-server
> --- pkg/README-server 17 Jul 2015 20:38:43 - 1.11
> +++ pkg/README-server 20 Oct 2017 18:31:00 -
> @@ -98,7 +98,7 @@ automatically created and initialized if
> for obvious performance reasons, it is NOT encouraged to use the SQLite
> backend for a server.
>
> -# cd /usr/local/share/zabbix/schema/sqlite3
> +# cd ${TRUEPREFIX}/share/zabbix/schema/sqlite3
> # su -m _zabbix -c "sqlite3 /var/db/zabbix/zabbix.db < schema.sql"
> The following steps are not required for setting up a Zabbix Proxy.
> # su -m _zabbix -c "sqlite3 /var/db/zabbix/zabbix.db < images.sql"
>
>
> ───
> William Leuschner
> wel2...@rit.edu
>
> On 10/6/2017 1:57 PM, William Leuschner wrote:
>> ping
>>
>> ─
>> William Leuschner
>> wel2...@rit.edu
>>
>> On 9/25/2017 1:17 PM, William Leuschner wrote:
>>> Ah, that did it! Thank you for the pointers. The now-fixed patch is
>>> below. Comments?
>>> ───
>>> William Leuschner
>>> wel2...@rit.edu
>>>
>>> Index: Makefile
>>> ===
>>> RCS file: /cvs/ports/net/zabbix/Makefile,v
>>> retrieving revision 1.122
>>> diff -u -p -r1.122 Makefile
>>> --- Makefile7 Jul 2016 18:47:32 - 1.122
>>> +++ Makefile22 Sep 2017 18:29:39 -
>>> @@ -29,7 +29,7 @@ MODPHP_BUILDDEP = No
>>>
>>> MULTI_PACKAGES = -main -web
>>> PSEUDO_FLAVORS = no_server
>>> -FLAVORS = mysql pgsql sqlite3
>>> +FLAVORS = mysql pgsql sqlite3 ssh
>>>
>>> SUBST_VARS += PREFIX-web ZABBIX_WEB MAJV
>>>
>>> @@ -77,7 +77,7 @@ FLAVOR = sqlite3
>>> #if non-backend-related flavors are added, add them to
>>> #the following line as ":L:Nflavor1:Nflavor2" so that
>>> #they don't trigger a "Conflicting flavors" error.
>>> -BACKEND = ${FLAVOR}
>>> +BACKEND = ${FLAVOR:L:Nssh}
>>> .if ${BACKEND} == "mysql"
>>> MULTI_PACKAGES += -server
>>> LIB_DEPENDS-server += databases/mariadb,-main
>>> @@ -97,6 +97,13 @@ CONFIGURE_ARGS += --disable-server \
>>> --disable-proxy
>>> .else
>>> ERRORS += "Fatal: Conflicting flavors: ${FLAVOR}";
>>> +.endif
>>> +
>>> +# Include libssh if the ssh flavor is requested
>>> +.if ${FLAVOR:Mssh}
>>> +LIB_DEPENDS-server += security/libssh2
>>> +WANTLIB-server += ssh2
>>> +CONFIGURE_ARGS += --with-ssh2
>>> .endif
>>>
>>> pre-configure:
>>>
>>> On 9/21/2017 5:24 PM, Nigel Taylor wrote:
$ cd /usr/ports/mystuff/net/zabbix
$ do
[NEW] sysutils/docker-machine 0.13.0
Hi ports@, I've recently ported docker-machine, the management client used to install Docker Engine on virtual hosts (local via Ubuntu or CentOS on VMM(4) or remote), and manage the hosts with docker-machine commands. For details on docker-machine: https://docs.docker.com/machine/overview/ --- Note: docker-machine is a different command than "docker," which many people know, provided by the Docker CLI project. The docker cli uses environment settings configurable by docker-machine (this port). I have a functioning build of docker cli and am currently working on the port. --- I've never created a port before, so I'm hoping I can get a few people to test and review. Please let me know what should be changed as I'm confident I missed something! For more details on some of the changes I've made to accomodate OpenBSD, please see my: - docker-machine fork: https://github.com/voutilad/machine/tree/openbsd - docker-cli fork: https://github.com/voutilad/cli/tree/openbsd (For those curious, you should be able to clone those and build them following the respective projects's build procedure, assuming you've installed lang/go.) Some things to note in the currently proposed version of the port: - "make test" should run the equivalent of the docker-machine project's test suite including linters, yet currenly it cannot perform integration tests - there is currently no manpage...the upstream project doesn't have one I've begun trying to upstream some changes and have PR's open with Docker, which I'm sure will be met with requests to further upstream to dependent Go packages. This will be a process. In the mean time, I'll be working on hacking together the port of docker cli. -Dave docker-machine.tar.gz Description: GNU Zip compressed data
Re: UPDATE: editors/le 1.16.3 => 1.16.5
On Sun, Oct 15, 2017 at 12:58:22AM -0400, Brian Callahan wrote: > Attached is a routine maintenance update to editors/le. Happily, the one > patch we have goes away. > One thing of note is that now le comes with a .desktop and icon files. That > would require RDEPS on devel/desktop-file-utils and x11/gtk+3,-guic, which > seemed like overkill for a terminal-based text editor, so I added a > post-install routine that removes those files from the package. Makes sense to me, we are doing the same in net/lftp (from the same author). > OK? OK fcambus@
[new] security/gopass 1.5.0
Hi! gopass is a security/password-store compatible password utility. It is MIT licensed, written in Go and has some nitfy features like "sub stores"! >From DESCR: gopass is a rewrite of the pass password manager in Go with the aim of making it cross-platform and adding additional features. Our target audience are professional developers and sysadmins (and especially teams of those) who are well versed with a command line interface. One explicit goal for this project is to make it more approachable to non-technical users. We go by the UNIX philosophy and try to do one thing and do it well, providing a stellar user experience and a sane, simple interface. OK to import? Cheers, Aaron -- PGP: 0x1F81112D62A9ADCE / 3586 3350 BFEA C101 DB1A 4AF0 1F81 112D 62A9 ADCE gopass-1.5.0.tgz Description: application/tar-gz
Re: [UPDATE] emulators/virtualjaguar to 2.1.3
On Sun, Oct 08, 2017 at 11:59:13AM +0200, Rafael Sadowski wrote:
> first I ran into the following issue:
>
> -SHA256 (virtualjaguar-2.1.3.tar.bz2) =
> WyyPztHfVkYko33R0CCYlHcFkdaXY4c8/rcUQ1n+Xw4=
> -SIZE (virtualjaguar-2.1.3.tar.bz2) = 2921212
> +SHA256 (virtualjaguar-2.1.3.tar.bz2) =
> E9DDh6ZZH9I8nOzYQxg0ytRVIjdJRee8zAJ286cgHOo=
> +SIZE (virtualjaguar-2.1.3.tar.bz2) = 292
Indeed, upstream rerolled tarball as they got the release version wrong.
> and then into:
>
> --
> |$OpenBSD: patch-Makefile,v 1.1 2017/03/14 10:43:23 fcambus Exp $
> |Index: Makefile
> |--- Makefile.orig
> |+++ Makefile
> --
> Patching file Makefile using Plan A...
> Hunk #1 succeeded at 24.
> Hunk #2 failed at 56.
> Hunk #3 succeeded at 65.
> 1 out of 3 hunks failed--saving rejects to Makefile.rej
> done
> ***> patch-Makefile did not apply cleanly
Consequently, there is no need to patch this in Makefile anymore :)
Here is an updated diff:
Index: Makefile
===
RCS file: /cvs/ports/emulators/virtualjaguar/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- Makefile26 Jul 2017 22:45:20 - 1.8
+++ Makefile19 Oct 2017 20:55:37 -
@@ -2,8 +2,8 @@
COMMENT = Atari Jaguar emulator
-DISTNAME = virtualjaguar-2.1.2
-REVISION = 1
+V =2.1.3
+DISTNAME = virtualjaguar-${V}
EXTRACT_SUFX = .tar.bz2
CATEGORIES = emulators games
@@ -15,16 +15,17 @@ MAINTAINER =Frederic Cambus https://icculus.org/virtualjaguar/tarballs/
-MODULES = x11/qt4
+MODULES = x11/qt5
-LIB_DEPENDS = devel/sdl
+LIB_DEPENDS = audio/libcdio \
+ devel/sdl
-WRKDIST = ${WRKDIR}/virtualjaguar
+WRKDIST = ${WRKDIR}/linux-${V}
USE_GMAKE =Yes
MAKE_FLAGS = CC="${CC}" \
@@ -37,9 +38,6 @@ MAKE_FLAGS = CC="${CC}" \
MAKE_ENV = CXXFLAGS="${CXXFLAGS}"
NO_TEST = Yes
-
-pre-configure:
- @ln -s ${LOCALBASE}/bin/qmake4 ${WRKDIR}/bin/qmake
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/virtualjaguar ${PREFIX}/bin
Index: distinfo
===
RCS file: /cvs/ports/emulators/virtualjaguar/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo1 Aug 2016 00:16:53 - 1.1.1.1
+++ distinfo19 Oct 2017 20:55:37 -
@@ -1,2 +1,2 @@
-SHA256 (virtualjaguar-2.1.2.tar.bz2) =
BNrFGYV++euiTibBq3xz2LlFmcYTqSJZCCYiiWYXU2g=
-SIZE (virtualjaguar-2.1.2.tar.bz2) = 2917041
+SHA256 (virtualjaguar-2.1.3.tar.bz2) =
E9DDh6ZZH9I8nOzYQxg0ytRVIjdJRee8zAJ286cgHOo=
+SIZE (virtualjaguar-2.1.3.tar.bz2) = 292
Index: patches/patch-Makefile
===
RCS file: /cvs/ports/emulators/virtualjaguar/patches/patch-Makefile,v
retrieving revision 1.1
diff -u -p -r1.1 patch-Makefile
--- patches/patch-Makefile 14 Mar 2017 10:43:23 - 1.1
+++ patches/patch-Makefile 19 Oct 2017 20:55:37 -
@@ -1,6 +1,7 @@
$OpenBSD: patch-Makefile,v 1.1 2017/03/14 10:43:23 fcambus Exp $
Makefile.orig Fri Oct 10 15:54:48 2014
-+++ Makefile Mon Mar 13 17:25:21 2017
+Index: Makefile
+--- Makefile.orig
Makefile
@@ -24,8 +24,8 @@ QMAKE_EXTRA := -spec macx-g++
endif
@@ -12,3 +13,12 @@ $OpenBSD: patch-Makefile,v 1.1 2017/03/1
# Add CPPFLAGS
CFLAGS += $(CPPFLAGS)
+@@ -65,7 +65,7 @@ virtualjaguar: sources libs makefile-qt
+
+ makefile-qt: virtualjaguar.pro
+ @echo -e "\033[01;33m***\033[00;32m Creating Qt makefile...\033[00m"
+- $(Q)$(CROSS)qmake -qt=5 $(QMAKE_EXTRA) virtualjaguar.pro -o makefile-qt
++ $(Q)$(CROSS)qmake-qt5 $(QMAKE_EXTRA) virtualjaguar.pro -o makefile-qt
+
+ libs: obj/libm68k.a obj/libjaguarcore.a
+ @echo -e "\033[01;33m***\033[00;32m Libraries successfully
made.\033[00m"
Index: patches/patch-src_cdintf_cpp
===
RCS file: patches/patch-src_cdintf_cpp
diff -N patches/patch-src_cdintf_cpp
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_cdintf_cpp19 Oct 2017 20:55:37 -
@@ -0,0 +1,23 @@
+$OpenBSD$
+
+Index: src/cdintf.cpp
+--- src/cdintf.cpp.orig
src/cdintf.cpp
+@@ -36,7 +36,7 @@
+
+
+ #ifdef HAVE_LIB_CDIO
+-static CdIo_t * cdHandle = NULL;
++static CdIo_t * cdHandle = (CdIo_t *)NULL;
+ #endif
+
+ // Exported vars
+@@ -54,7 +54,7 @@ bool CDIntfInit(void)
+ // fails, the emulated CD-ROM will not use any of the other CDIntf*
+ // functions. Those functions all operate under the assumption that the
open
+ // call was successful.
+- cdHandle = cdio_open(NULL, DRIVER_DEVICE);
++ cdHandle = cdio_open((const char *)NULL, DRIVER_DEVICE);
+
+ if (cdHandle == NULL)
+ {
Index: patches/patch-virtualjaguar_pro
===
RCS file: /cvs/ports/emulators/virtualjaguar/patc
UPDATE net/mininet
Hi all, This is a minor update undoing an unneeded change (that also seemed buggy) that I made while porting. OK? Thanks, Ayaka Index: patches/patch-mininet_node_py === RCS file: /cvs/ports/net/mininet/patches/patch-mininet_node_py,v retrieving revision 1.3 diff -u -p -u -r1.3 patch-mininet_node_py --- patches/patch-mininet_node_py 16 Sep 2017 06:03:05 - 1.3 +++ patches/patch-mininet_node_py 20 Oct 2017 18:45:38 - @@ -904,24 +904,19 @@ Index: mininet/node.py pstr = ':%d ' % self.port clist = servers[ 0:1 ] + [ s for s in servers if pstr in s ] raise Exception( "Please shut down the controller which is" -@@ -1405,9 +1026,13 @@ class Controller( Node ): +@@ -1405,7 +1026,10 @@ class Controller( Node ): self.execed = False def stop( self, *args, **kwargs ): -"Stop controller." --self.cmd( 'kill %' + self.command ) --self.cmd( 'wait %' + self.command ) +""" + Stop controller. Find processes associated with the command, and kill -+ them. ++them. + """ -+pids = " ".join( self.cmd( 'pgrep ' + self.command ).split( '\n' ) ) -+self.cmd( 'pkill ' + pids + ' 2>/dev/null' ) -+self.cmd( 'wait ' + pids ) + self.cmd( 'kill %' + self.command ) + self.cmd( 'wait %' + self.command ) super( Controller, self ).stop( *args, **kwargs ) - - def IP( self, intf=None ): -@@ -1470,12 +1095,19 @@ class NOX( Controller ): +@@ -1470,12 +1094,19 @@ class NOX( Controller ): class Ryu( Controller ): "Controller to run Ryu application" @@ -943,7 +938,7 @@ Index: mininet/node.py if not ryuArgs: warn( 'warning: no Ryu modules specified; ' 'running simple_switch only\n' ) -@@ -1538,7 +1170,50 @@ class RemoteController( Controller ): +@@ -1538,7 +1169,50 @@ class RemoteController( Controller ): else: return True
Re: net/zabbix SSH flavor?
I discovered an issue with my patch for compiling net/zabbix with SSH by
default. Namely, I didn't bump the REVISION, so openup automatically
reinstalled it. Below is an updated version of the patch, with a
REVISION bump. Also, portcheck reported an absolute path in
pkg/README-server, so I rectified that as well.
Index: Makefile
===
RCS file: /cvs/ports/net/zabbix/Makefile,v
retrieving revision 1.128
diff -u -p -r1.128 Makefile
--- Makefile26 Jul 2017 17:54:44 - 1.128
+++ Makefile20 Oct 2017 18:31:00 -
@@ -5,6 +5,7 @@ COMMENT-server =network and application
COMMENT-web = network and application monitoring - web frontend
VERSION = 3.2.7
+REVISION = 1
DISTNAME = zabbix-${VERSION}
FULLPKGNAME-main = zabbix-agent-${VERSION}
FULLPKGPATH-main = net/zabbix,-main
@@ -46,12 +47,13 @@ RUN_DEPENDS-main =
LIB_DEPENDS-server = ${LIB_DEPENDS} \
textproc/libxml \
net/net-snmp \
- textproc/iksemel
+ textproc/iksemel \
+ security/libssh2
RUN_DEPENDS-server = net/fping
# we want the _zabbix user&group as well as README-main
RUN_DEPENDS-server += net/zabbix,-main>=${VERSION}
WANTLIB-server = ${WANTLIB} crypto ssl z netsnmp iksemel pthread \
- xml2
+ xml2 ssh2
CONFIGURE_STYLE = gnu
CONFIGURE_ARGS = --enable-server \
@@ -62,7 +64,8 @@ CONFIGURE_ARGS = --enable-server \
--with-libxml2 \
--with-net-snmp \
--with-ldap \
- --with-jabber="${LOCALBASE}"
+ --with-jabber="${LOCALBASE}" \
+ --with-ssh2
CONFIGURE_ENV =CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -lexecinfo" \
ac_cv_search___res_query=no
Index: pkg/README-server
===
RCS file: /cvs/ports/net/zabbix/pkg/README-server,v
retrieving revision 1.11
diff -u -p -r1.11 README-server
--- pkg/README-server 17 Jul 2015 20:38:43 - 1.11
+++ pkg/README-server 20 Oct 2017 18:31:00 -
@@ -98,7 +98,7 @@ automatically created and initialized if
for obvious performance reasons, it is NOT encouraged to use the SQLite
backend for a server.
-# cd /usr/local/share/zabbix/schema/sqlite3
+# cd ${TRUEPREFIX}/share/zabbix/schema/sqlite3
# su -m _zabbix -c "sqlite3 /var/db/zabbix/zabbix.db < schema.sql"
The following steps are not required for setting up a Zabbix Proxy.
# su -m _zabbix -c "sqlite3 /var/db/zabbix/zabbix.db < images.sql"
───
William Leuschner
wel2...@rit.edu
On 10/6/2017 1:57 PM, William Leuschner wrote:
> ping
>
> ─
> William Leuschner
> wel2...@rit.edu
>
> On 9/25/2017 1:17 PM, William Leuschner wrote:
>> Ah, that did it! Thank you for the pointers. The now-fixed patch is
>> below. Comments?
>> ───
>> William Leuschner
>> wel2...@rit.edu
>>
>> Index: Makefile
>> ===
>> RCS file: /cvs/ports/net/zabbix/Makefile,v
>> retrieving revision 1.122
>> diff -u -p -r1.122 Makefile
>> --- Makefile 7 Jul 2016 18:47:32 - 1.122
>> +++ Makefile 22 Sep 2017 18:29:39 -
>> @@ -29,7 +29,7 @@ MODPHP_BUILDDEP = No
>>
>> MULTI_PACKAGES =-main -web
>> PSEUDO_FLAVORS =no_server
>> -FLAVORS = mysql pgsql sqlite3
>> +FLAVORS = mysql pgsql sqlite3 ssh
>>
>> SUBST_VARS += PREFIX-web ZABBIX_WEB MAJV
>>
>> @@ -77,7 +77,7 @@ FLAVOR = sqlite3
>> #if non-backend-related flavors are added, add them to
>> #the following line as ":L:Nflavor1:Nflavor2" so that
>> #they don't trigger a "Conflicting flavors" error.
>> -BACKEND = ${FLAVOR}
>> +BACKEND = ${FLAVOR:L:Nssh}
>> .if ${BACKEND} == "mysql"
>> MULTI_PACKAGES += -server
>> LIB_DEPENDS-server += databases/mariadb,-main
>> @@ -97,6 +97,13 @@ CONFIGURE_ARGS += --disable-server \
>> --disable-proxy
>> .else
>> ERRORS += "Fatal: Conflicting flavors: ${FLAVOR}";
>> +.endif
>> +
>> +# Include libssh if the ssh flavor is requested
>> +.if ${FLAVOR:Mssh}
>> +LIB_DEPENDS-server += security/libssh2
>> +WANTLIB-server += ssh2
>> +CONFIGURE_ARGS += --with-ssh2
>> .endif
>>
>> pre-configure:
>>
>> On 9/21/2017 5:24 PM, Nigel Taylor wrote:
>>>
>>> $ cd /usr/ports/mystuff/net/zabbix
>>> $ doas make configure
>>> $ cd /usr/ports/pobj/zabbix-3.2.7-mysql/zabbix-3.2.7
>>> $ ./configure --help | grep -i ssh
>>> If you want to use SSH2 based checks:
>>> --with-ssh2[=DIR] use SSH2 package [default=no], DIR is the SSH2
>>>
>>> I don't see a --with-ssh option
>
Re: NEW: sysutils/lscpu
On 10/20/2017 11:34 AM, Jeremie Courreges-Anglas wrote: > On Fri, Oct 20 2017, Brian Callahan wrote: >> Hi ports -- >> >> Attached is a new port: sysutils/lscpu, a utility to gather and display >> CPU architecture information. It is a *BSD clone of the Linux command of >> the same name. >> >> --- >> pkg/DESCR: >> lscpu gathers CPU architecture information about the current CPU. The >> command output is optimized for parsing or for easy readability by >> humans. The information includes, for example, the number of CPUs, >> threads, cores, and sockets. >> >> There is also information about the CPU caches, family, model, byte >> order, and stepping. >> --- >> >> It works best on amd64 and i386 architectures for now, but upstream says >> all architectures will display something and hopes to have more >> architectures display more information in the future. > I doubt that it builds on !(x86). lscpu.c includes > unconditionally; that header is only installed on x86, and begins > with: > > #if !(__x86_64__ || __i386__) > #error this header is for x86 only > #endif > >> OK? > ok with ONLY_FOR_ARCHS = i386 amd64 added > Thanks for the catch--will have to poke upstream to keep their promise about this working everywhere! :) ~Brian
Re: NEW: sysutils/lscpu
On Fri, Oct 20 2017, Brian Callahan wrote: > Hi ports -- > > Attached is a new port: sysutils/lscpu, a utility to gather and display > CPU architecture information. It is a *BSD clone of the Linux command of > the same name. > > --- > pkg/DESCR: > lscpu gathers CPU architecture information about the current CPU. The > command output is optimized for parsing or for easy readability by > humans. The information includes, for example, the number of CPUs, > threads, cores, and sockets. > > There is also information about the CPU caches, family, model, byte > order, and stepping. > --- > > It works best on amd64 and i386 architectures for now, but upstream says > all architectures will display something and hopes to have more > architectures display more information in the future. I doubt that it builds on !(x86). lscpu.c includes unconditionally; that header is only installed on x86, and begins with: #if !(__x86_64__ || __i386__) #error this header is for x86 only #endif > OK? ok with ONLY_FOR_ARCHS = i386 amd64 added -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
NEW: sysutils/lscpu
Hi ports -- Attached is a new port: sysutils/lscpu, a utility to gather and display CPU architecture information. It is a *BSD clone of the Linux command of the same name. --- pkg/DESCR: lscpu gathers CPU architecture information about the current CPU. The command output is optimized for parsing or for easy readability by humans. The information includes, for example, the number of CPUs, threads, cores, and sockets. There is also information about the CPU caches, family, model, byte order, and stepping. --- It works best on amd64 and i386 architectures for now, but upstream says all architectures will display something and hopes to have more architectures display more information in the future. OK? ~Brian lscpu.tgz Description: Binary data
Re: UPDATE: textproc/lowdown
On Fri, Oct 20, 2017 at 02:28:01PM +0200, Jeremie Courreges-Anglas wrote: > On Fri, Oct 20 2017, Anton Lindqvist wrote: > > Hi, > > Update lowdown to 0.3.0 from maintainer. Changelog can be found here[1]. > > > > Comments? > > ''make clean all DEBUG=whatever'' doesn't pass "whatever" in CFLAGS. > I fail to see how CFLAGS are passed to the underlying build system. > This is already the case with lowdown-0.2.7, but it would be good to fix > this. I will take this upstream and make sure its fixed until the next release.
Re: UPDATE: textproc/lowdown
On Fri, Oct 20 2017, Anton Lindqvist wrote: > Hi, > Update lowdown to 0.3.0 from maintainer. Changelog can be found here[1]. > > Comments? ''make clean all DEBUG=whatever'' doesn't pass "whatever" in CFLAGS. I fail to see how CFLAGS are passed to the underlying build system. This is already the case with lowdown-0.2.7, but it would be good to fix this. > OK? ok > [1] https://kristaps.bsd.lv/lowdown/archive.html > > Index: Makefile > === > RCS file: /cvs/ports/textproc/lowdown/Makefile,v > retrieving revision 1.7 > diff -u -p -r1.7 Makefile > --- Makefile 5 Oct 2017 08:08:19 - 1.7 > +++ Makefile 20 Oct 2017 09:23:11 - > @@ -2,7 +2,7 @@ > > COMMENT =simple markdown translator > > -DISTNAME = lowdown-0.2.7 > +DISTNAME = lowdown-0.3.0 > CATEGORIES = textproc > > HOMEPAGE = https://kristaps.bsd.lv/lowdown/ > Index: distinfo > === > RCS file: /cvs/ports/textproc/lowdown/distinfo,v > retrieving revision 1.7 > diff -u -p -r1.7 distinfo > --- distinfo 5 Oct 2017 08:08:19 - 1.7 > +++ distinfo 20 Oct 2017 09:23:11 - > @@ -1,2 +1,2 @@ > -SHA256 (lowdown-0.2.7.tar.gz) = yWwQXCMUhIQ6jTjot96ySO93NoEJU7kon2E/7513feE= > -SIZE (lowdown-0.2.7.tar.gz) = 72312 > +SHA256 (lowdown-0.3.0.tar.gz) = VJWimSJ+SSQbokFQZcCj8y7TM0g023qmEdZcXSy9V+c= > +SIZE (lowdown-0.3.0.tar.gz) = 86661 > Index: pkg/PLIST > === > RCS file: /cvs/ports/textproc/lowdown/pkg/PLIST,v > retrieving revision 1.4 > diff -u -p -r1.4 PLIST > --- pkg/PLIST 5 Oct 2017 08:08:19 - 1.4 > +++ pkg/PLIST 20 Oct 2017 09:23:11 - > @@ -1,5 +1,6 @@ > @comment $OpenBSD: PLIST,v 1.4 2017/10/05 08:08:19 anton Exp $ > @bin bin/lowdown > +@bin bin/lowdown-diff > include/lowdown.h > lib/liblowdown.a > @man man/man1/lowdown.1 > -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: NEW: textproc/py-sphinx_guzzle_theme
On Thu, 19 Oct 2017 07:19:27 +0200, Björn Ketelaars
wrote:
Thanks! I just imported it with a minor tweak
> MODULES = lang/python
>
> +RUN_DEPENDS =textproc/py-sphinx${MODPY_FLAVOR}
> +
> MODPY_PI = Yes
> MODPY_SETUPTOOLS = Yes
I put the RDEP line after the MODPY lines to follow the usual order or
py-ports Makefile.
Re: UPDATE: www/py-flask-wtf 0.9.4 to 0.14.2
On 2017/10/19 10:43, Sebastian Reitenbach wrote:
> Hi,
>
> My bad, bcallah@ pointed out that it's not building with python 2.7, seems I
> only tested with python3 flavor.
>
> The post-install running sphinx fails, the get_distribution('Flask-WTF') for
> setuptools works well
> with the python3 flavor, but fails with a DistributionNotFound error with
> python 2.7.
> The current version doesn't use get_distribution there, but just had the
> version and release
> hardcoded, so I took the same approach.
>
> If someone has a cluebat why the get_distribution() call fails with
> python2.7, I'd be all ears,
> otherwise, this seems to do the trick.
Have you asked upstream? If people are having problems using it on py2.7
they'd probably like to know..
Re: NEW: textproc/py-sphinx_guzzle_theme
On 2017/10/19 07:19, Björn Ketelaars wrote: > I agree. Included in the attached port is the diff below...OK? Yes, OK sthen@ to import.
UPDATE: textproc/lowdown
Hi, Update lowdown to 0.3.0 from maintainer. Changelog can be found here[1]. Comments? OK? [1] https://kristaps.bsd.lv/lowdown/archive.html Index: Makefile === RCS file: /cvs/ports/textproc/lowdown/Makefile,v retrieving revision 1.7 diff -u -p -r1.7 Makefile --- Makefile5 Oct 2017 08:08:19 - 1.7 +++ Makefile20 Oct 2017 09:23:11 - @@ -2,7 +2,7 @@ COMMENT = simple markdown translator -DISTNAME = lowdown-0.2.7 +DISTNAME = lowdown-0.3.0 CATEGORIES = textproc HOMEPAGE = https://kristaps.bsd.lv/lowdown/ Index: distinfo === RCS file: /cvs/ports/textproc/lowdown/distinfo,v retrieving revision 1.7 diff -u -p -r1.7 distinfo --- distinfo5 Oct 2017 08:08:19 - 1.7 +++ distinfo20 Oct 2017 09:23:11 - @@ -1,2 +1,2 @@ -SHA256 (lowdown-0.2.7.tar.gz) = yWwQXCMUhIQ6jTjot96ySO93NoEJU7kon2E/7513feE= -SIZE (lowdown-0.2.7.tar.gz) = 72312 +SHA256 (lowdown-0.3.0.tar.gz) = VJWimSJ+SSQbokFQZcCj8y7TM0g023qmEdZcXSy9V+c= +SIZE (lowdown-0.3.0.tar.gz) = 86661 Index: pkg/PLIST === RCS file: /cvs/ports/textproc/lowdown/pkg/PLIST,v retrieving revision 1.4 diff -u -p -r1.4 PLIST --- pkg/PLIST 5 Oct 2017 08:08:19 - 1.4 +++ pkg/PLIST 20 Oct 2017 09:23:11 - @@ -1,5 +1,6 @@ @comment $OpenBSD: PLIST,v 1.4 2017/10/05 08:08:19 anton Exp $ @bin bin/lowdown +@bin bin/lowdown-diff include/lowdown.h lib/liblowdown.a @man man/man1/lowdown.1
