Re: new: yq (jq wrapper for YAML/XML documents)
On Tue, Nov 05, 2019 at 08:59:56AM -0500, Kurt Mosiejczuk wrote: > I think I was confused by the stderr spray by the tests. They *look* like > they fail, but the exit code is 0. I suppose it might be worth it to put a > comment in the Makefile mentioning the messiness so others don't think the > tests are failing when they aren't. Comment added. > I might tweak DESCR slightly on the subject of xq. yq is the package name > and the name of an executable from the package. The description of xq in > there currently is accurate, but looks like it is part of the DESCR from > another package. I see what you mean but fail to find the right wording to fix this, so I've import with DESCR as is. Thanks
[UPDATE] devel/lpeg to 1.0.2
Hi ports@,
Here is a diff to update lpeg to 1.0.2.
Tested at runtime with textproc/lua-{cosmo,lunamark}, and also rebuilt
editors/neovim and print/sile which use it as BUILD_DEPENDS.
Comments? OK?
Index: Makefile
===
RCS file: /cvs/ports/devel/lpeg/Makefile,v
retrieving revision 1.19
diff -u -p -r1.19 Makefile
--- Makefile12 Jul 2019 20:44:41 - 1.19
+++ Makefile5 Nov 2019 15:45:07 -
@@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.19 2019/07/12 20:44:41 sthen Exp $
COMMENT= parsing expression grammars library for lua
-DISTNAME= lpeg-1.0.1
+DISTNAME= lpeg-1.0.2
PKGNAME= lua-${DISTNAME}
CATEGORIES=devel
MASTER_SITES= http://www.inf.puc-rio.br/~roberto/lpeg/
Index: distinfo
===
RCS file: /cvs/ports/devel/lpeg/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- distinfo16 Feb 2017 14:24:41 - 1.9
+++ distinfo5 Nov 2019 15:45:07 -
@@ -1,2 +1,2 @@
-SHA256 (lpeg-1.0.1.tar.gz) = Ytn3qeo8HyFcd+DK3YU0xq2a8PtxHD+JGIqIkccvAms=
-SIZE (lpeg-1.0.1.tar.gz) = 71527
+SHA256 (lpeg-1.0.2.tar.gz) = SNZldgUbbHg4j6rQm3BJMJMmRYj80PJY3aqxzdShX/4=
+SIZE (lpeg-1.0.2.tar.gz) = 71840
Index: patches/patch-makefile
===
RCS file: /cvs/ports/devel/lpeg/patches/patch-makefile,v
retrieving revision 1.10
diff -u -p -r1.10 patch-makefile
--- patches/patch-makefile 5 Jun 2015 08:27:26 - 1.10
+++ patches/patch-makefile 5 Nov 2019 15:45:07 -
@@ -1,13 +1,14 @@
$OpenBSD: patch-makefile,v 1.10 2015/06/05 08:27:26 ajacoutot Exp $
makefile.orig Wed Mar 4 18:34:17 2015
-+++ makefile Fri Jun 5 10:24:55 2015
+Index: makefile
+--- makefile.orig
makefile
@@ -1,5 +1,5 @@
LIBNAME = lpeg
-LUADIR = ../lua/
+LUADIR = ${MODLUA_INCL_DIR}
- COPT = -O2
- # COPT = -DLPEG_DEBUG -g
+ COPT = -O2 -DNDEBUG
+ # COPT = -g
@@ -15,7 +15,6 @@ CWARNS = -Wall -Wextra -pedantic \
-Wundef \
-Wwrite-strings \
pcsc-lite: updat to 1.8.25
1.8.25
25 March 2019
- Fix a socket issue when pcscd is used inside LXC container
- pcsc-spy: always provide a total time of execution
- Fix resource leak if SCardEstablishContext() fails
- Fix realloc(3) error handling (possible memory leak)
- Remove usage of function chmod(2) to use fchmod(2) (fix race condition)
1.8.24
12 October 2018
- the project moved to https://pcsclite.apdu.fr/
- SCardGetStatusChange(): Fix a rare race condition
- SCardReleaseContext(): do not release a lock owned by another context
- SCardReconnect(): suspend card auto power off
- Allow "=" in serial driver filenames
- Add the thread id in the pcscd log lines
- pcsc-spy: correctly handle incomplete log file
- Simclist: avoid to divide by zero in list_findpos()
- Some other minor improvements
Works for me on amd64 with a YubiKey.
OK?
Index: Makefile
===
RCS file: /cvs/ports/security/pcsc-lite/Makefile,v
retrieving revision 1.46
diff -u -p -r1.46 Makefile
--- Makefile29 Oct 2019 11:08:47 - 1.46
+++ Makefile5 Nov 2019 20:43:37 -
@@ -2,16 +2,16 @@
COMMENT= resource manager for PC/SC
-V= 1.8.23
+V= 1.8.25
DISTNAME= pcsc-lite-${V}
CATEGORIES=security
SHARED_LIBS+= pcsclite1.0 # 1.0.0
SHARED_LIBS+= pcscspy 0.0 # 0.0.0
-HOMEPAGE= https://salsa.debian.org/debian/pcsc-lite
+HOMEPAGE= https://pcsclite.apdu.fr
-MASTER_SITES=
https://alioth-archive.debian.org/releases/pcsclite/pcsclite/${V}/
+MASTER_SITES= https://pcsclite.apdu.fr/files/
EXTRACT_SUFX= .tar.bz2
Index: distinfo
===
RCS file: /cvs/ports/security/pcsc-lite/distinfo,v
retrieving revision 1.21
diff -u -p -r1.21 distinfo
--- distinfo29 Oct 2019 11:08:47 - 1.21
+++ distinfo5 Nov 2019 20:43:45 -
@@ -1,2 +1,2 @@
-SHA256 (pcsc-lite-1.8.23.tar.bz2) =
WicmJYbv85z9XBmq3IiR3XHAgY09YpU5vWMblYvmick=
-SIZE (pcsc-lite-1.8.23.tar.bz2) = 749922
+SHA256 (pcsc-lite-1.8.25.tar.bz2) =
12157cMc9254K59pdCDT3vvMkXeMPGUGWAhqG3SOh5I=
+SIZE (pcsc-lite-1.8.25.tar.bz2) = 757099
Index: patches/patch-src_testpcsc_c
===
RCS file: /cvs/ports/security/pcsc-lite/patches/patch-src_testpcsc_c,v
retrieving revision 1.3
diff -u -p -r1.3 patch-src_testpcsc_c
--- patches/patch-src_testpcsc_c6 Jun 2017 14:58:39 - 1.3
+++ patches/patch-src_testpcsc_c5 Nov 2019 20:44:50 -
@@ -1,4 +1,7 @@
$OpenBSD: patch-src_testpcsc_c,v 1.3 2017/06/06 14:58:39 dcoppa Exp $
+
+Make regress suite noninteractive.
+
Index: src/testpcsc.c
--- src/testpcsc.c.orig
+++ src/testpcsc.c
ccid: update to 1.4.30
Lots of changes incl. many firmware updates; I'm seeing no issues with
my "Yubico Yubikey NEO OTP+U2F+CCID" rev 2.00/3.50.
No actual changes in the Makefile.in patch, just update churn.
OK?
Index: Makefile
===
RCS file: /cvs/ports/security/ccid/Makefile,v
retrieving revision 1.30
diff -u -p -r1.30 Makefile
--- Makefile12 Jul 2019 21:02:24 - 1.30
+++ Makefile5 Nov 2019 21:03:51 -
@@ -2,15 +2,14 @@
COMMENT = USB Chip/Smart Card Interface Devices driver
-DISTNAME = ccid-1.4.27
+V =1.4.30
+DISTNAME = ccid-${V}
CATEGORIES = security
-REVISION = 1
+HOMEPAGE = https://ccid.apdu.fr/
-HOMEPAGE = https://pcsclite.apdu.fr/
-
-MASTER_SITES = https://alioth-archive.debian.org/releases/pcsclite/ccid/
+MASTER_SITES = https://ccid.apdu.fr/files/
EXTRACT_SUFX = .tar.bz2
Index: distinfo
===
RCS file: /cvs/ports/security/ccid/distinfo,v
retrieving revision 1.20
diff -u -p -r1.20 distinfo
--- distinfo6 Jun 2017 14:58:58 - 1.20
+++ distinfo5 Nov 2019 21:03:57 -
@@ -1,2 +1,2 @@
-SHA256 (ccid-1.4.27.tar.bz2) = pmDiaWBphsuUhArVuoAv+wzSPdErmPaaNQNeDeud0Tc=
-SIZE (ccid-1.4.27.tar.bz2) = 632817
+SHA256 (ccid-1.4.30.tar.bz2) = rBcIe+CIgKDN+ZqKJ5mk7wBNxv+gi02bCtmV85pT/3w=
+SIZE (ccid-1.4.30.tar.bz2) = 642342
Index: patches/patch-src_Makefile_in
===
RCS file: /cvs/ports/security/ccid/patches/patch-src_Makefile_in,v
retrieving revision 1.10
diff -u -p -r1.10 patch-src_Makefile_in
--- patches/patch-src_Makefile_in 6 Jun 2017 14:58:58 - 1.10
+++ patches/patch-src_Makefile_in 5 Nov 2019 21:05:27 -
@@ -1,8 +1,12 @@
$OpenBSD: patch-src_Makefile_in,v 1.10 2017/06/06 14:58:58 dcoppa Exp $
+
+- avoid udev
+- fix examples directory
+
Index: src/Makefile.in
--- src/Makefile.in.orig
+++ src/Makefile.in
-@@ -486,7 +486,6 @@ EXTRA_DIST = Info.plist.src create_Info_plist.pl reade
+@@ -517,7 +517,6 @@ EXTRA_DIST = Info.plist.src create_Info_plist.pl reade
towitoko/COPYING towitoko/README openct/LICENSE openct/README \
convert_version.pl 92_pcscd_ccid.rules
@@ -10,19 +14,19 @@ Index: src/Makefile.in
DISTCLEANFILES = tokenparser.c Info.plist
all: all-am
-@@ -1193,13 +1192,12 @@ install_ccid: libccid.la Info.plist
- $(mkinstalldirs)
$(DESTDIR)$(usbdropdir)/$(CCID_BUNDLE)/Contents/$(BUNDLE_HOST)/
- cp Info.plist $(DESTDIR)$(usbdropdir)/$(CCID_BUNDLE)/Contents/
- cp .libs/$(CCID_LIB)
$(DESTDIR)$(usbdropdir)/$(CCID_BUNDLE)/Contents/$(BUNDLE_HOST)/$(CCID_LIB)
+@@ -1299,13 +1298,12 @@ install_ccid: libccid.la Info.plist
+ $(mkinstalldirs)
"$(DESTDIR)$(usbdropdir)/$(CCID_BUNDLE)/Contents/$(BUNDLE_HOST)/"
+ cp Info.plist "$(DESTDIR)$(usbdropdir)/$(CCID_BUNDLE)/Contents/"
+ cp .libs/$(CCID_LIB)
"$(DESTDIR)$(usbdropdir)/$(CCID_BUNDLE)/Contents/$(BUNDLE_HOST)/$(CCID_LIB)"
- $(INSTALL_UDEV_RULE_FILE)
install_ccidtwin: libccidtwin.la
- $(mkinstalldirs) $(DESTDIR)$(ccidtwindir)
- cp .libs/$(CCIDTWIN_LIB) $(DESTDIR)$(ccidtwindir)/$(CCIDTWIN_LIB)
-- $(mkinstalldirs) $(DESTDIR)/$(serialconfdir) ; \
-- perl -ne "s|TARGET|$(ccidtwindir)/$(CCIDTWIN_LIB)| ; print"
$(srcdir)/reader.conf.in > $(DESTDIR)/$(serialconfdir)/libccidtwin
-+ $(mkinstalldirs) $(DESTDIR)$(datadir)/examples/ccid ; \
-+ perl -ne "s|TARGET|$(ccidtwindir)/$(CCIDTWIN_LIB)| ; print"
$(srcdir)/reader.conf.in > $(DESTDIR)$(datadir)/examples/ccid/libccidtwin
+ $(mkinstalldirs) "$(DESTDIR)$(ccidtwindir)"
+ cp .libs/$(CCIDTWIN_LIB) "$(DESTDIR)$(ccidtwindir)/$(CCIDTWIN_LIB)"
+- $(mkinstalldirs) "$(DESTDIR)/$(serialconfdir)" ; \
+- perl -ne "s|TARGET|$(ccidtwindir)/$(CCIDTWIN_LIB)| ; print"
$(srcdir)/reader.conf.in > "$(DESTDIR)/$(serialconfdir)/libccidtwin"
++ $(mkinstalldirs) "$(DESTDIR)$(datadir)/examples/ccid" ; \
++ perl -ne "s|TARGET|$(ccidtwindir)/$(CCIDTWIN_LIB)| ; print"
$(srcdir)/reader.conf.in > "$(DESTDIR)$(datadir)/examples/ccid/libccidtwin"
# do not uninstall the serial driver by default
# use explicitely 'make uninstall_ccidtwin'
Re: [UPDATE] devel/lpeg to 1.0.2
On Tue, Nov 05, 2019 at 07:11:31PM +0100, Frederic Cambus wrote:
> Tested at runtime with textproc/lua-{cosmo,lunamark}, and also rebuilt
> editors/neovim and print/sile which use it as BUILD_DEPENDS.
editors/vis is also happy, OK kn.
angr: update to 8.19.10.30
With this update py-claripy can finally use a recent angr-z3 version.
No other ports changes except the usual bump.
OK?
Index: Makefile.inc
===
RCS file: /cvs/ports/devel/angr/Makefile.inc,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile.inc
--- Makefile.inc30 Sep 2019 08:24:44 - 1.3
+++ Makefile.inc5 Nov 2019 20:14:13 -
@@ -21,7 +21,7 @@ MODPY_PI ?= Yes
MODPY_SETUPTOOLS ?=Yes
MODPY_VERSION ?= ${MODPY_DEFAULT_VERSION_3}
-MODPY_EGG_VERSION ?= 8.19.7.25
+MODPY_EGG_VERSION ?= 8.19.10.30
DISTNAME ?=${ANGR_PYTHON_MODULE}-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
.endif
Index: py-ailment/distinfo
===
RCS file: /cvs/ports/devel/angr/py-ailment/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- py-ailment/distinfo 15 Sep 2019 13:29:50 - 1.2
+++ py-ailment/distinfo 5 Nov 2019 20:14:23 -
@@ -1,2 +1,2 @@
-SHA256 (ailment-8.19.7.25.tar.gz) =
IM624corWR83fgs2rEElM4wvkyWCOKuY+o+AiL1T+Vo=
-SIZE (ailment-8.19.7.25.tar.gz) = 10437
+SHA256 (ailment-8.19.10.30.tar.gz) =
Vxxx4TdNDViLAI3xuAqGLYSpf81b3XQsu+H7EADIRZ0=
+SIZE (ailment-8.19.10.30.tar.gz) = 10574
Index: py-angr/Makefile
===
RCS file: /cvs/ports/devel/angr/py-angr/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- py-angr/Makefile26 Oct 2019 12:12:24 - 1.3
+++ py-angr/Makefile5 Nov 2019 20:17:52 -
@@ -3,7 +3,6 @@
COMMENT = multi-architecture binary analysis toolkit
ANGR_PYTHON_MODULE = angr
-REVISION = 0
HOMEPAGE = https://angr.io/
Index: py-angr/distinfo
===
RCS file: /cvs/ports/devel/angr/py-angr/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- py-angr/distinfo15 Sep 2019 13:29:50 - 1.2
+++ py-angr/distinfo5 Nov 2019 20:14:25 -
@@ -1,2 +1,2 @@
-SHA256 (angr-8.19.7.25.tar.gz) = ih8FDRclY5fVdm69y5z1DIAaXPKP2SdVM4cMOJQmhJ8=
-SIZE (angr-8.19.7.25.tar.gz) = 876657
+SHA256 (angr-8.19.10.30.tar.gz) = KP//UAHNoiQJlQVXGmuQopXRgrhEEerDqOmrmbxTvSU=
+SIZE (angr-8.19.10.30.tar.gz) = 885334
Index: py-angr/patches/patch-angr_knowledge_plugins_functions_function_py
===
RCS file:
/cvs/ports/devel/angr/py-angr/patches/patch-angr_knowledge_plugins_functions_function_py,v
retrieving revision 1.2
diff -u -p -r1.2 patch-angr_knowledge_plugins_functions_function_py
--- py-angr/patches/patch-angr_knowledge_plugins_functions_function_py 15 Sep
2019 13:29:50 - 1.2
+++ py-angr/patches/patch-angr_knowledge_plugins_functions_function_py 5 Nov
2019 20:21:02 -
@@ -5,7 +5,7 @@ Drop itanium_demangler dependency
Index: angr/knowledge_plugins/functions/function.py
--- angr/knowledge_plugins/functions/function.py.orig
+++ angr/knowledge_plugins/functions/function.py
-@@ -7,8 +7,6 @@ import pickle
+@@ -6,8 +6,6 @@ import itertools
from collections import defaultdict
from typing import Union
@@ -14,7 +14,7 @@ Index: angr/knowledge_plugins/functions/
from cle.backends.symbol import Symbol
from archinfo.arch_arm import get_real_address_if_arm
import claripy
-@@ -1370,10 +1368,12 @@ class Function(Serializable):
+@@ -1272,10 +1270,12 @@ class Function(Serializable):
@property
def demangled_name(self):
Index: py-angr/pkg/PLIST
===
RCS file: /cvs/ports/devel/angr/py-angr/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- py-angr/pkg/PLIST 15 Sep 2019 13:29:50 - 1.2
+++ py-angr/pkg/PLIST 5 Nov 2019 20:29:34 -
@@ -53,7 +53,6 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/angr/analyses/${MODPY_PYCACHE}disassembly.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/angr/analyses/${MODPY_PYCACHE}disassembly_utils.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/angr/analyses/${MODPY_PYCACHE}dominance_frontier.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/angr/analyses/${MODPY_PYCACHE}forward_analysis.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/angr/analyses/${MODPY_PYCACHE}girlscout.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/angr/analyses/${MODPY_PYCACHE}loop_analysis.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/angr/analyses/${MODPY_PYCACHE}loopfinder.${MODPY_PYC_MAGIC_TAG}pyc
@@ -149,7 +148,26 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/angr/analyses/disassembly.py
lib/python${MODPY_VERSION}/site-packages/angr/analyses/disassembly_utils.py
lib/python${MODPY_VERSION}/site-packages/angr/analyses/dominance_frontier.py
-lib/python$
angrop: update to 8.19.10.30
Requires the new angr update but otherwise keeps working as before.
OK?
Index: Makefile
===
RCS file: /cvs/ports/security/angrop/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile30 Sep 2019 08:24:44 - 1.3
+++ Makefile5 Nov 2019 21:18:55 -
@@ -19,7 +19,7 @@ PERMIT_PACKAGE = Yes
MODULES = lang/python
MODPY_VERSION =${MODPY_DEFAULT_VERSION_3}
-MODPY_EGG_VERSION =8.19.7.25
+MODPY_EGG_VERSION =8.19.10.30
MODPY_PI = Yes
MODPY_SETUPTOOLS = Yes
Index: distinfo
===
RCS file: /cvs/ports/security/angrop/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo15 Sep 2019 13:29:50 - 1.2
+++ distinfo5 Nov 2019 21:19:28 -
@@ -1,2 +1,2 @@
-SHA256 (angrop-8.19.7.25.tar.gz) = r0s1CMk2IV5MDieanH9uatoCbM/2ws5zdMGJ6YHPCsk=
-SIZE (angrop-8.19.7.25.tar.gz) = 27066
+SHA256 (angrop-8.19.10.30.tar.gz) =
/Bjhoh3KlpHh0C3NuLizmrtG16e7K9drZXGkivBTBCM=
+SIZE (angrop-8.19.10.30.tar.gz) = 27016
Porting in LedgerSMB (accounting software)
I'm working on porting in all of the dependencies for LedgerSMB 1.7+. https://ledgersmb.org and https://github.com/ledgersmb/LedgerSMB. I've done as much work as I can using some older work I had and portgen. Which is pretty useful, with some corrections and it catches some things pretty well. Some things not so well. :-} After a 75 hour (not yet over) train trip on Amtrak, with the Internet on and off, I've still got to collect and re-check a mountain of stuff. I'll start sending stuff in tomorrow. Everything I send for awhile will be for this only. I'll try to send things in a reasonable way. There are a lot of Perl dependencies that are not in the tree. I am not aware of anything non-Perl that needs to be done. LedgerSMB has become pretty stable and it's now reasonable to bring it in. Thanks, Chris Bennett
Fixeditors/libreoffice with new poppler [was: update print/poppler]
On Mon, Nov 04, 2019 at 08:28:36PM +0100, Matthias Kilian wrote:
> > update to poppler-0.82.0.
>
> [...]
>
> > As always, tests from other people (and on other architectures) are
> > welcome.
>
> Don't waste time with this to try to build libreoffice yet -- it's
> broken. [...]
The diff below fixes at least the build, and it should be possible to
commit this before the poppler update.
ok?
Ciao,
Kili
Index: patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_cxx
===
RCS file: patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_cxx
diff -N patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_cxx
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_cxx 5 Nov
2019 21:47:52 -
@@ -0,0 +1,71 @@
+$OpenBSD$
+
+Fix build with poppler-8.82.0.
+
+https://gerrit.libreoffice.org/plugins/gitiles/core/+/2eadd46ab81058087af95bdfc1fea28fcdb65998%5E%21
+
+Index: sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+--- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx.orig
sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+@@ -863,11 +863,20 @@ void PDFOutDev::eoClip(GfxState *state)
+ local offset of character (zero for horizontal writing mode). not
+ taken into account for output pos updates. Used for vertical writing.
+ */
++
++#if POPPLER_CHECK_VERSION(0, 82, 0)
+ void PDFOutDev::drawChar(GfxState *state, double x, double y,
+ double dx, double dy,
+ double originX, double originY,
++ CharCode, int /*nBytes*/, const Unicode *u, int uLen)
++{
++#else
++void PDFOutDev::drawChar(GfxState *state, double x, double y,
++ double dx, double dy,
++ double originX, double originY,
+ CharCode, int /*nBytes*/, Unicode *u, int uLen)
+ {
++#endif
+ assert(state);
+
+ if( u == nullptr )
+@@ -979,11 +988,19 @@ void PDFOutDev::drawImageMask(GfxState* pState, Object
+ writeBinaryBuffer(aBuf);
+ }
+
++#if POPPLER_CHECK_VERSION(0, 82, 0)
+ void PDFOutDev::drawImage(GfxState*, Object*, Stream* str,
+ int width, int height, GfxImageColorMap* colorMap,
+ poppler_bool /*interpolate*/,
++ const int* maskColors, poppler_bool /*inlineImg*/ )
++{
++#else
++void PDFOutDev::drawImage(GfxState*, Object*, Stream* str,
++ int width, int height, GfxImageColorMap* colorMap,
++ poppler_bool /*interpolate*/,
+ int* maskColors, poppler_bool /*inlineImg*/ )
+ {
++#endif
+ if (m_bSkipImages)
+ return;
+ OutputBuffer aBuf; initBuf(aBuf);
+@@ -1004,12 +1021,20 @@ void PDFOutDev::drawImage(GfxState*, Object*, Stream*
+ {
+ GfxRGB aMinRGB;
+ colorMap->getColorSpace()->getRGB(
++#if POPPLER_CHECK_VERSION(0, 82, 0)
++reinterpret_cast(maskColors),
++#else
+ reinterpret_cast(maskColors),
++#endif
+ &aMinRGB );
+
+ GfxRGB aMaxRGB;
+ colorMap->getColorSpace()->getRGB(
++#if POPPLER_CHECK_VERSION(0, 82, 0)
++reinterpret_cast(maskColors)+gfxColorMaxComps,
++#else
+ reinterpret_cast(maskColors)+gfxColorMaxComps,
++#endif
+ &aMaxRGB );
+
+ aMaskBuf.push_back( colToByte(aMinRGB.r) );
Index: patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_hxx
===
RCS file: patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_hxx
diff -N patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_hxx
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_hxx 5 Nov
2019 21:47:52 -
@@ -0,0 +1,46 @@
+$OpenBSD$
+
+Fix build with poppler-8.82.0.
+
+https://gerrit.libreoffice.org/plugins/gitiles/core/+/2eadd46ab81058087af95bdfc1fea28fcdb65998%5E%21
+
+Index: sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
+--- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx.orig
sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
+@@ -232,10 +232,17 @@ namespace pdfi
+ virtual void eoClip(GfxState *state) override;
+
+ //- text drawing
++#if POPPLER_CHECK_VERSION(0, 82, 0)
+ virtual void drawChar(GfxState *state, double x, double y,
+ double dx, double dy,
+ double originX, double originY,
++ CharCode code, int nBytes, const Unicode *u,
int uLen) override;
++#else
++virtual void drawChar(GfxState *state, double x, double y,
++ double dx, double dy,
++ double originX, double originY
Re: Fixeditors/libreoffice with new poppler [was: update print/poppler]
hi
i am working on an libreoffice update right now so please hold it
off a bit
On 05/11/19 22:54 +0100, Matthias Kilian wrote:
> On Mon, Nov 04, 2019 at 08:28:36PM +0100, Matthias Kilian wrote:
> > > update to poppler-0.82.0.
> >
> > [...]
> >
> > > As always, tests from other people (and on other architectures) are
> > > welcome.
> >
> > Don't waste time with this to try to build libreoffice yet -- it's
> > broken. [...]
>
> The diff below fixes at least the build, and it should be possible to
> commit this before the poppler update.
>
> ok?
>
> Ciao,
> Kili
>
> Index: patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_cxx
> ===
> RCS file: patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_cxx
> diff -N patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_cxx
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_cxx
> 5 Nov 2019 21:47:52 -
> @@ -0,0 +1,71 @@
> +$OpenBSD$
> +
> +Fix build with poppler-8.82.0.
> +
> +https://gerrit.libreoffice.org/plugins/gitiles/core/+/2eadd46ab81058087af95bdfc1fea28fcdb65998%5E%21
> +
> +Index: sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
> +--- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx.orig
> sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
> +@@ -863,11 +863,20 @@ void PDFOutDev::eoClip(GfxState *state)
> + local offset of character (zero for horizontal writing mode). not
> + taken into account for output pos updates. Used for vertical writing.
> + */
> ++
> ++#if POPPLER_CHECK_VERSION(0, 82, 0)
> + void PDFOutDev::drawChar(GfxState *state, double x, double y,
> + double dx, double dy,
> + double originX, double originY,
> ++ CharCode, int /*nBytes*/, const Unicode *u, int
> uLen)
> ++{
> ++#else
> ++void PDFOutDev::drawChar(GfxState *state, double x, double y,
> ++ double dx, double dy,
> ++ double originX, double originY,
> + CharCode, int /*nBytes*/, Unicode *u, int uLen)
> + {
> ++#endif
> + assert(state);
> +
> + if( u == nullptr )
> +@@ -979,11 +988,19 @@ void PDFOutDev::drawImageMask(GfxState* pState, Object
> + writeBinaryBuffer(aBuf);
> + }
> +
> ++#if POPPLER_CHECK_VERSION(0, 82, 0)
> + void PDFOutDev::drawImage(GfxState*, Object*, Stream* str,
> + int width, int height, GfxImageColorMap* colorMap,
> + poppler_bool /*interpolate*/,
> ++ const int* maskColors, poppler_bool /*inlineImg*/
> )
> ++{
> ++#else
> ++void PDFOutDev::drawImage(GfxState*, Object*, Stream* str,
> ++ int width, int height, GfxImageColorMap* colorMap,
> ++ poppler_bool /*interpolate*/,
> + int* maskColors, poppler_bool /*inlineImg*/ )
> + {
> ++#endif
> + if (m_bSkipImages)
> + return;
> + OutputBuffer aBuf; initBuf(aBuf);
> +@@ -1004,12 +1021,20 @@ void PDFOutDev::drawImage(GfxState*, Object*,
> Stream*
> + {
> + GfxRGB aMinRGB;
> + colorMap->getColorSpace()->getRGB(
> ++#if POPPLER_CHECK_VERSION(0, 82, 0)
> ++reinterpret_cast(maskColors),
> ++#else
> + reinterpret_cast(maskColors),
> ++#endif
> + &aMinRGB );
> +
> + GfxRGB aMaxRGB;
> + colorMap->getColorSpace()->getRGB(
> ++#if POPPLER_CHECK_VERSION(0, 82, 0)
> ++reinterpret_cast GfxColor*>(maskColors)+gfxColorMaxComps,
> ++#else
> + reinterpret_cast(maskColors)+gfxColorMaxComps,
> ++#endif
> + &aMaxRGB );
> +
> + aMaskBuf.push_back( colToByte(aMinRGB.r) );
> Index: patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_hxx
> ===
> RCS file: patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_hxx
> diff -N patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_hxx
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_hxx
> 5 Nov 2019 21:47:52 -
> @@ -0,0 +1,46 @@
> +$OpenBSD$
> +
> +Fix build with poppler-8.82.0.
> +
> +https://gerrit.libreoffice.org/plugins/gitiles/core/+/2eadd46ab81058087af95bdfc1fea28fcdb65998%5E%21
> +
> +Index: sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
> +--- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx.orig
> sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
> +@@ -232,10 +232,17 @@ namespace pdfi
> + virtual void eoClip(GfxState *state) override;
> +
> + //- text drawing
> ++#if POPPLER_CHECK_VERSION(0, 82, 0)
> + virtual void drawChar(GfxState *state, double x, double y,
> +
update: devel/subversion 1.13.0
This diff updates Subversion to 1.13.0.
ok?
diff 4d97f837e3c30bb90df9221c96649a361eb6c8e4 /usr/ports
blob - 7f0963ccb77c57e939021ccee32d63408fc56c2a
file + devel/subversion/Makefile
--- devel/subversion/Makefile
+++ devel/subversion/Makefile
@@ -7,7 +7,7 @@ COMMENT-ruby= ruby interface to subversion
COMMENT-ap2= apache2 subversion modules
COMMENT-gnome-keyring= GNOME keyring support for subversion
-VERSION= 1.12.2
+VERSION= 1.13.0
DISTNAME= subversion-${VERSION:S/rc/-rc/}
PKGNAME-main= subversion-${VERSION}
FULLPKGNAME-perl= p5-SVN-${VERSION}
blob - b19b7056ee6513a9ad9ef59fdcfd662d50d791df
file + devel/subversion/distinfo
--- devel/subversion/distinfo
+++ devel/subversion/distinfo
@@ -1,2 +1,2 @@
-SHA256 (subversion-1.12.2.tar.bz2) =
O9C1yOTFF1Jj3JqS/ZrvlM6RfoCvA08m/lxF/efg93E=
-SIZE (subversion-1.12.2.tar.bz2) = 8506584
+SHA256 (subversion-1.13.0.tar.bz2) =
vFDOLD+qexrpEDxDIBffmN/ZicQjn5+CcLs6MU7Z5b0=
+SIZE (subversion-1.13.0.tar.bz2) = 8508122
blob - b8eb6b1367a4d03a4251a7c8afafce598376f5d0
file + devel/subversion/patches/patch-Makefile_in
--- devel/subversion/patches/patch-Makefile_in
+++ devel/subversion/patches/patch-Makefile_in
@@ -2,7 +2,7 @@ $OpenBSD: patch-Makefile_in,v 1.17 2018/04/23 20:06:01
Index: Makefile.in
--- Makefile.in.orig
+++ Makefile.in
-@@ -84,11 +84,11 @@ swig_pl_libdir = @libdir@
+@@ -89,11 +89,11 @@ swig_pl_libdir = @libdir@
swig_rb_libdir = @libdir@
### these possibly need further discussion
@@ -17,7 +17,7 @@ Index: Makefile.in
# where to install pkg-config files
pkgconfig_dir = $(datadir)/pkgconfig
-@@ -146,13 +146,13 @@ GOOGLEMOCK_LIB_INCLUDES = -I@GOOGLEMOCK_SRCDIR@/google
+@@ -150,13 +150,13 @@ BOOST_TEST_LDFLAGS = @BOOST_LDFLAGS@ @BOOST_UNIT_TEST_
SWIG = @SWIG@
SWIG_PY_INCLUDES = @SWIG_PY_INCLUDES@ -I$(SWIG_SRC_DIR)/python/libsvn_swig_py
SWIG_PY_COMPILE = @SWIG_PY_COMPILE@
update graphics/pdf2djvu (unbreak with new poppler)
Hi,
update pdf2djvu to 0.9.14.
Fixes the build with poppler and also adds missing #include ,
so the patch for that can be removed.
A test build on sparc64 would be nice, regardless of which version
of poppler (0.81.0 or 0.82.0) is used.
ok?
Ciao,
Kili
Index: Makefile
===
RCS file: /cvs/ports/graphics/pdf2djvu/Makefile,v
retrieving revision 1.35
diff -u -p -r1.35 Makefile
--- Makefile8 Aug 2019 21:21:17 - 1.35
+++ Makefile5 Nov 2019 22:19:09 -
@@ -2,8 +2,7 @@
COMMENT = creates DjVu files from PDF files
-V =0.9.13
-REVISION = 0
+V =0.9.14
DISTNAME = pdf2djvu-${V}
CATEGORIES = graphics
Index: distinfo
===
RCS file: /cvs/ports/graphics/pdf2djvu/distinfo,v
retrieving revision 1.15
diff -u -p -r1.15 distinfo
--- distinfo24 Jul 2019 17:56:44 - 1.15
+++ distinfo5 Nov 2019 22:19:09 -
@@ -1,2 +1,2 @@
-SHA256 (pdf2djvu-0.9.13.tar.xz) = 4KsW2DEpYlyG33wSHt3yhkWPY8uBrnkeWnbfEKOrTGM=
-SIZE (pdf2djvu-0.9.13.tar.xz) = 296420
+SHA256 (pdf2djvu-0.9.14.tar.xz) = 8ZuDyJa8cGds1u3n+5KjNP1YMsuScYeMidpdUt5a4hc=
+SIZE (pdf2djvu-0.9.14.tar.xz) = 295436
Index: patches/patch-sys-uuid_cc
===
RCS file: patches/patch-sys-uuid_cc
diff -N patches/patch-sys-uuid_cc
--- patches/patch-sys-uuid_cc 8 Aug 2019 21:21:17 - 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,19 +0,0 @@
-$OpenBSD: patch-sys-uuid_cc,v 1.3 2019/08/08 21:21:17 juanfra Exp $
-
-g++ 8.3 on sparc64:
-
-"sys-uuid.cc:96:12: note: 'strlen' is defined in header ''; did you
forget to '#include '?"
-
-"sys-uuid.cc:97:5: note: 'strcpy' is defined in header ''; did you
forget to '#include '?"
-
-Index: sys-uuid.cc
sys-uuid.cc.orig
-+++ sys-uuid.cc
-@@ -68,6 +68,7 @@ void uuid_unparse_lower(uuid_t &uu, char *out)
-
- #include
- #include
-+#include
- #include
-
- #include
Re: [UPDATE] net/gpodder-3.10.9 -> 3.10.11
trondd wrote:
> Update to net/gpodder to catch up to the latest release.
>
> 3.10.10 brought:
> https://github.com/gpodder/gpodder/releases/tag/3.10.10
>
> This release brings support for paginated feeds and an experimental
> extension to manage Youtube subscriptions and episodes using the youtube_dl
> python package. This allows seeing more than the last 15 episodes and
> downloading episodes in previously unsupported formats (audio-only, etc.).
>
> New features
>
> #231 support paged feeds (RFC 5005)
> New extension using youtube_dl to manage Youtube subscriptions and
> downloads (#652)
>
> Improvements
>
> Open website extension: also from podcast
> Enhanced youtube episode descriptions (#654)
> Don't show notifications forever on Windows 7
> soundcloud: use stream or download url when applicable
> fix edit config boolean editor: align left
> Format number of episodes using (locale-aware) thousands separators
> (#675, #676)
>
> Bug fixes
>
> #635 Vimeo download fail
> #649 Progress icon doesn't appear when downloading a failed or paused
> episode
> #648 Checking for new episodes clears file_size for some downloaded
> files
> #547 Download progress not updated on auto download
> View > Show Toolbar always disabled
> never deleted Win32 Powershell Notifications on Win7 (#659)
> #673 downloading files with youtube-dl extension fails if format_ids is
> X+Y
> #658 update feeds on startup extension conflicts with resume download
>
>
> 3.10.11 was just a bugfix
> https://github.com/gpodder/gpodder/releases/tag/3.10.11
>
> Bug fixes
>
> #683 Search for new episodes on startup extension broken in 3.10.10
>
> Tim.
>
Poke.
Index: Makefile
===
RCS file: /cvs/ports/net/gpodder/Makefile,v
retrieving revision 1.21
diff -u -p -r1.21 Makefile
--- Makefile6 Jul 2019 20:12:46 - 1.21
+++ Makefile13 Oct 2019 20:16:54 -
@@ -2,7 +2,7 @@
COMMENT= media aggregator and podcast client
-MODPY_EGG_VERSION= 3.10.9
+MODPY_EGG_VERSION= 3.10.11
GH_ACCOUNT=gpodder
GH_PROJECT=gpodder
@@ -29,6 +29,7 @@ RUN_DEPENDS= devel/desktop-file-utils \
devel/py-gobject3${MODPY_FLAVOR} \
net/mygpoclient \
textproc/py-podcastparser${MODPY_FLAVOR} \
+ www/youtube-dl \
www/webkitgtk4 \
x11/dbus-python${MODPY_FLAVOR} \
x11/gtk+3,-guic
Index: distinfo
===
RCS file: /cvs/ports/net/gpodder/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- distinfo6 Jul 2019 20:12:46 - 1.9
+++ distinfo13 Oct 2019 20:16:54 -
@@ -1,2 +1,2 @@
-SHA256 (gpodder-3.10.9.tar.gz) = q36rTp5jVWxGOp79zwsmBp9WwEfXzvf9IpMbcboCXb8=
-SIZE (gpodder-3.10.9.tar.gz) = 1027329
+SHA256 (gpodder-3.10.11.tar.gz) = 6qWwt0ugBpk0Lb8xfVLxxOUtd7cxP8kUTNAe6mizFMw=
+SIZE (gpodder-3.10.11.tar.gz) = 1040876
Index: pkg/PLIST
===
RCS file: /cvs/ports/net/gpodder/pkg/PLIST,v
retrieving revision 1.10
diff -u -p -r1.10 PLIST
--- pkg/PLIST 6 Jul 2019 20:12:46 - 1.10
+++ pkg/PLIST 13 Oct 2019 20:16:54 -
@@ -34,8 +34,6 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/gpodder/${MODPY_PYCACHE}extensions.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/gpodder/${MODPY_PYCACHE}feedcore.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/gpodder/${MODPY_PYCACHE}feedcore.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/gpodder/${MODPY_PYCACHE}feedservice.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/gpodder/${MODPY_PYCACHE}feedservice.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/gpodder/${MODPY_PYCACHE}jsonconfig.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/gpodder/${MODPY_PYCACHE}jsonconfig.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/gpodder/${MODPY_PYCACHE}log.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -52,6 +50,8 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/gpodder/${MODPY_PYCACHE}player.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/gpodder/${MODPY_PYCACHE}query.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/gpodder/${MODPY_PYCACHE}query.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gpodder/${MODPY_PYCACHE}registry.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/gpodder/${MODPY_PYCACHE}registry.${MODPY_PYC_MAG
Re: [NEW] comms/pterm-6.0.4
trondd wrote: > trondd wrote: > > > trondd wrote: > > > > > Stuart Henderson wrote: > > > > > > > On 2019/09/29 16:00, trondd wrote: > > > > > Stuart Henderson wrote: > > > > > > > > > > > tar is mangled (sent as text/plain). > > > > > > > > > > > > On 2019/09/28 10:31, trondd wrote: > > > > > > > Bump to the top. > > > > > > > > > > > > > > No retro-computing/BBS nostalgia here? :P > > > > > > > > > > > > > > Thanks. > > > > > > > Tim. > > > > > > > > > > > > > > On Sat, September 21, 2019 5:32 pm, trondd wrote: > > > > > > > > New port of comms/pterm, aka PLATOterm. > > > > > > > > > > > > > > > > PLATO is a BBS-like system with roots in training and education > > > > > > > > but grew > > > > > > > > into a community through muti-user games, messaging, and chat. > > > > > > > > There's > > > > > > > > been a resurgence the past few years with effort from > > > > > > > > IRATA.online and > > > > > > > > ports of pterm to different OS's and retro-computers. > > > > > > > > > > > > > > > > The binary is officially 'pterm' but I had to rename it to > > > > > > > > 'platoterm' as > > > > > > > > putty already has a pterm binary. > > > > > > > > > > > > > > > > Only been able to test on amd64. Don't know how to test the > > > > > > > > floppy > > > > > > > > support yet, either. > > > > > > > > > > > > > > > > Default connection is to cyber1's system, but IRATA.online is > > > > > > > > free to sign > > > > > > > > up and also has a guest account for checking it out. If you > > > > > > > > want to try > > > > > > > > it, be sure to know the PLATO terminal keyoard maping to a PC > > > > > > > > keyboard: > > > > > > > > https://cyber1.org/keyboard.asp (it's also in pterm's help menu) > > > > > > > > > > > > > > > > Tim. > > > > > > > > > > > > > > > > DESCR: > > > > > > > > Pterm is a terminal emulator designed for connecting to > > > > > > > > PLATO-like > > > > > > > > systems such as Cyber1 and the Cybis release from Tom Hunter. > > > > > > > > It also > > > > > > > > has the ability to run MicroTutor from floppy disk images. > > > > > > > > > > > > > > > > PLATO is a multi-user system hosting games, educational > > > > > > > > material, and > > > > > > > > communities. A PLATO server is hosted at IRATA.online with > > > > > > > > free access > > > > > > > > and a CYBIS system is hosted at cyber1.org > > > > > > > > > > > > > > > > Ughsorry. > > > > > > > > > > > > > > > > > > New tgz attached, but here's the diff compared to yours so you can see > > > > my > > > > changes easily; > > > > > > > > - tidy Makefile > > > > - use python module, don't hardcode 3.7 > > > > - simpler way to override CC/CXX, also honour CFLAGS > > > > - update the py2-only script to py3 so it can run without a build dep on > > > > multiple pythons; it wasn't run before because it needed a python -> > > > > python2.7 > > > > symlink > > > > > > I don't believe this script does run. I think it's only used when > > > upstream > > > creates a release package. So either way... I'll push this upstream as > > > they > > > should move to Python3 anyway. Then this can go away later. > > > > > > > > > > - just remove the lines in wxversion.py, simpler than commenting-out > > > > > > > > I see a runtime problem, if I go to help -> pterm keyboard (which seems > > > > pretty > > > > much essential for a new user?) it has some assertion failures: > > > > > > > > /src/gtk/colour.cpp(185): assert "IsOk()" failed in Red(): invalid > > > > colour > > > > /src/gtk/colour.cpp(196): assert "IsOk()" failed in Green(): invalid > > > > colour > > > > /src/gtk/colour.cpp(207): assert "IsOk()" failed in Blue(): invalid > > > > colour > > > > > > > > > > I was going to leave this to upstream to resolve but I found a fix. It's > > > already there but commented out so maybe there is a downside I haven't > > > hit yet. > > > > > > Tim. > > > > > > > > > > Unlock bump. I tweaked a word in the DESCR to clarify that both PLATO > > services > > (known to me) are free. It's just that IRATA.online has a guest account for > > looking around. > > > > Also successfully tested floppy disk image support. > > > > Tim. > > Ok, one more tweak. Add MESSAGE to mention the executable rename to platoterm > as seen in editors/vis. > > Tim. > Also poke this one again. pterm-6.0.4.tgz Description: application/gzip
回复: [NEW]databases/p5-SQL-Abstract-More
Revised patch that add the missing TEST_DEPENDS. wen 发件人: Andrew Hewus Fresh 发送时间: 2019年9月21日 9:12 收件人: wen heping 抄送: ports@openbsd.org 主题: Re: [NEW]databases/p5-SQL-Abstract-More On Fri, Sep 06, 2019 at 01:08:07PM +, wen heping wrote: > Hi, ports@: > >Here is a patch to create new port databases/p5-SQL-Abstract-More, > which is required by the update of databases/p5-DBIx-DataModel. >Currently databases/p5-DBIx-DataModel failed with regression tests. > We shall update it and it will pass all the tests. > >It build well and passed all tests on amd64-head system. > > Comments? OK? > wen Appears to be missing a TEST_DEPENDS += devel/p5-Test-Deep With that, OK afresh1@ p5-SQL-Abstract-More-p1.tar.gz Description: p5-SQL-Abstract-More-p1.tar.gz
Re: devel/git: cpu and memory tracking, LIB_DEPENDS
Jeremie Courreges-Anglas writes:
> ++#elif defined(HAVE_BSD_SYSCTL) && (defined(HW_MEMSIZE) ||
> defined(HW_PHYSMEM64))
> + int64_t physical_memory;
HW_MEMSIZE and HW_PHYSMEM64 return uint64_t, not int64_t.
> ++#elif defined(HAVE_BSD_SYSCTL) && defined(HW_PHYSMEM))
> ++int physical_memory;
HW_PHYSMEM returns u_long (unsigned long) on DragonFly and FreeBSD.
int or signed long may upset -fsanitize=integer on 32-bit archs.
Note, the code can be simplified via sysconf(3).
--- builtin/gc.c2019-11-04 05:07:07 UTC
+++ builtin/gc.c
@@ -243,20 +243,27 @@ static uint64_t total_ram(void)
if (!sysinfo(&si))
return si.totalram;
-#elif defined(HAVE_BSD_SYSCTL) && (defined(HW_MEMSIZE) || defined(HW_PHYSMEM))
- int64_t physical_memory;
- int mib[2];
- size_t length;
-
- mib[0] = CTL_HW;
+#elif defined(HAVE_BSD_SYSCTL) && (defined(HW_MEMSIZE) ||
defined(HW_PHYSMEM64) || defined(HW_PHYSMEM))
+# if defined(HW_MEMSIZE) || defined(HW_PHYSMEM64)
+ uint64_t physical_memory;
+# else
+ u_long physical_memory;
+# endif
+ int mib[2] = {
+ CTL_HW,
# if defined(HW_MEMSIZE)
- mib[1] = HW_MEMSIZE;
+ HW_MEMSIZE,
+# elif defined(HW_PHYSMEM64)
+ HW_PHYSMEM64,
# else
- mib[1] = HW_PHYSMEM;
+ HW_PHYSMEM,
# endif
- length = sizeof(int64_t);
+ };
+ size_t length = sizeof(mib);
if (!sysctl(mib, 2, &physical_memory, &length, NULL, 0))
return physical_memory;
+#elif defined(_SC_PHYS_PAGES) && defined(_SC_PAGESIZE)
+ return (uint64_t)sysconf(_SC_PHYS_PAGES) * sysconf(_SC_PAGESIZE);
#elif defined(GIT_WINDOWS_NATIVE)
MEMORYSTATUSEX memInfo;
Re: NEW: devel/llvm (Extra Clang Tools) #2
On Sun Oct 27, 2019 at 05:07:39PM +0100, Jeremie Courreges-Anglas wrote:
> On Sat, Oct 19 2019, Rafael Sadowski wrote:
> > On Sat Sep 28, 2019 at 01:23:06PM +0200, Jeremie Courreges-Anglas wrote:
> >>
> >> Hi,
> >>
> >> sorry for the rather late reply. I've been mulling over this for a few
> >> days.
> >>
> >> On Sat, Sep 21 2019, Rafael Sadowski wrote:
> >> > Long time ago I was trying to import the clang extra tool sets without
> >> > luck. It failed because the -extra subpackage has an effect on -main.
> >> > More precisely, the cmake parts from the main package.
> >>
> >> Debian (as usual) seems to have split llvm in many subpackages. Surely
> >> they must have hit and solved a similar problem.
> >>
> >> > For this reason, I think it is best to build/install the extra tools in
> >> > the main package. I'd be in charge here, too.
> >> >
> >> > I also was trying to crate an extra packages, which includes only the
> >> > extra parts but this rise more issue in the eco system.
> >>
> >> So which problems did you hit?
> >>
> >> > I have to deal with this topic because more and more people come up to
> >> > me and ask about my last try, last otto@.
> >>
> >> > That's good because I think these tools are helpful.
> >>
> >> I can understand that, but my stance is simple: my main interest for
> >> devel/llvm is the ports tree.
> >>
> >> I'm not happy with longer devel/llvm *build* times but hey, if that's
> >> the only solution available (is it?), fine, let's build those under
> >> devel/llvm.
> >>
> >> The size increase of the -main package is a killer IMO: 605MB -> 867MB
> >> on amd64. sparc64 goes from 714MB to 1.2GB. Most of this size
> >> increase comes from the additional executables, so removing the
> >> additional .a libs (if possible) does not help.
> >>
> >> So as far as I'm concerned I don't like this approach, especially with
> >> 6.6 on the radar.
> >>
> >> --
> >> jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
> >>
> >
> > Hi Jeremie, hey ports@,
> >
> > I understand your objection and I have dealt more intensively with the
> > install step in the llvm packege and ninja. I think I found THE
> > SOLUTION. I have figured out how to install ONLY the extra tools.
> > Besides, we don't have to build the whole LLVM stack.
>
> From a quick glance at the docs, this type of target is a ninja feature.
> If you apply the same trick to the build step:
>
> ALL_TARGET =tools/clang/tools/extra/all
>
> the build step moves from 3827 to 2065 targets, which should improve
> build times.
>
> > Please find attached devel/clang-tools-extra as tarball. This version
> > was successfully tested by otto@.
> >
> > I'd take care of the extra tools and keep the port in sync with
> > devel/llvm.
> >
> > OK, concerns? Thanks, RS
>
> The shared libs hack looks nasty but doesn't seem needed. Well, at
> least when restricting the build step to "tools/clang/tools/extra/all".
> I would just get rid of it.
Strange, I thought I tested it. Maybe I picked the wrong one. Works for
me and save a lot of build time (Still too much).
>
> More tweaks:
> - swig is needed for lldb (absent from your port)
> - py-recommonmark is needed for sphinx docs (disabled)
> - devel/llvm already depends on devel/gtest, no need to replicate the
> dep here
> - on !clang archs, devel/llvm already has the proper dep on eg++, no
> need to replicate here
Thanks!
>
> Here's an updated port with those points addressed.
>
> I suspect that a lot of the arch-specific Makefile goo isn't needed any
> more. The -Dpowerpc bits should probably be left out.
>
>
Works fine here but it looks like we both missed the WANTLIB line:
WANTLIB += ${COMPILER_LIBCXX} c curses edit m z
OK to move it into the tree?
Re: PostgreSQL 12.0
On 10/29 07:35, Jeremy Evans wrote:
> I ran a partial bulk of the PostgreSQL dependencies, and this is what is
> broke with PostgreSQL 12:
>
> databases/citus
> databases/pg_statsinfo
> databases/kdb
> databases/postgresql-pllua
> databases/postgresql-plv8
> databases/skytools
> security/heimdal,-libs (appears unrelated, will try rebuilding)
> x11/qt3,-examples
The security/heimdal failure was unrelated. I just removed
postgresql-plv8.
Below is a diff to update PostgreSQL to 12.0, postgresql-previous to
11.5, and handle the fallout in the other ports mentioned above.
I recommend we wait until 12.1, update this patch for 12.1, then run a
bulk and commit if there are no problems.
We might want to consider removing skytools in the next major PostgreSQL
update if it breaks, as it appears to be dead upstream.
Thanks,
Jeremy
Index: databases/postgresql/Makefile
===
RCS file: /cvs/ports/databases/postgresql/Makefile,v
retrieving revision 1.256
diff -u -p -u -p -r1.256 Makefile
--- databases/postgresql/Makefile 27 Aug 2019 19:49:46 - 1.256
+++ databases/postgresql/Makefile 2 Nov 2019 11:22:46 -
@@ -7,9 +7,8 @@ COMMENT-contrib=PostgreSQL RDBMS contrib
COMMENT-plpython=Python procedural language for PostgreSQL
COMMENT-pg_upgrade=Support for upgrading PostgreSQL data from previous version
-VERSION= 11.5
-PREV_MAJOR=10
-REVISION-server=0
+VERSION= 12.0
+PREV_MAJOR=11
DISTNAME= postgresql-${VERSION}
PKGNAME-main= postgresql-client-${VERSION}
PKGNAME-server=postgresql-server-${VERSION}
@@ -20,10 +19,10 @@ PKGNAME-pg_upgrade=postgresql-pg_upgrade
CATEGORIES=databases
-SHARED_LIBS= ecpg7.9 \
- ecpg_compat 4.9 \
- pgtypes 4.8 \
- pq 6.10
+SHARED_LIBS= ecpg7.10 \
+ ecpg_compat 4.10 \
+ pgtypes 4.9 \
+ pq 6.11
HOMEPAGE= http://www.postgresql.org/
@@ -96,8 +95,10 @@ MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/conf
ALL_TARGET=world
INSTALL_TARGET=install-world
-LIB_DEPENDS-main= textproc/libxml
-WANTLIB-main = ${WANTLIB} xml2
+LIB_DEPENDS-main= archivers/xz \
+ converters/libiconv \
+ textproc/libxml
+WANTLIB-main = ${WANTLIB} iconv lzma xml2
LIB_DEPENDS-server= databases/postgresql=${VERSION} \
@@ -163,5 +164,7 @@ post-install:
${INSTALL_DATA} ${DOCS} ${PREFIX}/share/doc/postgresql
perl -i -pe ${INSTALL_REPLACE} \
${PREFIX}/lib/postgresql/pgxs/src/Makefile.global
+ ${INSTALL_DATA} ${WRKSRC}/src/backend/utils/errcodes.txt \
+ ${PREFIX}/share/postgresql
.include
Index: databases/postgresql/distinfo
===
RCS file: /cvs/ports/databases/postgresql/distinfo,v
retrieving revision 1.80
diff -u -p -u -p -r1.80 distinfo
--- databases/postgresql/distinfo 12 Aug 2019 16:40:40 - 1.80
+++ databases/postgresql/distinfo 3 Oct 2019 15:13:21 -
@@ -1,2 +1,2 @@
-SHA256 (postgresql-11.5.tar.gz) = 9jmvD4w/HkcOQcgQjL2upYNrJzjK3UIhNaoqD+vIrng=
-SIZE (postgresql-11.5.tar.gz) = 25940612
+SHA256 (postgresql-12.0.tar.gz) = FcfyZ7R212THlAHX9h85x2IiMUlR935ok6WFTbJrZhY=
+SIZE (postgresql-12.0.tar.gz) = 26393892
Index: databases/postgresql/patches/patch-src_bin_scripts_vacuumdb_c
===
RCS file:
/cvs/ports/databases/postgresql/patches/patch-src_bin_scripts_vacuumdb_c,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-src_bin_scripts_vacuumdb_c
--- databases/postgresql/patches/patch-src_bin_scripts_vacuumdb_c 13 Nov
2017 17:17:30 - 1.2
+++ databases/postgresql/patches/patch-src_bin_scripts_vacuumdb_c 2 Oct
2019 15:53:06 -
@@ -2,9 +2,9 @@ $OpenBSD: patch-src_bin_scripts_vacuumdb
Index: src/bin/scripts/vacuumdb.c
--- src/bin/scripts/vacuumdb.c.orig
+++ src/bin/scripts/vacuumdb.c
-@@ -10,6 +10,8 @@
- *-
- */
+@@ -14,6 +14,8 @@
+ #define FD_SETSIZE 1024 /* must set before winsock2.h
is included */
+ #endif
+#include /* FD_SETSIZE */
+
Index: databases/postgresql/patches/patch-src_include_storage_s_lock_h
===
RCS file:
/cvs/ports/databases/postgresql/patches/patch-src_include_storage_s_lock_h,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 patch-src_include_storage_s_lock_h
--- databases/postgresql/patches/patch-src_include_storage_s_lock_h 18 Feb
2018 17:37:13 - 1.5
+++ databases/postgresql/patches/patch-src_include_storage_s_lock_h 2 Oct
2019 15:53:06 -
@@ -2,7 +2,7 @@ $OpenBSD: patch-src_include_storage_s_lo
Index: src/include/storage/s_lock.h
--- src/includ
Re: New/Replacement: Kicad 5.1.4
On Fri, Nov 1, 2019 at 7:41 AM Tracey Emery wrote:
> Ok, the attached port builds and passes port-lib-depends-check.
>
> stef$ make port-lib-depends-check
> stef$ /usr/ports/infrastructure/bin/portcheck
> cad/oce
>
> Had to add WANTLIB += ${COMPILER_LIBCXX}.
ok bentley@
Re: devel/git: cpu and memory tracking, LIB_DEPENDS
On Tue, 2019-11-05 at 09:17 +0100, Jan Beich wrote:
> Jeremie Courreges-Anglas writes:
>
> >
> > ++#elif defined(HAVE_BSD_SYSCTL) && (defined(HW_MEMSIZE) ||
> > defined(HW_PHYSMEM64))
> > + int64_t physical_memory;
> HW_MEMSIZE and HW_PHYSMEM64 return uint64_t, not int64_t.
>
> >
> > ++#elif defined(HAVE_BSD_SYSCTL) && defined(HW_PHYSMEM))
> > ++ int physical_memory;
> HW_PHYSMEM returns u_long (unsigned long) on DragonFly and FreeBSD.
> int or signed long may upset -fsanitize=integer on 32-bit archs.
>
> Note, the code can be simplified via sysconf(3).
>
> --- builtin/gc.c 2019-11-04 05:07:07 UTC
> +++ builtin/gc.c
> @@ -243,20 +243,27 @@ static uint64_t total_ram(void)
>
> if (!sysinfo(&si))
> return si.totalram;
> -#elif defined(HAVE_BSD_SYSCTL) && (defined(HW_MEMSIZE) ||
> defined(HW_PHYSMEM))
> - int64_t physical_memory;
> - int mib[2];
> - size_t length;
> -
> - mib[0] = CTL_HW;
> +#elif defined(HAVE_BSD_SYSCTL) && (defined(HW_MEMSIZE) ||
> defined(HW_PHYSMEM64) || defined(HW_PHYSMEM))
> +# if defined(HW_MEMSIZE) || defined(HW_PHYSMEM64)
> + uint64_t physical_memory;
> +# else
> + u_long physical_memory;
> +# endif
> + int mib[2] = {
> + CTL_HW,
> # if defined(HW_MEMSIZE)
> - mib[1] = HW_MEMSIZE;
> + HW_MEMSIZE,
> +# elif defined(HW_PHYSMEM64)
> + HW_PHYSMEM64,
> # else
> - mib[1] = HW_PHYSMEM;
> + HW_PHYSMEM,
> # endif
> - length = sizeof(int64_t);
> + };
> + size_t length = sizeof(mib);
size_t length = sizeof(physical_memory);
> if (!sysctl(mib, 2, &physical_memory, &length, NULL, 0))
> return physical_memory;
> +#elif defined(_SC_PHYS_PAGES) && defined(_SC_PAGESIZE)
> + return (uint64_t)sysconf(_SC_PHYS_PAGES) * sysconf(_SC_PAGESIZE);
> #elif defined(GIT_WINDOWS_NATIVE)
> MEMORYSTATUSEX memInfo;
>
>
Re: devel/git: cpu and memory tracking, LIB_DEPENDS
Kurt Miller writes:
> On Tue, 2019-11-05 at 09:17 +0100, Jan Beich wrote:
>
>> Jeremie Courreges-Anglas writes:
>>
>> >
>> > ++#elif defined(HAVE_BSD_SYSCTL) && (defined(HW_MEMSIZE) ||
>> > defined(HW_PHYSMEM64))
>> > + int64_t physical_memory;
>> HW_MEMSIZE and HW_PHYSMEM64 return uint64_t, not int64_t.
>>
>> >
>> > ++#elif defined(HAVE_BSD_SYSCTL) && defined(HW_PHYSMEM))
>> > ++ int physical_memory;
>> HW_PHYSMEM returns u_long (unsigned long) on DragonFly and FreeBSD.
>> int or signed long may upset -fsanitize=integer on 32-bit archs.
>>
>> Note, the code can be simplified via sysconf(3).
>>
>> --- builtin/gc.c 2019-11-04 05:07:07 UTC
>> +++ builtin/gc.c
>> @@ -243,20 +243,27 @@ static uint64_t total_ram(void)
>>
>> if (!sysinfo(&si))
>> return si.totalram;
>> -#elif defined(HAVE_BSD_SYSCTL) && (defined(HW_MEMSIZE) ||
>> defined(HW_PHYSMEM))
>> -int64_t physical_memory;
>> -int mib[2];
>> -size_t length;
>> -
>> -mib[0] = CTL_HW;
>> +#elif defined(HAVE_BSD_SYSCTL) && (defined(HW_MEMSIZE) ||
>> defined(HW_PHYSMEM64) || defined(HW_PHYSMEM))
>> +# if defined(HW_MEMSIZE) || defined(HW_PHYSMEM64)
>> +uint64_t physical_memory;
>> +# else
>> +u_long physical_memory;
>> +# endif
>> +int mib[2] = {
>> +CTL_HW,
>> # if defined(HW_MEMSIZE)
>> -mib[1] = HW_MEMSIZE;
>> +HW_MEMSIZE,
>> +# elif defined(HW_PHYSMEM64)
>> +HW_PHYSMEM64,
>> # else
>> -mib[1] = HW_PHYSMEM;
>> +HW_PHYSMEM,
>> # endif
>> -length = sizeof(int64_t);
>> +};
>> +size_t length = sizeof(mib);
>
> size_t length = sizeof(physical_memory);
Sorry. sizeof(int[2]) > sizeof(unsigned long) on i386, so sysctl(3)
could overflow &physical_memory iff FreeBSD kernel tried to return
larger value or padded it with junk/zeros.
Re: devel/git: cpu and memory tracking, LIB_DEPENDS
On Tue, 2019-11-05 at 14:44 +0100, Jan Beich wrote:
> Kurt Miller writes:
>
> >
> > On Tue, 2019-11-05 at 09:17 +0100, Jan Beich wrote:
> >
> > >
> > > Jeremie Courreges-Anglas writes:
> > >
> > > >
> > > >
> > > > ++#elif defined(HAVE_BSD_SYSCTL) && (defined(HW_MEMSIZE) ||
> > > > defined(HW_PHYSMEM64))
> > > > + int64_t physical_memory;
> > > HW_MEMSIZE and HW_PHYSMEM64 return uint64_t, not int64_t.
> > >
> > > >
> > > >
> > > > ++#elif defined(HAVE_BSD_SYSCTL) && defined(HW_PHYSMEM))
> > > > ++ int physical_memory;
> > > HW_PHYSMEM returns u_long (unsigned long) on DragonFly and FreeBSD.
> > > int or signed long may upset -fsanitize=integer on 32-bit archs.
> > >
> > > Note, the code can be simplified via sysconf(3).
> > >
> > > --- builtin/gc.c 2019-11-04 05:07:07 UTC
> > > +++ builtin/gc.c
> > > @@ -243,20 +243,27 @@ static uint64_t total_ram(void)
> > >
> > > if (!sysinfo(&si))
> > > return si.totalram;
> > > -#elif defined(HAVE_BSD_SYSCTL) && (defined(HW_MEMSIZE) ||
> > > defined(HW_PHYSMEM))
> > > - int64_t physical_memory;
> > > - int mib[2];
> > > - size_t length;
> > > -
> > > - mib[0] = CTL_HW;
> > > +#elif defined(HAVE_BSD_SYSCTL) && (defined(HW_MEMSIZE) ||
> > > defined(HW_PHYSMEM64) || defined(HW_PHYSMEM))
> > > +# if defined(HW_MEMSIZE) || defined(HW_PHYSMEM64)
> > > + uint64_t physical_memory;
> > > +# else
> > > + u_long physical_memory;
> > > +# endif
> > > + int mib[2] = {
> > > + CTL_HW,
> > > # if defined(HW_MEMSIZE)
> > > - mib[1] = HW_MEMSIZE;
> > > + HW_MEMSIZE,
> > > +# elif defined(HW_PHYSMEM64)
> > > + HW_PHYSMEM64,
> > > # else
> > > - mib[1] = HW_PHYSMEM;
> > > + HW_PHYSMEM,
> > > # endif
> > > - length = sizeof(int64_t);
> > > + };
> > > + size_t length = sizeof(mib);
> > size_t length = sizeof(physical_memory);
> Sorry. sizeof(int[2]) > sizeof(unsigned long) on i386, so sysctl(3)
> could overflow &physical_memory iff FreeBSD kernel tried to return
> larger value or padded it with junk/zeros.
I think you are confused. The fourth argument to sysctl(2) is
the address of a size_t that contains sizeof the third argument
before the call. Also HW_PHYSMEM64 is int64_t on OpenBSD.
-Kurt
UNBREAK x11/qt5/docs
Here is a diff to unbreak qt5-docs. I have no clue to test qch and to
be honest I don't care. The HTML stuff looks okay.
qtwebkit is no longer in the main directory so I added a second
MASTER_SITES.
OK?
Index: Makefilek
===
RCS file: /cvs/ports/x11/qt5/docs/Makefile,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 Makefile
--- Makefile15 Aug 2019 20:41:15 - 1.7
+++ Makefile5 Nov 2019 13:52:30 -
@@ -1,14 +1,11 @@
# $OpenBSD: Makefile,v 1.7 2019/08/15 20:41:15 ajacoutot Exp $
-BROKEN = does not package (PLIST members are missing in fakedir)
COMMENT-html = HTML documentation for Qt5
COMMENT-qch = qdoc-compiled documentation for Qt5
PKGNAME = qt5-docs-${QT5_VERSION}
PKGNAME-html = qt5-html-${QT5_VERSION}
PKGNAME-qch = qt5-qch-${QT5_VERSION}
-REVISION-html =1
-REVISION-qch = 1
MULTI_PACKAGES = -html -qch
SUBPACKAGE ?= -html
@@ -46,14 +43,14 @@ DOC_COMPONENTS = \
qttools \
qtvirtualkeyboard \
qtwebchannel \
- qtwebkit \
qtwebsockets \
qtx11extras \
qtxmlpatterns
-MASTER_SITES0 =
http://download.qt.io/community_releases/${DIST_VERSION:R}/${QT5_WEBKIT_VERSION}-final/
-DISTFILES =
${DOC_COMPONENTS:Nqtwebkit:C/$/-opensource-src-${QT5_DIST_VERSION}${EXTRACT_SUFX}/}
-DISTFILES += qtwebkit-opensource-src-${QT5_WEBKIT_VERSION}${EXTRACT_SUFX}
+MASTER_SITES0 =
https://download.qt.io/community_releases/${DIST_VERSION:R}/${QT5_WEBKIT_VERSION}-final/
+MASTER_SITES1 =
https://ftp1.nluug.nl/languages/qt/community_releases/${DIST_VERSION:R}/${QT5_WEBKIT_VERSION}-final/
+DISTFILES =
${DOC_COMPONENTS:Nqtwebkit:C/$/-opensource-src-${QT5_DIST_VERSION}${EXTRACT_SUFX}/}:0
+DISTFILES += qtwebkit-opensource-src-${QT5_WEBKIT_VERSION}${EXTRACT_SUFX}:1
MODQT5_USE_CXX11 = No
CONFIGURE_STYLE = none
Index: distinfo
===
RCS file: /cvs/ports/x11/qt5/docs/distinfo,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 distinfo
--- distinfo30 Oct 2018 08:08:40 - 1.6
+++ distinfo5 Nov 2019 13:52:30 -
@@ -1,66 +1,66 @@
-SHA256 (qt/qt3d-opensource-src-5.9.7.tar.xz) =
FBkRVZiJztWF0+ikUXjqxRm9o6BDXZo4O8k7KsW5bWo=
-SHA256 (qt/qtactiveqt-opensource-src-5.9.7.tar.xz) =
M6rKSKUveJkU6+hct5HORsymLzXDx7sbBYh5GlUG1wc=
-SHA256 (qt/qtbase-opensource-src-5.9.7.tar.xz) =
Nt2VdPAG6qHlr3gOSzPRH+OdCf18EvO52DKUF0vSjwA=
-SHA256 (qt/qtcanvas3d-opensource-src-5.9.7.tar.xz) =
mLMMtbggNlWhWCGz9pAz3O6HoZJj5NXmZUdb2RrmP4w=
-SHA256 (qt/qtcharts-opensource-src-5.9.7.tar.xz) =
Fs02ckGy4M07yK6m+HRZjNGK2Dty7tifJxO3dyclcuY=
-SHA256 (qt/qtconnectivity-opensource-src-5.9.7.tar.xz) =
dPgf5eeVckZIj71BtxDstLv7FwWuweKPmlI/Zx0V7zg=
-SHA256 (qt/qtdatavis3d-opensource-src-5.9.7.tar.xz) =
mxJKN8TYd4fiRmu0TmUfcA44+2JDJmIDPNWz7heqViE=
-SHA256 (qt/qtdeclarative-opensource-src-5.9.7.tar.xz) =
aEI3ZahJ0QXe1WiTcGzlVBw7joIhaX7cgnOM5UxiRlw=
-SHA256 (qt/qtdoc-opensource-src-5.9.7.tar.xz) =
0v9dQu7bqzFQxVApKyeOdCUuL1jRInqhK8ayVoFvRu8=
-SHA256 (qt/qtgamepad-opensource-src-5.9.7.tar.xz) =
LnVH1wjlm66NLUTOBzRfLSQjYiSV6BAsWObLBAcyggg=
-SHA256 (qt/qtgraphicaleffects-opensource-src-5.9.7.tar.xz) =
Tezc8+4HmGEW1NcfdO9QAhx/pr8DD2VoYtZtOeJQHfo=
-SHA256 (qt/qtimageformats-opensource-src-5.9.7.tar.xz) =
YgU+ZgFMEu21agXSQGx4xrlvxmwrWqYz6YTJ/vOYwKo=
-SHA256 (qt/qtlocation-opensource-src-5.9.7.tar.xz) =
grWz1/PwezAz0zgeqUC2AmzaDsFQD2GOpKFfMIz95lI=
-SHA256 (qt/qtmultimedia-opensource-src-5.9.7.tar.xz) =
vfcH/5B+UYOXVHEN63BTnCyCBijFEr7JPPkI+gaLDxg=
-SHA256 (qt/qtnetworkauth-opensource-src-5.9.7.tar.xz) =
F2Q8oyo3MykgCAtAXeLj6uvtWuSCkBnyMXwd7PXnyJI=
-SHA256 (qt/qtpurchasing-opensource-src-5.9.7.tar.xz) =
0ZBKYA++d/BKwIoOWwV2sFG6iuQbLqk+8JiArEDUfeM=
-SHA256 (qt/qtquickcontrols-opensource-src-5.9.7.tar.xz) =
4POAzdXFIB9AFBL64VTU4HrwO3aKLM731PX3z8USf8o=
-SHA256 (qt/qtquickcontrols2-opensource-src-5.9.7.tar.xz) =
YH1zg6WJZyFQKlGfxoOw8vB/HtenL77gVoltpM7BOXE=
-SHA256 (qt/qtremoteobjects-opensource-src-5.9.7.tar.xz) =
nA7KjXGZkpJFDgksWMH3NNDqzIn/F1R2VdlNSRzTNto=
-SHA256 (qt/qtscript-opensource-src-5.9.7.tar.xz) =
x9QRBKLAlT/sRR3KuVy+KyDEtJJbK9fjwVApWYMaY1c=
-SHA256 (qt/qtscxml-opensource-src-5.9.7.tar.xz) =
MC6Ab336JZbvkDOLCSDjBFu9APM/WwB6f4PYQJfA4nc=
-SHA256 (qt/qtsensors-opensource-src-5.9.7.tar.xz) =
GblVzR/JKpKp3qzqQjJN90FBH6s09G8jT1D3nzIl0F0=
-SHA256 (qt/qtserialbus-opensource-src-5.9.7.tar.xz) =
K9CIwwBp9fLuxrduR3PgNWUFyHboL25rz+uB2pUp31g=
-SHA256 (qt/qtserialport-opensource-src-5.9.7.tar.xz) =
UKcwLHze3GHoGi7yUu+dyb+q6YonteOUgavIckMlHhc=
-SHA256 (qt/qtspeech-opensource-src-5.9.7.tar.xz) =
4HyW5QwgYjkTGpSbihTsJqAsNxqaWQXvNoJvFKDFy1o=
-SHA256 (qt/qtsvg-opensource-src-5.9.7.tar.xz) =
Yo8iuEculu2AM9VJEobOKrWyx7n+D+RorNeLRY3HVWQ=
-SHA256 (qt/qttools-opensource-
Re: devel/git: cpu and memory tracking, LIB_DEPENDS
Kurt Miller writes:
> On Tue, 2019-11-05 at 14:44 +0100, Jan Beich wrote:
>
>> Kurt Miller writes:
>>
>> >
>> > On Tue, 2019-11-05 at 09:17 +0100, Jan Beich wrote:
>> >
>> > >
>> > > Jeremie Courreges-Anglas writes:
>> > >
>> > > >
>> > > >
>> > > > ++#elif defined(HAVE_BSD_SYSCTL) && (defined(HW_MEMSIZE) ||
>> > > > defined(HW_PHYSMEM64))
>> > > > + int64_t physical_memory;
>> > > HW_MEMSIZE and HW_PHYSMEM64 return uint64_t, not int64_t.
>> > >
>> > > >
>> > > >
>> > > > ++#elif defined(HAVE_BSD_SYSCTL) && defined(HW_PHYSMEM))
>> > > > ++ int physical_memory;
>> > > HW_PHYSMEM returns u_long (unsigned long) on DragonFly and FreeBSD.
>> > > int or signed long may upset -fsanitize=integer on 32-bit archs.
>> > >
>> > > Note, the code can be simplified via sysconf(3).
>> > >
>> > > --- builtin/gc.c 2019-11-04 05:07:07 UTC
>> > > +++ builtin/gc.c
>> > > @@ -243,20 +243,27 @@ static uint64_t total_ram(void)
>> > >
>> > > if (!sysinfo(&si))
>> > > return si.totalram;
>> > > -#elif defined(HAVE_BSD_SYSCTL) && (defined(HW_MEMSIZE) ||
>> > > defined(HW_PHYSMEM))
>> > > -int64_t physical_memory;
>> > > -int mib[2];
>> > > -size_t length;
>> > > -
>> > > -mib[0] = CTL_HW;
>> > > +#elif defined(HAVE_BSD_SYSCTL) && (defined(HW_MEMSIZE) ||
>> > > defined(HW_PHYSMEM64) || defined(HW_PHYSMEM))
>> > > +# if defined(HW_MEMSIZE) || defined(HW_PHYSMEM64)
>> > > +uint64_t physical_memory;
>> > > +# else
>> > > +u_long physical_memory;
>> > > +# endif
>> > > +int mib[2] = {
>> > > +CTL_HW,
>> > > # if defined(HW_MEMSIZE)
>> > > -mib[1] = HW_MEMSIZE;
>> > > +HW_MEMSIZE,
>> > > +# elif defined(HW_PHYSMEM64)
>> > > +HW_PHYSMEM64,
>> > > # else
>> > > -mib[1] = HW_PHYSMEM;
>> > > +HW_PHYSMEM,
>> > > # endif
>> > > -length = sizeof(int64_t);
>> > > +};
>> > > +size_t length = sizeof(mib);
>> > size_t length = sizeof(physical_memory);
>> Sorry. sizeof(int[2]) > sizeof(unsigned long) on i386, so sysctl(3)
>> could overflow &physical_memory iff FreeBSD kernel tried to return
>> larger value or padded it with junk/zeros.
>
> I think you are confused. The fourth argument to sysctl(2) is
> the address of a size_t that contains sizeof the third argument
> before the call. Also HW_PHYSMEM64 is int64_t on OpenBSD.
I didn't disagree. My reply was an attempt to understand what may go
wrong at runtime as the typo didn't trigger -fsanitize=address.
Re: devel/git: cpu and memory tracking, LIB_DEPENDS
On Tue, 2019-11-05 at 15:48 +0100, Jan Beich wrote:
> Kurt Miller writes:
>
> >
> > On Tue, 2019-11-05 at 14:44 +0100, Jan Beich wrote:
> >
> > >
> > > Kurt Miller writes:
> > >
> > > >
> > > >
> > > > On Tue, 2019-11-05 at 09:17 +0100, Jan Beich wrote:
> > > >
> > > > >
> > > > >
> > > > > Jeremie Courreges-Anglas writes:
> > > > >
> > > > > >
> > > > > >
> > > > > >
> > > > > > ++#elif defined(HAVE_BSD_SYSCTL) && (defined(HW_MEMSIZE) ||
> > > > > > defined(HW_PHYSMEM64))
> > > > > > + int64_t physical_memory;
> > > > > HW_MEMSIZE and HW_PHYSMEM64 return uint64_t, not int64_t.
> > > > >
> > > > > >
> > > > > >
> > > > > >
> > > > > > ++#elif defined(HAVE_BSD_SYSCTL) && defined(HW_PHYSMEM))
> > > > > > ++ int physical_memory;
> > > > > HW_PHYSMEM returns u_long (unsigned long) on DragonFly and FreeBSD.
> > > > > int or signed long may upset -fsanitize=integer on 32-bit archs.
> > > > >
> > > > > Note, the code can be simplified via sysconf(3).
> > > > >
> > > > > --- builtin/gc.c 2019-11-04 05:07:07 UTC
> > > > > +++ builtin/gc.c
> > > > > @@ -243,20 +243,27 @@ static uint64_t total_ram(void)
> > > > >
> > > > > if (!sysinfo(&si))
> > > > > return si.totalram;
> > > > > -#elif defined(HAVE_BSD_SYSCTL) && (defined(HW_MEMSIZE) ||
> > > > > defined(HW_PHYSMEM))
> > > > > - int64_t physical_memory;
> > > > > - int mib[2];
> > > > > - size_t length;
> > > > > -
> > > > > - mib[0] = CTL_HW;
> > > > > +#elif defined(HAVE_BSD_SYSCTL) && (defined(HW_MEMSIZE) ||
> > > > > defined(HW_PHYSMEM64) || defined(HW_PHYSMEM))
> > > > > +# if defined(HW_MEMSIZE) || defined(HW_PHYSMEM64)
> > > > > + uint64_t physical_memory;
> > > > > +# else
> > > > > + u_long physical_memory;
> > > > > +# endif
> > > > > + int mib[2] = {
> > > > > + CTL_HW,
> > > > > # if defined(HW_MEMSIZE)
> > > > > - mib[1] = HW_MEMSIZE;
> > > > > + HW_MEMSIZE,
> > > > > +# elif defined(HW_PHYSMEM64)
> > > > > + HW_PHYSMEM64,
> > > > > # else
> > > > > - mib[1] = HW_PHYSMEM;
> > > > > + HW_PHYSMEM,
> > > > > # endif
> > > > > - length = sizeof(int64_t);
> > > > > + };
> > > > > + size_t length = sizeof(mib);
> > > > size_t length = sizeof(physical_memory);
> > > Sorry. sizeof(int[2]) > sizeof(unsigned long) on i386, so sysctl(3)
> > > could overflow &physical_memory iff FreeBSD kernel tried to return
> > > larger value or padded it with junk/zeros.
> > I think you are confused. The fourth argument to sysctl(2) is
> > the address of a size_t that contains sizeof the third argument
> > before the call. Also HW_PHYSMEM64 is int64_t on OpenBSD.
> I didn't disagree. My reply was an attempt to understand what may go
> wrong at runtime as the typo didn't trigger -fsanitize=address.
Oh, sorry. I misunderstood your reply and thought it was
trying to explain why sizeof(mib) was correct.
-Kurt
Re: Valgrind: Delete 'USE_WXNEEDED = Yes' from Makefile
On Mon Oct 28, 2019 at 11:36:47AM +0900, Masato Asou wrote:
> From: Masato Asou
> Subject: Valgrind: Delete 'USE_WXNEEDED = Yes' from Makefile
> Date: Fri, 25 Oct 2019 16:40:43 +0900 (JST)
>
> > Hi ports,
> >
> > The Valgrind specifies 'READ | WRITE | EXEC' when allocating memory
> > for target program as follows:
> >
> > int fd = open("a.out", O_RDONLY);
> > void *addr = mmap(..., prot = PROT_READ | PROT_WRITE | PROT_EXEC, ...);
> > read(fd, addr, LENGTH);
> > /* Execute target program */
> >
> > I modified to specify 'READ | EXEC' after readind the target
> > program as folloes:
> >
> > int fd = open("a.out", O_RDONLY);
> > void *addr = mmap(..., prot = PROT_READ | PROT_WRITE, ...);
> > read(fd, addr, LENGTH);
> > mmap(addr, LENGTH, prot = PROT_READ | PROT_EXEC, ...);
> > /* Execute target program */
> >
> > Therefor, the target program area can not be rewritten.
> >
> > How about it?
>
> Sorry, I lost increment RESISION.
Compiles and runs fine on amd64. OK rsadowski@
> --
> ASOU Masato
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/devel/valgrind/Makefile,v
> retrieving revision 1.21
> diff -u -p -r1.21 Makefile
> --- Makefile 23 Oct 2019 02:35:05 - 1.21
> +++ Makefile 28 Oct 2019 02:10:39 -
> @@ -1,7 +1,5 @@
> # $OpenBSD: Makefile,v 1.21 2019/10/23 02:35:05 asou Exp $
>
> -USE_WXNEEDED = Yes
> -
> ONLY_FOR_ARCHS = amd64
>
> COMMENT =instrumentation framework for dynamic analysis tools
> @@ -9,7 +7,7 @@ CATEGORIES = devel
>
> V = 3.10.1
> PV = 20160331
> -REVISION = 14
> +REVISION = 15
> DISTNAME = valgrind-${V}
> EXTRACT_SUFX = .tar.bz2
>
> Index: patches/patch-coregrind_link_tool_exe_openbsd_in
> ===
> RCS file:
> /cvs/ports/devel/valgrind/patches/patch-coregrind_link_tool_exe_openbsd_in,v
> retrieving revision 1.3
> diff -u -p -r1.3 patch-coregrind_link_tool_exe_openbsd_in
> --- patches/patch-coregrind_link_tool_exe_openbsd_in 2 Oct 2019 17:19:29
> - 1.3
> +++ patches/patch-coregrind_link_tool_exe_openbsd_in 28 Oct 2019 02:10:39
> -
> @@ -5,12 +5,12 @@
> system(sprintf "sed -e 's|%x|%x|g' < $ldscript > $temp", $origbase,
> $notebase);
>
> -my $cmd = sprintf "$cc -static -nopie -Wl,-Ttext=0x%x -Wl,-T,$temp",
> $textbase;
> -+my $cmd = sprintf "$cc -static -nopie -Wl,--strip-all -Wl,-zwxneeded
> -Wl,-Ttext=0x%x -Wl,-T,$temp", $textbase;
> +# XXX The '-s' option was not specified when executing the install command.
> +# Instead '--strip-all' is now executed at link time.
> +# strip command rewrite offset and align in ELF file. Therefor, when
> valgrind
> +# launch memcheck-amd64-openbsd, an Abort trap occurs in the execvp() system
> +# call.
> ++my $cmd = sprintf "$cc -static -nopie -Wl,--strip-all -Wl,-Ttext=0x%x
> -Wl,-T,$temp", $textbase;
>
> # Add the rest of the parameters
> foreach my $n (2 .. $#ARGV) {
> Index: patches/patch-coregrind_m_aspacemgr_aspacemgr-linux_c
> ===
> RCS file:
> /cvs/ports/devel/valgrind/patches/patch-coregrind_m_aspacemgr_aspacemgr-linux_c,v
> retrieving revision 1.1
> diff -u -p -r1.1 patch-coregrind_m_aspacemgr_aspacemgr-linux_c
> --- patches/patch-coregrind_m_aspacemgr_aspacemgr-linux_c 2 Oct 2019
> 17:19:29 - 1.1
> +++ patches/patch-coregrind_m_aspacemgr_aspacemgr-linux_c 28 Oct 2019
> 02:10:39 -
> @@ -1,5 +1,17 @@
> --- coregrind/m_aspacemgr/aspacemgr-linux.c.orig
> +++ coregrind/m_aspacemgr/aspacemgr-linux.c
> +@@ -2498,7 +2498,11 @@
> + a client request to call the outer VG_(am_get_advisory). */
> +sres = VG_(am_do_mmap_NO_NOTIFY)(
> + advised, length,
> ++#if defined(__OpenBSD__)
> ++ VKI_PROT_READ|VKI_PROT_WRITE,
> ++#else
> + VKI_PROT_READ|VKI_PROT_WRITE|VKI_PROT_EXEC,
> ++#endif
> + VKI_MAP_FIXED|VKI_MAP_PRIVATE|VKI_MAP_ANONYMOUS,
> + VM_TAG_VALGRIND, 0
> + );
> @@ -2543,6 +2543,54 @@ SysRes VG_(am_mmap_anon_float_valgrind)( SizeT length
> )
> return sres;
> }
> @@ -30,7 +42,7 @@
> + any resulting failure immediately. */
> + sres = VG_(am_do_mmap_NO_NOTIFY)(
> + advised, length,
> -+ VKI_PROT_READ|VKI_PROT_WRITE|VKI_PROT_EXEC,
> ++ VKI_PROT_READ|VKI_PROT_WRITE,
> + VKI_MAP_PRIVATE|VKI_MAP_ANONYMOUS|VKI_MAP_STACK,
> + VM_TAG_VALGRIND, 0
> + );
> Index: patches/patch-coregrind_m_initimg_initimg-openbsd_c
> ===
> RCS file:
> /cvs/ports/devel/valgrind/patches/patch-coregrind_m_initimg_initimg-openbsd_c,v
> retrieving revision 1.1
> diff -u -p -r1.1 patch-coregrind_m_initimg_initi
Re: NEW: devel/llvm (Extra Clang Tools) #2
On Tue, Nov 05 2019, Rafael Sadowski wrote:
> On Sun Oct 27, 2019 at 05:07:39PM +0100, Jeremie Courreges-Anglas wrote:
[...]
>> Here's an updated port with those points addressed.
>>
>> I suspect that a lot of the arch-specific Makefile goo isn't needed any
>> more. The -Dpowerpc bits should probably be left out.
>>
>>
>
> Works fine here but it looks like we both missed the WANTLIB line:
>
> WANTLIB += ${COMPILER_LIBCXX} c curses edit m z
>
> OK to move it into the tree?
Let's remove the arch-specific workarounds before importing this.
Disabling retpoline or ret-protector either isn't warranted either in my
book (it's not on the path to other ports). On top of my previous
tarball that would give the following diff. With this, ok jca@
--- Makefile.jcaTue Nov 5 18:32:54 2019
+++ MakefileTue Nov 5 18:34:47 2019
@@ -27,6 +27,8 @@
# BSD
PERMIT_PACKAGE = Yes
+WANTLIB += ${COMPILER_LIBCXX} c curses edit m z
+
MASTER_SITES =
https://github.com/llvm/llvm-project/releases/download/llvmorg-${LLVM_V}/
EXTRACT_SUFX = .tar.xz
@@ -62,30 +64,6 @@
-DLLVM_INCLUDE_EXAMPLES=OFF \
-DLLVM_INCLUDE_TESTS=OFF \
-DLLVM_INCLUDE_BENCHMARKS=OFF
-
-# Disable some protections in the compiler to regain performance
-.if ${MACHINE_ARCH} == "aarch64" || ${MACHINE_ARCH} == "amd64" || \
-${MACHINE_ARCH} == "i386"
-CXXFLAGS +=-fno-ret-protector
-.endif
-.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386"
-CXXFLAGS +=-mno-retpoline
-.endif
-
-# Workaround relocation overflow
-.if ${MACHINE_ARCH} == "powerpc"
-# As a workaround for the size only build the PowerPC backend
-CONFIGURE_ARGS += -DLLVM_TARGETS_TO_BUILD="PowerPC"
-.elif ${MACHINE_ARCH} == "arm"
-CFLAGS += -mlong-calls
-CXXFLAGS +=-mlong-calls
-.endif
-
-.if ${MACHINE_ARCH} == "powerpc"
-PKG_ARGS +=-Dpowerpc=1
-.else
-PKG_ARGS +=-Dpowerpc=0
-.endif
GCC_VER = 8.3.0
.if ${MACHINE_ARCH} == "amd64"
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
