CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: feine...@cvs.openbsd.org2020/08/14 23:11:03 Modified files: telephony/coturn: Makefile distinfo telephony/coturn/patches: patch-src_client_ns_turn_msg_c Log message: Update to coturn 4.5.1.3
LLVM 10: build failures on amd64 2020-08-13
The remaining build failures on amd64 due to the LLVM 10 update: devel/py-llvmlite,python3 needs update to 0.34.0 devel/rttr games/fs2open print/scribus productivity/aqbanking x11/gnustep/back\ -fuse-ld=bfd not passed through x11/gnustep/renaissance / sebastia@ is looking into it Logs: http://build-failures.rhaalovely.net/amd64/2020-08-07/ -- Christian "naddy" Weisgerber na...@mips.inka.de
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: na...@cvs.openbsd.org 2020/08/14 13:42:19 Modified files: security/p5-Crypt-OpenPGP: Makefile Log message: bump the revived p5-Crypt-OpenPGP, the plist has changed
Hidden gmake dependency in net/ekg
===> Faking installation for ekg-1.7p3 cd src && /usr/local/bin/gmake all /bin/sh: /usr/local/bin/gmake: not found *** Error 127 in /usr/obj/ports/ekg-1.7/ekg-1.7 (Makefile:21 'ekg') Apparently ekg will detect gmake and try using it. So if it is there during configure and gets junked, boom. This diff adds USE_GMAKE to avoid this. ok? --Kurt Index: Makefile === RCS file: /cvs/ports/net/ekg/Makefile,v retrieving revision 1.13 diff -u -p -r1.13 Makefile --- Makefile12 Jul 2019 20:48:25 - 1.13 +++ Makefile14 Aug 2020 19:06:07 - @@ -3,7 +3,7 @@ COMMENT= Gadu-Gadu IM protocol client DISTNAME= ekg-1.7 -REVISION= 3 +REVISION= 4 CATEGORIES=net HOMEPAGE= http://ekg.chmurka.net/ @@ -26,6 +26,8 @@ CONFIGURE_ARGS= --enable-dynamic \ --without-libjpeg \ --without-libgsm \ --without-libungif + +USE_GMAKE= Yes NO_TEST= Yes
Re: UPDATE: usockets, uwebsockets
On 7/30/20 6:50 AM, Aisha Tammy wrote:
> Hi,
> I am reattaching update because of a recent release
>
> usockets0.4.1 -> 0.5.0
> uwebsockets 18.6.0 -> 18.10.0
>
> Aisha
>
Newer update patch attached
usockets0.4.1 -> 0.5.0
uwebsockets 18.6.0 -> 18.11.0
Thanks,
Aisha
diff --git a/net/usockets/Makefile b/net/usockets/Makefile
index 7e544a0459a..f781ecdcda4 100644
--- a/net/usockets/Makefile
+++ b/net/usockets/Makefile
@@ -4,11 +4,11 @@ COMMENT = eventing, networking & crypto for async applications
PKGNAME = ${DISTNAME:L}
CATEGORIES = net
-SHARED_LIBS = usockets 0.1
+SHARED_LIBS = usockets 1.0
GH_ACCOUNT = uNetworking
GH_PROJECT = uSockets
-GH_TAGNAME = v0.4.1
+GH_TAGNAME = v0.5.0
MAINTAINER = Aisha Tammy
diff --git a/net/usockets/distinfo b/net/usockets/distinfo
index d2274543c1d..5837a7f2434 100644
--- a/net/usockets/distinfo
+++ b/net/usockets/distinfo
@@ -1,2 +1,2 @@
-SHA256 (uSockets-0.4.1.tar.gz) = IPj38LIjXztH8e/zyRgZIAA/HLyN9hcg2rpsui0Toa4=
-SIZE (uSockets-0.4.1.tar.gz) = 49955
+SHA256 (uSockets-0.5.0.tar.gz) = y6wQ2b+maGIk2LDsG8wO56LYpThy73Teoq7V0NjWedw=
+SIZE (uSockets-0.5.0.tar.gz) = 50852
diff --git a/net/usockets/patches/patch-Makefile b/net/usockets/patches/patch-Makefile
index 1a54aa5a606..af77b0b1b19 100644
--- a/net/usockets/patches/patch-Makefile
+++ b/net/usockets/patches/patch-Makefile
@@ -10,7 +10,7 @@ Index: Makefile
+DESTDIR ?=
+
+prefix ?= "/usr/local"
-+exec_prefix ?= "$(prefix)"
++exec_prefix ?= "$(prefix)"
+libdir ?= "$(exec_prefix)/lib"
+includedir?= "$(exec_prefix)/include/uSockets"
+
@@ -18,31 +18,24 @@ Index: Makefile
+LIBTARGET = libusockets.so.$(LIBusockets_VERSION)
+
+
- # WITH_OPENSSL=1 enables OpenSSL 1.1+ support
+ # WITH_OPENSSL=1 enables OpenSSL 1.1+ support or BoringSSL
ifeq ($(WITH_OPENSSL),1)
override CFLAGS += -DLIBUS_USE_OPENSSL
-@@ -33,18 +44,38 @@ ifeq ($(WITH_ASAN),1)
+@@ -33,18 +44,32 @@ ifeq ($(WITH_ASAN),1)
endif
override CFLAGS += -std=c11 -Isrc
-override LDFLAGS += uSockets.a
-# By default we build the uSockets.a static library
--default:
-+static:
+ default:
rm -f *.o
- $(CC) $(CFLAGS) -flto -O3 -c src/*.c src/eventing/*.c src/crypto/*.c
- $(AR) rvs uSockets.a *.o
-+ $(CC) $(CFLAGS) -c src/*.c src/eventing/*.c src/crypto/*.c
-+ $(AR) rvs libusockets.a *.o
-
-+dynamic:
-+ rm -f *.o
+ $(CC) -fPIC -c src/*.c src/eventing/*.c src/crypto/*.c $(CFLAGS)
++ $(AR) rvs libusockets.a *.o
+ $(CC) -shared -fPIC -Wl,-soname,$(LIBTARGET) $(CFLAGS) -o $(LIBTARGET) *.o $(LDFLAGS)
-+
-+default: static dynamic
-+
+
+install:
+ # install the folders needed (making sure that the exist)
+ install -d "$(DESTDIR)$(libdir)" \
@@ -66,7 +59,7 @@ Index: Makefile
swift_examples:
swiftc -O -I . examples/swift_http_server/main.swift uSockets.a -o swift_http_server
-@@ -52,4 +83,5 @@ swift_examples:
+@@ -52,4 +77,5 @@ swift_examples:
clean:
rm -f *.o
rm -f *.a
diff --git a/www/uwebsockets/Makefile b/www/uwebsockets/Makefile
index eff11b90171..fd45b98216a 100644
--- a/www/uwebsockets/Makefile
+++ b/www/uwebsockets/Makefile
@@ -6,7 +6,7 @@ CATEGORIES = www
GH_ACCOUNT = uNetworking
GH_PROJECT = uWebSockets
-GH_TAGNAME = v18.6.0
+GH_TAGNAME = v18.11.0
MAINTAINER = Aisha Tammy
diff --git a/www/uwebsockets/distinfo b/www/uwebsockets/distinfo
index 9b39396f50c..9f3ad29806a 100644
--- a/www/uwebsockets/distinfo
+++ b/www/uwebsockets/distinfo
@@ -1,2 +1,2 @@
-SHA256 (uWebSockets-18.6.0.tar.gz) = XwrkPmmqPFj8OgV/c4ESuOSn0h3wP5C7C0nGkN15npo=
-SIZE (uWebSockets-18.6.0.tar.gz) = 264309
+SHA256 (uWebSockets-18.11.0.tar.gz) = XVQCic9zxyYm91gJKs7gzm1Ro9x0bof/VPmPR48ta9A=
+SIZE (uWebSockets-18.11.0.tar.gz) = 267042
Re: llvm10 and libtheoraplay on i386
On Fri, Aug 14 2020, Christian Weisgerber wrote:
> Jeremie Courreges-Anglas:
>
>> > Shared libraries should be linked with -fpic/-fPIC.
>>
>> naddy committed a fix using -fPIC which is safe to use on all arches.
>>
>> (I don't know if ports should use ${PICFLAG} from bsd.own.mk when
>> practical, but a few ports do it already.)
>
> Once upon a time, it was decided that ports should just use -fPIC
> and not bother with the -fpic/-fPIC distinction.
I didn't know that, I'm glad I asked.
Thanks,
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs
Module name:ports
Changes by: matth...@cvs.openbsd.org2020/08/14 12:12:55
Modified files:
x11/openbox: Makefile
Log message:
Remove bogus use of ${SHELL}. While there, fix WANTLIB.
ok naddy@
Re: NEW: audio/zynaddsubfx
Ping On Tue, August 4, 2020 06:59, Dimitri Karamazov wrote: > On Sun, July 26, 2020 03:32, Dimitri Karamazov wrote: > >> On Sat, July 25, 2020 20:44, Stuart Henderson wrote: >> >> >>> On 2020/07/25 18:30, Dimitri Karamazov wrote: >>> >>> >>> Any comments? >>> >>> >>> just use normal patches (plus SUBST_CMD if necessary e.g. where you are >>> adding X11BASE) rather than seds please. >>> >>> patch the input cmake file not the generated build.ninja file (don't assume >>> that it's using ninja to build, >>> sometimes there are reasons to not use this) >>> >>> >> Hi, and thanks for the comments! >> >> >> >> I've made all the appropriate changes, let me know if there are any more. >> Also corrected the patch file names. >> I hope this gets in, it's an important synthesizer, probably the most >> exhaustive imho. >> >> I'll try Zyn-fusion sometime later, it has a more in place Gui. >> Compare that to the default which is really a rabbit hole of tabs, >> and difficult to deal with on some wm's. >> >> OK? >> >> >> >> regards, Dimitri > Nobody interested in taking this in? There have been a couple of requests > for this port in the mailing list. >
aarch64 bulk build report
bulk build on arm64.ports.openbsd.org started on Tue Aug 11 11:20:13 MDT 2020 finished at Fri Aug 14 11:43:37 MDT 2020 lasted 3D00h23m done with kern.version=OpenBSD 6.7-current (GENERIC.MP) #762: Tue Aug 11 03:10:48 MDT 2020 built packages:10782 Aug 11:3653 Aug 12:1037 Aug 13:3152 Aug 14:2939 critical path missing pkgs: http://build-failures.rhaalovely.net/aarch64/2020-08-11/summary.log build failures: 23 http://build-failures.rhaalovely.net/aarch64/2020-08-11/converters/wv2.log http://build-failures.rhaalovely.net/aarch64/2020-08-11/devel/py-llvmlite,python3.log http://build-failures.rhaalovely.net/aarch64/2020-08-11/devel/rttr.log http://build-failures.rhaalovely.net/aarch64/2020-08-11/editors/calligra.log http://build-failures.rhaalovely.net/aarch64/2020-08-11/editors/xwpe.log http://build-failures.rhaalovely.net/aarch64/2020-08-11/emulators/vice.log http://build-failures.rhaalovely.net/aarch64/2020-08-11/games/fs2open.log http://build-failures.rhaalovely.net/aarch64/2020-08-11/graphics/vulkan-tools.log http://build-failures.rhaalovely.net/aarch64/2020-08-11/lang/pfe.log http://build-failures.rhaalovely.net/aarch64/2020-08-11/math/R.log http://build-failures.rhaalovely.net/aarch64/2020-08-11/math/coq.log http://build-failures.rhaalovely.net/aarch64/2020-08-11/net/bro.log http://build-failures.rhaalovely.net/aarch64/2020-08-11/net/libtorrent-rasterbar.log http://build-failures.rhaalovely.net/aarch64/2020-08-11/print/scribus.log http://build-failures.rhaalovely.net/aarch64/2020-08-11/productivity/aqbanking.log http://build-failures.rhaalovely.net/aarch64/2020-08-11/sysutils/libvirt.log http://build-failures.rhaalovely.net/aarch64/2020-08-11/sysutils/nomad.log http://build-failures.rhaalovely.net/aarch64/2020-08-11/sysutils/rclone.log http://build-failures.rhaalovely.net/aarch64/2020-08-11/sysutils/telegraf.log http://build-failures.rhaalovely.net/aarch64/2020-08-11/sysutils/terragrunt.log http://build-failures.rhaalovely.net/aarch64/2020-08-11/x11/e17/elementary.log http://build-failures.rhaalovely.net/aarch64/2020-08-11/x11/qt5/qtwebengine.log http://build-failures.rhaalovely.net/aarch64/2020-08-11/x11/qt5/qtwebkit.log recurrent failures failures/devel/py-llvmlite,python3.log failures/devel/rttr.log failures/editors/xwpe.log failures/lang/pfe.log failures/net/bro.log failures/net/libtorrent-rasterbar.log failures/sysutils/nomad.log failures/sysutils/rclone.log failures/sysutils/telegraf.log failures/sysutils/terragrunt.log new failures +++ ls-failures Fri Aug 14 11:43:53 2020 +failures/converters/wv2.log +failures/editors/calligra.log +failures/emulators/vice.log +failures/games/fs2open.log +failures/graphics/vulkan-tools.log +failures/math/R.log +failures/math/coq.log +failures/print/scribus.log +failures/productivity/aqbanking.log +failures/sysutils/libvirt.log +failures/x11/e17/elementary.log +failures/x11/qt5/qtwebengine.log +failures/x11/qt5/qtwebkit.log resolved failures --- ../old/aarch64/last//ls-failuresSun Aug 9 17:59:06 2020 -failures/security/libgcrypt.log -failures/textproc/source-highlight.log
Re: [UPDATE] www/py-webpy 0.40 -> 0.61
On Fri 14/08/2020 23:11, Kevin Lo wrote:
> Hi ports@,
>
> Here's an update of py-webpy to 0.61; tested on amd64.
> Changelog here: https://github.com/webpy/webpy/blob/master/ChangeLog.txt#L3
>
> Ok?
>
> diff 97d8ad9fab2eb4471daa9889eccb062257734419 /usr/ports
> blob - 775663595f625596e030122a20f619d5b0215a11
> file + www/Makefile
> --- www/Makefile
> +++ www/Makefile
> @@ -511,7 +511,6 @@
> SUBDIR += py-webob
> SUBDIR += py-webob,python3
> SUBDIR += py-webpy
> - SUBDIR += py-webpy,python3
> SUBDIR += py-webtest
> SUBDIR += py-webtest,python3
> SUBDIR += py-werkzeug
> blob - a7ce4677e2aecb89976b05a7d24fd3f623579c30
> file + www/py-webpy/Makefile
> --- www/py-webpy/Makefile
> +++ www/py-webpy/Makefile
> @@ -2,10 +2,9 @@
>
> COMMENT= web framework for python
>
> -MODPY_EGG_VERSION= 0.40
> +MODPY_EGG_VERSION= 0.61
> DISTNAME=web.py-${MODPY_EGG_VERSION}
> PKGNAME= py-webpy-${MODPY_EGG_VERSION}
> -REVISION=1
>
> CATEGORIES= www
>
> @@ -21,11 +20,9 @@ MODULES= lang/python
> MODPY_PI=Yes
> MODPY_PYTEST=Yes
> MODPY_SETUPTOOLS=Yes
> +MODPY_VERSION= ${MODPY_DEFAULT_VERSION_3}
^^^
I would prefer to use FLAVORS/FLAVOR as it seems that py-webpy is not a
standalone python tool. Note that this also requires a different change
to www/Makefile, @@conflict- and @pkgpath-markers in pkg/PLIST, and a
quirk:
diff --git devel/quirks/Makefile devel/quirks/Makefile
index 310690b339e..ddb9f081af4 100644
--- devel/quirks/Makefile
+++ devel/quirks/Makefile
@@ -5,7 +5,7 @@ CATEGORIES =devel databases
DISTFILES =
# API.rev
-PKGNAME = quirks-3.402
+PKGNAME = quirks-3.403
PKG_ARCH = *
MAINTAINER = Marc Espie
diff --git devel/quirks/files/Quirks.pm devel/quirks/files/Quirks.pm
index 0281c4ac939..e1a7e457c0a 100644
--- devel/quirks/files/Quirks.pm
+++ devel/quirks/files/Quirks.pm
@@ -459,6 +459,7 @@ my $stem_extensions = {
'py-ecos' => 'py3-ecos',
'py-numexpr' => 'py3-numexpr',
'py-notmuch' => 'py3-notmuch',
+ 'py-webpy' => 'py3-webpy',
};
my $obsolete_reason = {
diff --git www/Makefile www/Makefile
index 775663595f6..538199c2f9b 100644
--- www/Makefile
+++ www/Makefile
@@ -510,7 +510,6 @@
SUBDIR += py-webhelpers
SUBDIR += py-webob
SUBDIR += py-webob,python3
- SUBDIR += py-webpy
SUBDIR += py-webpy,python3
SUBDIR += py-webtest
SUBDIR += py-webtest,python3
diff --git www/py-webpy/Makefile www/py-webpy/Makefile
index a7ce4677e2a..fd48f19727f 100644
--- www/py-webpy/Makefile
+++ www/py-webpy/Makefile
@@ -2,10 +2,9 @@
COMMENT= web framework for python
-MODPY_EGG_VERSION= 0.40
+MODPY_EGG_VERSION= 0.61
DISTNAME= web.py-${MODPY_EGG_VERSION}
PKGNAME= py-webpy-${MODPY_EGG_VERSION}
-REVISION= 1
CATEGORIES=www
@@ -22,10 +21,9 @@ MODPY_PI=Yes
MODPY_PYTEST= Yes
MODPY_SETUPTOOLS= Yes
-RUN_DEPENDS= textproc/py-markdown${MODPY_FLAVOR} \
- www/py-cheroot${MODPY_FLAVOR}
+RUN_DEPENDS= www/py-cheroot${MODPY_FLAVOR}
FLAVORS= python3
-FLAVOR ?=
+FLAVOR=python3
.include
diff --git www/py-webpy/distinfo www/py-webpy/distinfo
index aef5d002c0e..a9e764d69d7 100644
--- www/py-webpy/distinfo
+++ www/py-webpy/distinfo
@@ -1,2 +1,2 @@
-SHA256 (web.py-0.40.tar.gz) = 3F5C/7xC130H91t6zKmXWjNormCXdOSd3rtJenhBMfM=
-SIZE (web.py-0.40.tar.gz) = 103781
+SHA256 (web.py-0.61.tar.gz) = x6kIGusIbNPnA8dVOkfudRiNHTJfJe7HZU2bsAtezLs=
+SIZE (web.py-0.61.tar.gz) = 623070
diff --git www/py-webpy/patches/patch-tests_test_wsgi_py
www/py-webpy/patches/patch-tests_test_wsgi_py
deleted file mode 100644
index 996b5bce82d..000
--- www/py-webpy/patches/patch-tests_test_wsgi_py
+++ /dev/null
@@ -1,56 +0,0 @@
-$OpenBSD: patch-tests_test_wsgi_py,v 1.1 2019/10/04 15:06:31 kevlo Exp $
-
-- Fix unit tests in tests/test_wsgi.py
- upstream commit a345caedd53ea690b8804d461ae4d941b3a849b4
-
-Index: tests/test_wsgi.py
tests/test_wsgi.py.orig
-+++ tests/test_wsgi.py
-@@ -1,9 +1,15 @@
- import unittest
--import web
- import threading
- import time
-
-+try: # PY 3
-+from urllib.parse import unquote_to_bytes as unquote
-+except ImportError: # PY 2
-+from urllib import unquote
-
-+import web
-+
-+
- class WSGITest(unittest.TestCase):
- def test_layers_unicode(self):
- urls = ("/", "uni")
-@@ -18,7 +24,7 @@ class WSGITest(unittest.TestCase):
- thread.start()
- time.sleep(0.5)
-
--b = web.browser.Browser()
-+b = web.browser.AppBrowser(app)
- r = b.open("/").read()
- s = r.decode("utf8")
- self.assertEqual(s, u"\u0C05\u0C06")
-@@ -39,7 +45,7 @@ class WSGITest(unittest.TestCase):
- thread.start()
- time.sleep(0.5)
-
--b = web.browser.Browser()
-+b = web.browser.AppBrowser(app)
- r = b.open("/")
- self.assertEqual(r.read(), b"abcdef")
-
Re: [UPDATE] www/py-webpy 0.40 -> 0.61
Please remove MODPY_VERSION, use
FLAVORS=python3
FLAVOR=python3
in Makefile, @pkgpath www/py-webpy in pkg/PLIST, keep the ,python3 in
../Makefile and add a py-webpy -> py3-webpy entry to devel/quirks (see
commits for recent py2->3 conversions).
--
Sent from a phone, apologies for poor formatting.
On 14 August 2020 16:11:35 Kevin Lo wrote:
Hi ports@,
Here's an update of py-webpy to 0.61; tested on amd64.
Changelog here: https://github.com/webpy/webpy/blob/master/ChangeLog.txt#L3
Ok?
diff 97d8ad9fab2eb4471daa9889eccb062257734419 /usr/ports
blob - 775663595f625596e030122a20f619d5b0215a11
file + www/Makefile
--- www/Makefile
+++ www/Makefile
@@ -511,7 +511,6 @@
SUBDIR += py-webob
SUBDIR += py-webob,python3
SUBDIR += py-webpy
- SUBDIR += py-webpy,python3
SUBDIR += py-webtest
SUBDIR += py-webtest,python3
SUBDIR += py-werkzeug
blob - a7ce4677e2aecb89976b05a7d24fd3f623579c30
file + www/py-webpy/Makefile
--- www/py-webpy/Makefile
+++ www/py-webpy/Makefile
@@ -2,10 +2,9 @@
COMMENT=web framework for python
-MODPY_EGG_VERSION= 0.40
+MODPY_EGG_VERSION= 0.61
DISTNAME= web.py-${MODPY_EGG_VERSION}
PKGNAME=py-webpy-${MODPY_EGG_VERSION}
-REVISION= 1
CATEGORIES= www
@@ -21,11 +20,9 @@ MODULES= lang/python
MODPY_PI= Yes
MODPY_PYTEST= Yes
MODPY_SETUPTOOLS= Yes
+MODPY_VERSION= ${MODPY_DEFAULT_VERSION_3}
-RUN_DEPENDS= textproc/py-markdown${MODPY_FLAVOR} \
- www/py-cheroot${MODPY_FLAVOR}
-FLAVORS= python3
-FLAVOR ?=
+RUN_DEPENDS= www/py-cheroot${MODPY_FLAVOR}
.include
blob - aef5d002c0e971963a5a92f9dd563821789f1e04
file + www/py-webpy/distinfo
--- www/py-webpy/distinfo
+++ www/py-webpy/distinfo
@@ -1,2 +1,2 @@
-SHA256 (web.py-0.40.tar.gz) = 3F5C/7xC130H91t6zKmXWjNormCXdOSd3rtJenhBMfM=
-SIZE (web.py-0.40.tar.gz) = 103781
+SHA256 (web.py-0.61.tar.gz) = x6kIGusIbNPnA8dVOkfudRiNHTJfJe7HZU2bsAtezLs=
+SIZE (web.py-0.61.tar.gz) = 623070
blob - 996b5bce82d3634d3215db8b82a614db4284b160
file + /dev/null
--- www/py-webpy/patches/patch-tests_test_wsgi_py
+++ www/py-webpy/patches/patch-tests_test_wsgi_py
@@ -1,56 +0,0 @@
-$OpenBSD: patch-tests_test_wsgi_py,v 1.1 2019/10/04 15:06:31 kevlo Exp $
-
-- Fix unit tests in tests/test_wsgi.py
- upstream commit a345caedd53ea690b8804d461ae4d941b3a849b4
-
-Index: tests/test_wsgi.py
tests/test_wsgi.py.orig
-+++ tests/test_wsgi.py
-@@ -1,9 +1,15 @@
- import unittest
--import web
- import threading
- import time
-
-+try: # PY 3
-+from urllib.parse import unquote_to_bytes as unquote
-+except ImportError: # PY 2
-+from urllib import unquote
-
-+import web
-+
-+
- class WSGITest(unittest.TestCase):
- def test_layers_unicode(self):
- urls = ("/", "uni")
-@@ -18,7 +24,7 @@ class WSGITest(unittest.TestCase):
- thread.start()
- time.sleep(0.5)
-
--b = web.browser.Browser()
-+b = web.browser.AppBrowser(app)
- r = b.open("/").read()
- s = r.decode("utf8")
- self.assertEqual(s, u"\u0C05\u0C06")
-@@ -39,7 +45,7 @@ class WSGITest(unittest.TestCase):
- thread.start()
- time.sleep(0.5)
-
--b = web.browser.Browser()
-+b = web.browser.AppBrowser(app)
- r = b.open("/")
- self.assertEqual(r.read(), b"abcdef")
-
-@@ -59,9 +65,10 @@ class WSGITest(unittest.TestCase):
- thread.start()
- time.sleep(0.5)
-
--b = web.browser.Browser()
-+b = web.browser.AppBrowser(app)
- r = b.open("/%E2%84%A6")
--self.assertEqual(r.read(), b"\xE2\x84\xA6")
-+s = unquote(r.read())
-+self.assertEqual(s, b"\xE2\x84\xA6")
-
- app.stop()
- thread.join()
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2020/08/14 11:19:50 Modified files: net/mosquitto : Makefile distinfo Removed files: net/mosquitto/patches: patch-lib_socks_mosq_c patch-src_CMakeLists_txt Log message: update to mosquitto-1.6.11
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2020/08/14 11:18:35 Modified files: x11/gnome/shell-extensions: Makefile distinfo Log message: update to gnome-shell-extensions-3.36.3
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2020/08/14 11:18:31 Modified files: x11/gnome/mutter: Makefile distinfo Log message: update to mutter-3.36.5
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2020/08/14 11:18:35 Modified files: x11/gnome/shell: Makefile distinfo Log message: update to gnome-shell-3.36.5
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2020/08/14 11:15:56 Modified files: devel/cutter : Makefile distinfo Log message: update to cutter-1.11.1
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2020/08/14 11:14:47 Modified files: x11/gnome/file-roller: Makefile distinfo x11/gnome/file-roller/pkg: PLIST Log message: update to file-roller-3.36.3
Re: synapse filepaths + rc script query
On 8/14/20 1:08 PM, Tom Wong-Cornall wrote: On Tue, Aug 11 '20 at 19.06 NZST, Renaud Allard wrote: Indeed, config files could be stored in the more standard /etc, but that will be a breaking change if I do that now. Fair enough. Could it be symlinked during a transition period? I'm sure it's my own hangups but editing config files in /var feels weird :) I agree, byt synctl is the documented way to start synapse, that's why I choose it. Also fair enough, I found synctl had issues tracking synapse' state in earlier versions so I didn't trust it. Could have been user error, it seems to work fine in your port. BTW: on the most recent version, all of the scripts get dumped into /usr/local/share/synapse -- apart from export_signing_key and generate_log_config. These are just left in /usr/local/bin, which is probably not intended. The below diff makes sure all scripts (no matter what new ones they add) get placed in /usr/local/share/synapse, and gets rid of the for loop: Thank you, I will integrate that diff into version 1.19, which will be out very soon I think. smime.p7s Description: S/MIME Cryptographic Signature
[UPDATE] www/py-webpy 0.40 -> 0.61
Hi ports@,
Here's an update of py-webpy to 0.61; tested on amd64.
Changelog here: https://github.com/webpy/webpy/blob/master/ChangeLog.txt#L3
Ok?
diff 97d8ad9fab2eb4471daa9889eccb062257734419 /usr/ports
blob - 775663595f625596e030122a20f619d5b0215a11
file + www/Makefile
--- www/Makefile
+++ www/Makefile
@@ -511,7 +511,6 @@
SUBDIR += py-webob
SUBDIR += py-webob,python3
SUBDIR += py-webpy
- SUBDIR += py-webpy,python3
SUBDIR += py-webtest
SUBDIR += py-webtest,python3
SUBDIR += py-werkzeug
blob - a7ce4677e2aecb89976b05a7d24fd3f623579c30
file + www/py-webpy/Makefile
--- www/py-webpy/Makefile
+++ www/py-webpy/Makefile
@@ -2,10 +2,9 @@
COMMENT= web framework for python
-MODPY_EGG_VERSION= 0.40
+MODPY_EGG_VERSION= 0.61
DISTNAME= web.py-${MODPY_EGG_VERSION}
PKGNAME= py-webpy-${MODPY_EGG_VERSION}
-REVISION= 1
CATEGORIES=www
@@ -21,11 +20,9 @@ MODULES= lang/python
MODPY_PI= Yes
MODPY_PYTEST= Yes
MODPY_SETUPTOOLS= Yes
+MODPY_VERSION= ${MODPY_DEFAULT_VERSION_3}
-RUN_DEPENDS= textproc/py-markdown${MODPY_FLAVOR} \
- www/py-cheroot${MODPY_FLAVOR}
-FLAVORS= python3
-FLAVOR ?=
+RUN_DEPENDS= www/py-cheroot${MODPY_FLAVOR}
.include
blob - aef5d002c0e971963a5a92f9dd563821789f1e04
file + www/py-webpy/distinfo
--- www/py-webpy/distinfo
+++ www/py-webpy/distinfo
@@ -1,2 +1,2 @@
-SHA256 (web.py-0.40.tar.gz) = 3F5C/7xC130H91t6zKmXWjNormCXdOSd3rtJenhBMfM=
-SIZE (web.py-0.40.tar.gz) = 103781
+SHA256 (web.py-0.61.tar.gz) = x6kIGusIbNPnA8dVOkfudRiNHTJfJe7HZU2bsAtezLs=
+SIZE (web.py-0.61.tar.gz) = 623070
blob - 996b5bce82d3634d3215db8b82a614db4284b160
file + /dev/null
--- www/py-webpy/patches/patch-tests_test_wsgi_py
+++ www/py-webpy/patches/patch-tests_test_wsgi_py
@@ -1,56 +0,0 @@
-$OpenBSD: patch-tests_test_wsgi_py,v 1.1 2019/10/04 15:06:31 kevlo Exp $
-
-- Fix unit tests in tests/test_wsgi.py
- upstream commit a345caedd53ea690b8804d461ae4d941b3a849b4
-
-Index: tests/test_wsgi.py
tests/test_wsgi.py.orig
-+++ tests/test_wsgi.py
-@@ -1,9 +1,15 @@
- import unittest
--import web
- import threading
- import time
-
-+try: # PY 3
-+from urllib.parse import unquote_to_bytes as unquote
-+except ImportError: # PY 2
-+from urllib import unquote
-
-+import web
-+
-+
- class WSGITest(unittest.TestCase):
- def test_layers_unicode(self):
- urls = ("/", "uni")
-@@ -18,7 +24,7 @@ class WSGITest(unittest.TestCase):
- thread.start()
- time.sleep(0.5)
-
--b = web.browser.Browser()
-+b = web.browser.AppBrowser(app)
- r = b.open("/").read()
- s = r.decode("utf8")
- self.assertEqual(s, u"\u0C05\u0C06")
-@@ -39,7 +45,7 @@ class WSGITest(unittest.TestCase):
- thread.start()
- time.sleep(0.5)
-
--b = web.browser.Browser()
-+b = web.browser.AppBrowser(app)
- r = b.open("/")
- self.assertEqual(r.read(), b"abcdef")
-
-@@ -59,9 +65,10 @@ class WSGITest(unittest.TestCase):
- thread.start()
- time.sleep(0.5)
-
--b = web.browser.Browser()
-+b = web.browser.AppBrowser(app)
- r = b.open("/%E2%84%A6")
--self.assertEqual(r.read(), b"\xE2\x84\xA6")
-+s = unquote(r.read())
-+self.assertEqual(s, b"\xE2\x84\xA6")
-
- app.stop()
- thread.join()
Re: UPDATE net/vpnc-scripts
On Fri 07/08/2020 18:56, Bjorn Ketelaars wrote: > On Wed 29/07/2020 15:37, Bjorn Ketelaars wrote: > > On Wed 22/07/2020 09:33, Bjorn Ketelaars wrote: > > > Update vpnc-scripts to the latest version. While here: > > > - Change HOMEPAGE and MASTER_SITES. Upstream has moved to gitlab.com > > > - Take MAINTAINER > > > > > > Tested with openconnect connecting to ocserv. > > > > > > Comments/OK? > > > > Ping! > > > > Diff enclosed for your convenience: > > Ping...anyone? It seems that I'm the only user of vpnc-scripts. I will commit tomorrow...unless someone objects.
Re: llvm10 and libtheoraplay on i386
Jeremie Courreges-Anglas:
> > Shared libraries should be linked with -fpic/-fPIC.
>
> naddy committed a fix using -fPIC which is safe to use on all arches.
>
> (I don't know if ports should use ${PICFLAG} from bsd.own.mk when
> practical, but a few ports do it already.)
Once upon a time, it was decided that ports should just use -fPIC
and not bother with the -fpic/-fPIC distinction.
--
Christian "naddy" Weisgerber na...@mips.inka.de
[update] security/sshguard: 2.3.1 --> 2.4.1
Please find a diff for updating sshguard from 2.3.1 to 2.4.1 attached.
Regards,
Andreas
--
Andreas (Kusalananda) Kähäri
SciLifeLab, NBIS, ICM
Uppsala University, Sweden
.
Index: Makefile
===
RCS file: /extra/cvs/ports/security/sshguard/Makefile,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile
--- Makefile12 Jul 2019 20:49:37 - 1.15
+++ Makefile14 Aug 2020 08:22:10 -
@@ -2,7 +2,7 @@
COMMENT= protect against brute force attacks on sshd and others
-DISTNAME= sshguard-2.3.1
+DISTNAME= sshguard-2.4.1
CATEGORIES=security
HOMEPAGE= https://www.sshguard.net/
Index: distinfo
===
RCS file: /extra/cvs/ports/security/sshguard/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo29 Mar 2019 15:54:24 - 1.4
+++ distinfo14 Aug 2020 13:02:36 -
@@ -1,2 +1,2 @@
-SHA256 (sshguard-2.3.1.tar.gz) = dpBV4m33j0vKNMmnrPJl36IkwFWzPO1H9T1Vv2WdIKI=
-SIZE (sshguard-2.3.1.tar.gz) = 765330
+SHA256 (sshguard-2.4.1.tar.gz) = h10C5uZ9ztYUeQ7V42rvEWDt6pQPNTp5MGy7GFKvPGc=
+SIZE (sshguard-2.4.1.tar.gz) = 723940
Index: patches/patch-src_blocker_blocker_c
===
RCS file:
/extra/cvs/ports/security/sshguard/patches/patch-src_blocker_blocker_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_blocker_blocker_c
--- patches/patch-src_blocker_blocker_c 29 Mar 2019 15:54:24 - 1.1
+++ patches/patch-src_blocker_blocker_c 14 Aug 2020 13:06:38 -
@@ -3,7 +3,7 @@ $OpenBSD: patch-src_blocker_blocker_c,v
Index: src/blocker/blocker.c
--- src/blocker/blocker.c.orig
+++ src/blocker/blocker.c
-@@ -139,7 +139,8 @@ int main(int argc, char *argv[]) {
+@@ -117,7 +117,8 @@ int main(int argc, char *argv[]) {
/* termination signals */
signal(SIGTERM, sigfin_handler);
Index: patches/patch-src_sshguard_in
===
RCS file: /extra/cvs/ports/security/sshguard/patches/patch-src_sshguard_in,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_sshguard_in
--- patches/patch-src_sshguard_in 29 Mar 2019 15:54:24 - 1.1
+++ patches/patch-src_sshguard_in 14 Aug 2020 13:06:48 -
@@ -3,9 +3,9 @@ $OpenBSD: patch-src_sshguard_in,v 1.1 20
Index: src/sshguard.in
--- src/sshguard.in.orig
+++ src/sshguard.in
-@@ -5,6 +5,9 @@
- # entire process group (subshell) on exit/interrupts.
- trap "trap - TERM && kill 0" INT TERM EXIT
+@@ -1,6 +1,9 @@
+ #!/bin/sh
+ # sshguard -- protect hosts from brute-force attacks
+# Ignore HUP
+trap "" HUP
Index: pkg/sshguard.rc
===
RCS file: /extra/cvs/ports/security/sshguard/pkg/sshguard.rc,v
retrieving revision 1.5
diff -u -p -r1.5 sshguard.rc
--- pkg/sshguard.rc 29 Mar 2019 15:54:24 - 1.5
+++ pkg/sshguard.rc 14 Aug 2020 13:27:01 -
@@ -6,7 +6,7 @@ daemon="${TRUEPREFIX}/sbin/sshguard"
. /etc/rc.d/rc.subr
-pexp="${TRUEPREFIX}/libexec/sshg-blocker .*"
+pexp="/bin/sh $daemon"
rc_bg=YES
rc_reload=NO
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2020/08/14 08:23:25 Modified files: x11/gnome/bijiben: Makefile distinfo x11/gnome/bijiben/pkg: PLIST Log message: update to bijiben-3.36.3
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2020/08/14 08:22:51 Modified files: x11/gnome/quadrapassel: Makefile distinfo Log message: update to quadrapassel-3.36.05
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/08/14 08:03:59 Modified files: www/py-bokeh : Makefile distinfo www/py-bokeh/pkg: PLIST Log message: Update to py3-bokeh-2.1.1.
Re: [update] devel/{intellij,pycharm} to 2020.2
On Sat, Aug 01, 2020 at 01:40:58PM -0500, Lucas Raab wrote:
> Hello,
>
> Attached are minor updates to pycharm and intellij; they've both been
> running fine. These updates also remove the need for the patch files.
>
> Release notes:
> https://confluence.jetbrains.com/display/IDEADEV/IntelliJ%2BIDEA%2B2020.2%2B%28202.6397.94%2Bbuild%29%2BRelease%2BNotes
> https://confluence.jetbrains.com/display/PYH/PyCharm+2020.2+Release+Notes
>
> Lucas
ping
Index: Makefile
===
RCS file: /cvs/ports/devel/pycharm/Makefile,v
retrieving revision 1.29
diff -u -p -r1.29 Makefile
--- Makefile12 Jul 2020 07:33:23 - 1.29
+++ Makefile1 Aug 2020 18:08:47 -
@@ -2,7 +2,7 @@
COMMENT= Python IDE based on IntelliJ IDEA
-V= 2020.1.3
+V= 2020.2
DISTNAME= pycharm-community-${V}
PKGNAME= pycharm-${V}
CATEGORIES=devel
Index: distinfo
===
RCS file: /cvs/ports/devel/pycharm/distinfo,v
retrieving revision 1.24
diff -u -p -r1.24 distinfo
--- distinfo12 Jul 2020 07:33:23 - 1.24
+++ distinfo1 Aug 2020 18:08:47 -
@@ -1,2 +1,2 @@
-SHA256 (pycharm-community-2020.1.3.tar.gz) =
lKr4nL5bX1AYLIwtPneAQIxOe+gKu34jgjHCaE+YIIk=
-SIZE (pycharm-community-2020.1.3.tar.gz) = 384015566
+SHA256 (pycharm-community-2020.2.tar.gz) =
YLLu6lI39Tbl1GNR/OYERSzmsW0DfSt2lu83cm4f94o=
+SIZE (pycharm-community-2020.2.tar.gz) = 399199416
Index: patches/patch-bin_pycharm_sh
===
RCS file: patches/patch-bin_pycharm_sh
diff -N patches/patch-bin_pycharm_sh
--- patches/patch-bin_pycharm_sh7 Aug 2019 06:02:31 - 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,16 +0,0 @@
-$OpenBSD: patch-bin_pycharm_sh,v 1.2 2019/08/07 06:02:31 rsadowski Exp $
-
-Avoid "egrep: -: No such file or directory" issue
-
-Index: bin/pycharm.sh
bin/pycharm.sh.orig
-+++ bin/pycharm.sh
-@@ -180,7 +180,7 @@ fi
- VM_OPTIONS=""
- if [ -r "$VM_OPTIONS_FILE" ]; then
- VM_OPTIONS=$("$CAT" "$VM_OPTIONS_FILE" | "$GREP" -v "^#.*")
-- if { echo "$VM_OPTIONS" | "$GREP" -q "agentlib:yjpagent" - ; }; then
-+ if { echo "$VM_OPTIONS" | "$GREP" -q "agentlib:yjpagent"; }; then
- if [ "$OS_TYPE" = "Linux" ]; then
- VM_OPTIONS=$(echo "$VM_OPTIONS" | "$SED" -e
"s|-agentlib:yjpagent\(-linux\)\?\([^=]*\)|-agentpath:$IDE_BIN_HOME/libyjpagent-linux\2.so|")
- else
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/pycharm/pkg/PLIST,v
retrieving revision 1.21
diff -u -p -r1.21 PLIST
--- pkg/PLIST 12 Jul 2020 07:33:24 - 1.21
+++ pkg/PLIST 1 Aug 2020 18:08:48 -
@@ -53,7 +53,7 @@ pycharm/lib/
pycharm/lib/FastInfoset-1.2.15.jar
pycharm/lib/annotations-19.0.0.jar
pycharm/lib/annotations-java5.jar
-pycharm/lib/asm-all-7.0.1.jar
+pycharm/lib/asm-all-8.0.1.jar
pycharm/lib/automaton-1.12-1.jar
pycharm/lib/batik-anim-1.12.0-8.jar
pycharm/lib/batik-awt-util-1.12.0-8.jar
@@ -70,8 +70,8 @@ pycharm/lib/batik-svggen-1.12.0-8.jar
pycharm/lib/batik-transcoder-1.12.0-8.jar
pycharm/lib/batik-util-1.12.0-8.jar
pycharm/lib/batik-xml-1.12.0-8.jar
-pycharm/lib/bcpkix-jdk15on-1.64.jar
-pycharm/lib/bcprov-jdk15on-1.64.jar
+pycharm/lib/bcpkix-jdk15on-1.65.jar
+pycharm/lib/bcprov-jdk15on-1.65.jar
pycharm/lib/bootstrap.jar
pycharm/lib/built-in-server.jar
pycharm/lib/byte-buddy-agent-1.10.1.jar
@@ -79,9 +79,10 @@ pycharm/lib/cds/
pycharm/lib/cds/classesLogAgent.jar
pycharm/lib/cglib-nodep-3.2.4.jar
pycharm/lib/cli-parser-1.1.5.jar
-pycharm/lib/common-image-3.4.1.jar
-pycharm/lib/common-io-3.4.1.jar
-pycharm/lib/common-lang-3.4.1.jar
+pycharm/lib/common-image-3.5.jar
+pycharm/lib/common-io-3.5.jar
+pycharm/lib/common-lang-3.5.jar
+pycharm/lib/commons-cli-1.2.jar
pycharm/lib/commons-codec-1.14.jar
pycharm/lib/commons-collections-3.2.2.jar
pycharm/lib/commons-compress-1.20.jar
@@ -95,7 +96,6 @@ pycharm/lib/coverage-common.jar
pycharm/lib/credential-store.jar
pycharm/lib/dbus-java-3.0.2.jar
pycharm/lib/delight-rhino-sandbox-0.0.11.jar
-pycharm/lib/eddsa-0.2.0.jar
pycharm/lib/error_prone_annotations-2.3.1.jar
pycharm/lib/extensions.jar
pycharm/lib/external-system-rt.jar
@@ -103,47 +103,54 @@ pycharm/lib/failureaccess-1.0.1.jar
pycharm/lib/fluent-hc-4.5.12.jar
pycharm/lib/forms-1.1-preview.jar
pycharm/lib/forms_rt.jar
-pycharm/lib/groovy-all-2.4.17.jar
+pycharm/lib/grazie-spellchecker-0.1.9.jar
+pycharm/lib/groovy-2.5.11.jar
+pycharm/lib/groovy-json-2.5.11.jar
+pycharm/lib/groovy-jsr223-2.5.11.jar
+pycharm/lib/groovy-templates-2.5.11.jar
+pycharm/lib/groovy-xml-2.5.11.jar
pycharm/lib/gson-2.8.6.jar
-pycharm/lib/guava-28.2-jre.jar
+pycharm/lib/guava-29.0-jre.jar
pycharm/lib/hamcrest-core-1.3.jar
pycharm/lib/httpclient-4.5.12.jar
pycharm/lib/httpcore-4.4.13.jar
emacs-27.1
emacs-27.1 was released earlier than I expected, thanks Ken for the
heads-up.
This is good news. As mentioned in
https://marc.info/?l=openbsd-ports=159380829911290=2 emacs now uses
a "portable dumper" that doesn't involve games with ELF layout and sbrk
at build time. No more ld -Z or -nopie flags hampering ASLR, no more
workarounds in libc, etc.
A few changes regarding deps:
- libgmp is now a direct dep used for bignums, it was already there
because of gnutls
- libjansson is now linked in for LSP (Language Server Protocol) support
(requested by Timo Myyra). Yes, this introduce an indirect build dep
on cmake which kinda sucks for non-clang archs. If that's a problem,
well, it was already the case because emacs->gnutls->cmocka->cmake->argh.
- harfbuzz is used for test layout
- bye bye ImageMagick
If you notice changes with highlighting, particularly with vc-diff, well
you're not alone. I find that some foreground and background color
changes (maybe not intended) make the resulting frames very hard to
read. But maybe just in the no_x11/tty case?
Anyway, test reports welcome. Even if the new dumping mechanism is
called "portable" I'm not sure it has been tested on the wide range of
architectures we provide. amd64 and sparc64 seem to behave, what about
yours?
Finally, oks?
Index: Makefile
===
RCS file: /cvs/ports/editors/emacs/Makefile,v
retrieving revision 1.95
diff -u -p -r1.95 Makefile
--- Makefile3 Jul 2020 17:05:14 - 1.95
+++ Makefile14 Aug 2020 07:36:48 -
@@ -2,8 +2,7 @@
COMMENT= GNU editor: extensible, customizable, self-documenting
-VERSION= 26.3
-REVISION= 2
+VERSION= 27.1
DISTNAME= emacs-${VERSION}
CATEGORIES=editors
@@ -13,9 +12,9 @@ HOMEPAGE= https://www.gnu.org/software/
MAINTAINER=Jeremie Courreges-Anglas
# GPLv3+
-PERMIT_PACKAGE=Yes
+PERMIT_PACKAGE=Yes
-WANTLIB= c m curses pthread gnutls xml2 z
+WANTLIB = c curses jansson gmp gnutls m pthread xml2 z
MASTER_SITES= ${MASTER_SITE_GNU:=emacs/}
EXTRACT_SUFX= .tar.xz
@@ -33,18 +32,8 @@ CONFIGURE_ARGS= --build="${GCCARCH}" \
--without-sound
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib -nopie ${LDFLAGS}" \
+ LDFLAGS="-L${LOCALBASE}/lib ${LDFLAGS}" \
ac_cv_header_execinfo_h=no
-CFLAGS+= -fno-pie
-
-.include
-.if ${PROPERTIES:Mlld}
-# ld -Z not supported
-.elif ${MACHINE_ARCH} == "sparc64"
-# No need for ld -Z
-.else
-CONFIGURE_ENV+=EMACS_LD_SWITCH_SYSTEM="-Z"
-.endif
MAKE_ENV= INSTALL_EMACS="${INSTALL_SCRIPT}" \
LOGNAME="${SHAREOWN}"
@@ -52,24 +41,27 @@ MAKE_ENV= INSTALL_EMACS="${INSTALL_SCRI
SUBST_VARS=GCCARCH VERSION
USE_GMAKE= Yes
-LIB_DEPENDS= security/gnutls \
+LIB_DEPENDS= devel/jansson \
+ devel/gmp \
+ security/gnutls \
textproc/libxml
.if ${FLAVOR} == "no_x11"
CONFIGURE_ARGS+= --without-x \
--without-dbus \
--without-gsettings \
+ --without-harfbuzz \
--without-jpeg \
--without-lcms2 \
--without-libotf \
--without-m17n-flt
.else
-LIB_DEPENDS+= devel/libotf \
+LIB_DEPENDS+= devel/harfbuzz \
+ devel/libotf \
graphics/jpeg \
graphics/png \
graphics/tiff \
graphics/giflib \
- graphics/ImageMagick \
graphics/lcms2 \
misc/m17n/lib \
x11/dbus \
@@ -80,30 +72,29 @@ RUN_DEPENDS+= devel/desktop-file-utils
. if ${FLAVOR} == "athena"
CONFIGURE_ARGS+= --with-x-toolkit=athena
LIB_DEPENDS+= x11/Xaw3d
-WANTLIB += ICE MagickCore-6.Q16 MagickWand-6.Q16 SM X11 X11-xcb
-WANTLIB += Xaw3d Xext Xfixes Xft Xinerama Xmu Xpm Xrandr Xrender
-WANTLIB += Xt cairo dbus-1 fontconfig freetype gdk_pixbuf-2.0
-WANTLIB += gif gio-2.0 glib-2.0 gobject-2.0 intl jpeg lcms2 m17n-core
-WANTLIB += m17n-flt otf png rsvg-2 tiff xcb
+WANTLIB += ICE SM X11 X11-xcb Xaw3d Xext Xfixes Xft Xinerama Xmu
+WANTLIB += Xpm Xrandr Xrender Xt cairo dbus-1 fontconfig freetype
+WANTLIB += gdk_pixbuf-2.0 gif gio-2.0 glib-2.0 gobject-2.0 harfbuzz
+WANTLIB += intl jpeg lcms2 m17n-core m17n-flt otf png rsvg-2 tiff
+WANTLIB += xcb
. elif ${FLAVOR} == "gtk2"
CONFIGURE_ARGS+= --with-x-toolkit=gtk2
LIB_DEPENDS+=
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rob...@cvs.openbsd.org 2020/08/14 06:06:35 Modified files: x11/mate/menus : Makefile distinfo x11/mate/menus/pkg: PLIST x11/mate/notification-daemon: Makefile distinfo x11/mate/settings-daemon: Makefile distinfo Log message: update to 1.24.1
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2020/08/14 05:49:00 Modified files: x11/kde-applications/okteta: Makefile distinfo x11/kde-applications/okteta/pkg: PLIST Log message: Update okteta to 0.26.4
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/08/14 05:20:41 Modified files: net/py-boto3 : Makefile distinfo Log message: Update to py3-boto3-1.14.42.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2020/08/14 05:21:35 Modified files: devel/dlib : Makefile distinfo Log message: Update dlib to 19.21
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/08/14 05:20:58 Modified files: sysutils/awscli: Makefile distinfo Log message: Update to awscli-1.18.119.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/08/14 05:20:30 Modified files: net/py-botocore: Makefile distinfo net/py-botocore/pkg: PLIST Log message: Update to py3-botocore-1.17.42.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/08/14 05:17:24 Modified files: sysutils/amazon-ssm-agent: Makefile distinfo Log message: Update to amazon-ssm-agent-2.3.1613.0.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/08/14 05:14:14 Modified files: misc/osinfo/osinfo-db: Makefile distinfo misc/osinfo/osinfo-db/pkg: PLIST Log message: Update to osinfo-db-20200813.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2020/08/14 05:12:37 Modified files: x11/tellico: Makefile distinfo x11/tellico/pkg: PLIST Log message: Update tellico to 3.3.2
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2020/08/14 05:12:12 Modified files: net/bitcoin: Makefile distinfo Log message: Updat bitcoin to 0.20.1 https://github.com/bitcoin/bitcoin/blob/master/doc/release-notes/release-notes-0.20.1.md
Re: synapse filepaths + rc script query
On Tue, Aug 11 '20 at 19.06 NZST, Renaud Allard
wrote:
> Indeed, config files could be stored in the more standard /etc, but that
> will be a breaking change if I do that now.
Fair enough. Could it be symlinked during a transition period? I'm sure
it's my own hangups but editing config files in /var feels weird :)
> I agree, byt synctl is the documented way to start synapse, that's why I
> choose it.
Also fair enough, I found synctl had issues tracking synapse' state in
earlier versions so I didn't trust it. Could have been user error, it
seems to work fine in your port.
BTW: on the most recent version, all of the scripts get dumped into
/usr/local/share/synapse -- apart from export_signing_key and
generate_log_config. These are just left in /usr/local/bin, which is
probably not intended.
The below diff makes sure all scripts (no matter what new ones they add)
get placed in /usr/local/share/synapse, and gets rid of the for loop:
--
Index: Makefile
===
RCS file: /cvs/ports/net/synapse/Makefile,v
retrieving revision 1.11
diff -u -p -u -r1.11 Makefile
--- Makefile31 Jul 2020 00:21:16 - 1.11
+++ Makefile14 Aug 2020 11:03:55 -
@@ -21,6 +21,8 @@ MODULES = lang/python
MODPY_VERSION =${MODPY_DEFAULT_VERSION_3}
MODPY_SETUPTOOLS = Yes
+MODPY_DISTUTILS_INSTALLARGS = --install-scripts ${LOCALBASE}/share/synapse
+
RUN_DEPENDS = textproc/py-lxml${MODPY_FLAVOR} \
textproc/py-yaml${MODPY_FLAVOR} \
textproc/py-unpaddedbase64${MODPY_FLAVOR} \
@@ -62,14 +64,5 @@ TEST_DEPENDS = ${RUN_DEPENDS}
do-test:
cd ${WRKSRC} && ${SETENV} PYTHONPATH=. ${LOCALBASE}/bin/trial-3 tests
-
-post-install:
- @mkdir ${PREFIX}/share/synapse
-.for script in generate_config generate_signing_key.py \
- move_remote_media_to_new_store.py \
- sync_room_to_group.pl hash_password \
- register_new_matrix_user synapse_port_db synctl
- @mv ${PREFIX}/bin/${script} ${PREFIX}/share/synapse
-.endfor
.include
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: p...@cvs.openbsd.org2020/08/14 03:51:18 Modified files: sysutils/node_exporter: Makefile distinfo Removed files: sysutils/node_exporter/patches: patch-collector_uname_go patch-collector_uname_openbsd_go Log message: update sysutils/node_exporter to 1.0.1 changelog here: https://github.com/prometheus/node_exporter/blob/master/CHANGELOG.md patches for collector/uname.go and collector/uname_openbsd.go removed, as this merged PR covers them: https://github.com/prometheus/node_exporter/pull/1433 ok claudio@ (maintainer)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2020/08/14 03:39:50 Modified files: x11/qdirstat : Makefile distinfo x11/qdirstat/patches: patch-src_src_pro x11/qdirstat/pkg: PLIST Log message: Update qdirstat to 1.7
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: pam...@cvs.openbsd.org 2020/08/14 03:01:57 Modified files: graphics/inkscape: Makefile Log message: add numpy, wanted by a few of the built-in extensions (e.g. interpolate) OK rsadowski (maintainer)
Re: update: sysutils/node_exporter
On Thu, Aug 13, 2020 at 08:16:52PM +0200, Paco Esteban wrote:
> Hi ports@,
>
> This is an update for sysutils/node_exporter to its latest version 1.0.1
> You can see the changelog here:
>
> https://github.com/prometheus/node_exporter/blob/master/CHANGELOG.md
>
> I'm not sure if we should put the breaking changes announced on the
> changelog on www/faq/current.html (or at least a note telling users to
> look at the changelog). Guidance on this is appreciated.
>
> I removed the patches for collector/uname.go and
> collector/uname_openbsd.go as this PR, which comes with this new
> version, seems to cover them:
>
> https://github.com/prometheus/node_exporter/pull/1433
>
> Tests pass for me on amd64 (they were failing before as it was trying to
> download stuff), and this port has no consumers.
>
> I've compared the output of a call to localhost:9100/metrics from the
> previous version and this one and I don't see major differences. More
> testing by node_exporter users appreciated.
>
> cc maintainer.
>
> Comments ? ok to commit ?
This works for me. OK from my side
> diff d92a11f7fb6bc079232b6e99823bddfc01d1bc18 /usr/ports
> blob - 7e1e4c8558188d9e93dd9baeeb9bfe7b8c9d3fc4
> file + sysutils/node_exporter/Makefile
> --- sysutils/node_exporter/Makefile
> +++ sysutils/node_exporter/Makefile
> @@ -7,7 +7,7 @@ COMMENT = prometheus exporter for hardware and OS
> met
>
> GH_ACCOUNT = prometheus
> GH_PROJECT = node_exporter
> -GH_TAGNAME = v0.18.1
> +GH_TAGNAME = v1.0.1
>
> CATEGORIES = sysutils
>
> blob - b61c0f2bc697309bc9fdc031aee6506d52433baa
> file + sysutils/node_exporter/distinfo
> --- sysutils/node_exporter/distinfo
> +++ sysutils/node_exporter/distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (node_exporter-0.18.1.tar.gz) =
> nd8YfEYvJoGrRRZBCtoObw8DCX22mGaGeVVZ6nGgdpQ=
> -SIZE (node_exporter-0.18.1.tar.gz) = 2110072
> +SHA256 (node_exporter-1.0.1.tar.gz) =
> qEG/PiNjdoQL6eHY5sSjgZa+bzlXsJgtHHlwpeQWsK0=
> +SIZE (node_exporter-1.0.1.tar.gz) = 2792033
> blob - 096c1a0feea8c217c9968da58ad4e95ab991be9b
> file + /dev/null
> --- sysutils/node_exporter/patches/patch-collector_uname_go
> +++ sysutils/node_exporter/patches/patch-collector_uname_go
> @@ -1,14 +0,0 @@
> -$OpenBSD: patch-collector_uname_go,v 1.1 2019/10/16 06:50:09 claudio Exp $
> -
> -Index: collector/uname.go
> collector/uname.go.orig
> -+++ collector/uname.go
> -@@ -11,7 +11,7 @@
> - // See the License for the specific language governing permissions and
> - // limitations under the License.
> -
> --// +build freebsd linux
> -+// +build freebsd linux openbsd
> - // +build !nouname
> -
> - package collector
> blob - f5c564f95be42246fae7d1e8630b16afc0850a60
> file + /dev/null
> --- sysutils/node_exporter/patches/patch-collector_uname_openbsd_go
> +++ sysutils/node_exporter/patches/patch-collector_uname_openbsd_go
> @@ -1,63 +0,0 @@
> -$OpenBSD: patch-collector_uname_openbsd_go,v 1.1 2019/10/16 06:50:09 claudio
> Exp $
> -
> -Index: collector/uname_openbsd.go
> collector/uname_openbsd.go.orig
> -+++ collector/uname_openbsd.go
> -@@ -0,0 +1,57 @@
> -+// Copyright 2019 The Prometheus Authors
> -+// Licensed under the Apache License, Version 2.0 (the "License");
> -+// you may not use this file except in compliance with the License.
> -+// You may obtain a copy of the License at
> -+//
> -+// http://www.apache.org/licenses/LICENSE-2.0
> -+//
> -+// Unless required by applicable law or agreed to in writing, software
> -+// distributed under the License is distributed on an "AS IS" BASIS,
> -+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
> -+// See the License for the specific language governing permissions and
> -+// limitations under the License.
> -+
> -+// +build !nouname
> -+
> -+package collector
> -+
> -+import (
> -+"bytes"
> -+"strings"
> -+
> -+"golang.org/x/sys/unix"
> -+)
> -+
> -+func getUname() (uname, error) {
> -+var utsname unix.Utsname
> -+if err := unix.Uname(); err != nil {
> -+return uname{}, err
> -+}
> -+
> -+// We do a little bit of work here to emulate what happens in the Linux
> -+// uname calls since FreeBSD uname doesn't have a Domainname.
> -+nodename :=
> string(utsname.Nodename[:bytes.IndexByte(utsname.Nodename[:], 0)])
> -+split := strings.SplitN(nodename, ".", 2)
> -+
> -+// We'll always have at least a single element in the array. We assume
> this
> -+// is the hostname.
> -+hostname := split[0]
> -+
> -+// If we have more than one element, we assume this is the domainname.
> -+// Otherwise leave it to "(none)" like Linux.
> -+domainname := "(none)"
> -+if len(split) > 1 {
> -+domainname = split[1]
> -+}
> -+
> -+output := uname{
> -+SysName:
> string(utsname.Sysname[:bytes.IndexByte(utsname.Sysname[:], 0)]),
> -+Release:
> string(utsname.Release[:bytes.IndexByte(utsname.Release[:], 0)]),
>
Re: update net/gajim to 1.2.0
Works for me, also it solves the bug of the last version. Le 11/08/2020 à 09:06, Solene Rapenne a écrit : On Mon, 10 Aug 2020 09:41:20 +0200 3un0s <3u...@dismail.de>: On Mon, 6 Jul 2020 20:53:47 +0200 3un0s <3u...@dismail.de> wrote: On Mon, 6 Jul 2020 16:24:45 +0200 3un0s <3u...@dismail.de> wrote: Hi, This diff updates gajim to 1.2.0 It requires a new version of py-nbxmpp and new package called py-css-parser. I've already sent both of those to this mailing list. Works for me on amd64. Any comments or OK ? This update requires a newer version of py3-nbxmpp I've sent already ping the update works for me ok solene@
UPDATE: inputmethods/fcitx 4.2.9.6 => 4.2.9.8 and inputmethods/fcitx-qt5 1.2.3 => 1.2.5
Hi ports,
The following updates fcitx to 4.2.9.8 and fcitx-qt5 to 1.2.5.
There are no symbol changes, so no lib bumps.
Tested on amd64.
Ok?
diff f774fbfd3e6b7af035101ca0b84a2d18e48fa5d8 /usr/ports
blob - 0c9bef028b69746ae5ff97994a9cb5874eaa46ed
file + inputmethods/fcitx/Makefile
--- inputmethods/fcitx/Makefile
+++ inputmethods/fcitx/Makefile
@@ -1,19 +1,16 @@
# $OpenBSD: Makefile,v 1.14 2020/02/29 15:20:56 naddy Exp $
COMMENT-main = flexible input method framework
-COMMENT-gtk3 = fcitx for GTK+3
+COMMENT-gtk3 = fcitx for GTK+3
-V =4.2.9.6
-DISTNAME = fcitx-$V
-PKGNAME-main = fcitx-$V
+V =4.2.9.8
+DISTNAME = fcitx-$V
+PKGNAME-main = ${PKGNAME}
PKGNAME-gtk3 = fcitx-gtk3-$V
-REVISION-main =2
-REVISION-gtk3 =1
SHARED_LIBS += fcitx-config0.0 # 4.1
SHARED_LIBS += fcitx-core 0.0 # 0.3
SHARED_LIBS += fcitx-gclient 0.0 # 0.2
-SHARED_LIBS += fcitx-qt0.0 # 0.1
SHARED_LIBS += fcitx-utils 0.0 # 0.1
CATEGORIES = inputmethods chinese japanese
@@ -29,26 +26,23 @@ MULTI_PACKAGES =-main -gtk3
COMPILER = base-clang ports-gcc base-gcc
-WANTLIB-common = execinfo iconv intl kvm xkbcommon
+WANTLIB-main +=X11 Xext Xfixes Xinerama Xrender c cairo dbus-1
\
+ execinfo gdk-x11-2.0 gettextpo gio-2.0 glib-2.0 \
+ gobject-2.0 gtk-x11-2.0 iconv intl json-c kvm \
+ pango-1.0 pangocairo-1.0 pthread uuid xkbcommon \
+ xkbfile xml2
-WANTLIB-main +=${WANTLIB-common}
-WANTLIB-main +=ICE X11 Xcomposite Xcursor Xdamage Xext Xfixes \
- Xi Xinerama Xrandr Xrender atk-1.0 c cairo dbus-1 \
- execinfo fontconfig freetype gdk_pixbuf-2.0 \
- gdk-x11-2.0 gettextpo gio-2.0 glib-2.0 \
- gobject-2.0 gtk-x11-2.0 pango-1.0 pangocairo-1.0 \
- pangoft2-1.0 pthread uuid xkbcommon xkbfile xml2 z
-
BUILD_DEPENDS =devel/gettext,-tools \
devel/gobject-introspection \
devel/iso-codes \
devel/kf5/extra-cmake-modules \
shells/bash
-RUN_DEPENDS-main = devel/desktop-file-utils \
+RUN_DEPENDS = devel/desktop-file-utils \
misc/shared-mime-info \
shells/bash \
x11/gtk+3,-guic
-LIB_DEPENDS-main = devel/gettext,-tools \
+LIB_DEPENDS = devel/gettext,-tools \
+ devel/json-c \
devel/libexecinfo \
sysutils/e2fsprogs \
textproc/libxml \
@@ -56,15 +50,11 @@ LIB_DEPENDS-main = devel/gettext,-tools \
x11/gtk+2 \
x11/xkbcommon
-WANTLIB-gtk3 +=${WANTLIB-common}
-WANTLIB-gtk3 +=atk-1.0 cairo cairo-gobject dbus-1
gdk_pixbuf-2.0 \
- gdk-3 gio-2.0 glib-2.0 gobject-2.0 gtk-3 pango-1.0 \
- pangocairo-1.0
+WANTLIB-gtk3 +=fcitx-gclient fcitx-utils glib-2.0 gobject-2.0
gdk-3
+WANTLIB-gtk3 +=gtk-3 pango-1.0 xkbcommon
-RUN_DEPENDS-gtk3 = inputmethods/fcitx,-main
-LIB_DEPENDS-gtk3 = devel/libexecinfo \
- x11/gtk+3 \
- x11/xkbcommon
+LIB_DEPENDS-gtk3 = ${BUILD_PKGPATH},-main \
+ x11/gtk+3
MASTER_SITES = https://download.fcitx-im.org/fcitx/
DISTFILES =${DISTNAME}${EXTRACT_SUFX}
@@ -80,7 +70,8 @@ DIST_SUBDIR = fcitx
MODULES = devel/cmake
-CONFIGURE_ARGS =-DENABLE_GTK3_IM_MODULE=ON \
+CONFIGURE_ARGS =-Wno-dev \
+ -DENABLE_GTK3_IM_MODULE=ON \
-DENABLE_ENCHANT=OFF \
-DENABLE_OPENCC=OFF \
-DENABLE_PRESAGE=OFF \
@@ -89,8 +80,12 @@ CONFIGURE_ARGS =-DENABLE_GTK3_IM_MODULE=ON \
-DENABLE_QT_GUI=OFF \
-DSYSCONFDIR=${PREFIX}/share/examples/fcitx \
-DMAN_INSTALL_DIR=${PREFIX}/man/ \
- -DCMAKE_C_FLAGS="${CFLAGS} -I${LOCALBASE}/include
-I${X11BASE}/include" \
- -DCMAKE_CXX_FLAGS="${CXXFLAGS} -I${LOCALBASE}/include
-I${X11BASE}/include"
+ -DCMAKE_C_FLAGS="${CFLAGS} \
+ -I${LOCALBASE}/include \
+ -I${X11BASE}/include" \
+ -DCMAKE_CXX_FLAGS="${CXXFLAGS} \
+ -I${LOCALBASE}/include \
+ -I${X11BASE}/include"
NO_TEST = Yes
@@ -102,6 +97,6 @@ post-patch:
@cp ${FULLDISTDIR}/py_stroke-20121124.tar.gz \
${WRKSRC}/src/module/pinyin-enhance/data
@cp ${FULLDISTDIR}/py_table-20121124.tar.gz \
- ${WRKSRC}/src/module/pinyin-enhance/data/
+
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/08/14 01:18:46 Modified files: devel/harfbuzz : Makefile Log message: Oops, fix WANTLIB.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/08/14 01:17:46 Modified files: devel/harfbuzz : Makefile distinfo Log message: Update to harfbuzz-2.7.1.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/08/14 01:00:16 Modified files: x11/gtk+4 : Makefile distinfo x11/gtk+4/patches: patch-gtk_gtkfilechooserwidget_c patch-gtk_gtkplacessidebar_c patch-gtk_tools_updateiconcache_c patch-testsuite_reftests_gtk-reftest_c x11/gtk+4/pkg : PLIST-main Added files: x11/gtk+4/patches: patch-gtk_roaring_h Log message: Update to gtk+4-3.99.0.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/08/14 00:59:50 Modified files: x11/gtk+3 : Makefile distinfo Log message: Update to gtk+3-3.24.22.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/08/14 00:59:28 Modified files: devel/pango: Makefile distinfo devel/pango/pkg: PLIST Removed files: devel/pango/patches: patch-examples_cairotwisted_c patch-pango_break_c patch-pango_pango-renderer_c patch-pango_pangofc-fontmap_c patch-tests_testboundaries_ucd_c Log message: Update to pango-1.46.0.
