CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2018/09/18 23:51:42 Modified files: comms : Makefile Log message: +sigrok
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2018/09/18 23:50:36 Log message: Import the sigrok suite. The sigrok project aims at creating a portable, cross-platform, Free/Libre/Open-Source logic analyzer software that supports various logic analyzer hardware products. It includes command-line and graphical interfaces, libraries for protocol decoding and talking to logic analyzers, and free firmware for certain pieces of hardware. ok rsadowski@ Status: Vendor Tag: bentley Release Tags: bentley_20180919 N ports/comms/sigrok/Makefile N ports/comms/sigrok/Makefile.inc N ports/comms/sigrok/libserialport/Makefile N ports/comms/sigrok/libserialport/distinfo N ports/comms/sigrok/libserialport/pkg/DESCR N ports/comms/sigrok/libserialport/pkg/PLIST N ports/comms/sigrok/libsigrok/Makefile N ports/comms/sigrok/libsigrok/distinfo N ports/comms/sigrok/libsigrok/patches/patch-bindings_cxx_classes_cpp N ports/comms/sigrok/libsigrok/patches/patch-config_h_in N ports/comms/sigrok/libsigrok/pkg/DESCR N ports/comms/sigrok/libsigrok/pkg/PLIST N ports/comms/sigrok/libsigrokdecode/Makefile N ports/comms/sigrok/libsigrokdecode/distinfo N ports/comms/sigrok/libsigrokdecode/pkg/DESCR N ports/comms/sigrok/libsigrokdecode/pkg/PLIST N ports/comms/sigrok/pulseview/Makefile N ports/comms/sigrok/pulseview/distinfo N ports/comms/sigrok/pulseview/pkg/DESCR N ports/comms/sigrok/pulseview/pkg/PLIST N ports/comms/sigrok/sigrok-cli/Makefile N ports/comms/sigrok/sigrok-cli/distinfo N ports/comms/sigrok/sigrok-cli/pkg/DESCR N ports/comms/sigrok/sigrok-cli/pkg/PLIST N ports/comms/sigrok/sigrok-dumps/Makefile N ports/comms/sigrok/sigrok-dumps/distinfo N ports/comms/sigrok/sigrok-dumps/pkg/DESCR N ports/comms/sigrok/sigrok-dumps/pkg/PLIST N ports/comms/sigrok/sigrok-firmware-fx2lafw/Makefile N ports/comms/sigrok/sigrok-firmware-fx2lafw/distinfo N ports/comms/sigrok/sigrok-firmware-fx2lafw/pkg/DESCR N ports/comms/sigrok/sigrok-firmware-fx2lafw/pkg/PLIST No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2018/09/18 23:16:04 Modified files: editors/calligra: Makefile editors/calligra/pkg: PLIST Log message: Use kdiagram in calligra Bump and regen PLIST
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2018/09/18 23:14:29 Modified files: graphics : Makefile Log message: hook kdiagram
Re: import python 3.7
On Tue, 11 Sep 2018 22:19:13 -0400, Daniel Jakots
wrote:
> On Sat, 8 Sep 2018 14:28:06 -0400, Daniel Jakots
> wrote:
>
> > Does the test suite work for you? In my case it seems it never ends
> > with "running: test_asyncio (2 min 52 sec)" until I ^c. If people
> > have the same, I'll add TEST_IS_INTERACTIVE=Yes
>
> I looked into it and didn't find any solution. It happens on cpython
> HEAD as well so I added it.
>
> > Attached, the diff for our current files and the tgz for the 3.7
> > directory.
>
> New tgz attached because the plist needed some @comment.
New tgz because the PLIST-main listed items it shouldn't (spotted by
Rafael, thanks!)
Cheers,
Daniel
3.7.tgz
Description: application/compressed-tar
? 3.7
? 3.7.tgz
Index: Makefile
===
RCS file: /cvs/ports/lang/python/Makefile,v
retrieving revision 1.68
diff -u -p -r1.68 Makefile
--- Makefile 8 Jul 2017 08:28:00 - 1.68
+++ Makefile 18 Sep 2018 21:29:54 -
@@ -3,6 +3,7 @@
SUBDIR =
SUBDIR += 2.7
SUBDIR += 3.6
+SUBDIR += 3.7
.include
Index: Makefile.inc
===
RCS file: /cvs/ports/lang/python/Makefile.inc,v
retrieving revision 1.125
diff -u -p -r1.125 Makefile.inc
--- Makefile.inc 18 Sep 2018 16:43:12 - 1.125
+++ Makefile.inc 18 Sep 2018 21:29:54 -
@@ -125,7 +125,7 @@ FAKE_FLAGS += RANLIB=:
# and QtWebKit require W|X mappings.
USE_WXNEEDED = Yes
-.if ${VERSION} == "3.6"
+.if ${VERSION} == "3.6" || ${VERSION} == "3.7"
ALL_TARGET = all
.else
ALL_TARGET = all ./Lib/plat-openbsd6
Index: python.port.mk
===
RCS file: /cvs/ports/lang/python/python.port.mk,v
retrieving revision 1.99
diff -u -p -r1.99 python.port.mk
--- python.port.mk 24 Jul 2018 12:10:10 - 1.99
+++ python.port.mk 18 Sep 2018 21:29:54 -
@@ -24,7 +24,8 @@ MODPY_VERSION ?= ${MODPY_DEFAULT_VERSION
# verify if MODPY_VERSION forced is correct
.else
. if ${MODPY_VERSION} != "2.7" && \
- ${MODPY_VERSION} != "3.6"
+ ${MODPY_VERSION} != "3.6" && \
+ ${MODPY_VERSION} != "3.7"
ERRORS += "Fatal: unknown or unsupported MODPY_VERSION: ${MODPY_VERSION}"
. endif
.endif
Re: new: net/go-ipfs
On Tue, Sep 18, 2018 at 11:07:00PM +0100, Edd Barrett wrote: > If that's correct, we'd need instructions for the user on how to up the > fd limit. Probably via a pkg README. Fabian already has a README, I just missed it! Bravo! -- Best Regards Edd Barrett http://www.theunixzoo.co.uk
Re: new: net/go-ipfs
Hi, Thanks for working on this. On Sun, Sep 16, 2018 at 09:52:52PM +0200, Fabian Raetz wrote: > I'm running an ipfs node at home and pinned a "Hello, OpenBSD!" > file [1] for you :) Works! And via `ipfs cat` (once you start the daemon). > You can also mount the world at /ipfs. If we enabled the fuse support ;) How hard is that by the way? > The tar.gz provided by upstream contains files at the root without an go-ipfs > folder. I did the following to unpack everything in WRKDIST instead of in > WRKDIR directly. Is there a better approch to do this? I'm not aware of one, but the other porters might know a trick. > By default, ipfs creates all files in ~/.ipfs. This can be changed by > specifing IPFS_PATH. Personally I don't like a hidden folder at > /var/ipfs/.ipfs > which is why I set IPFS_PATH=/var/ipfs in the rc file. > This requires users of ipfs to always remember to set IPFS_PATH=/var/ipfs > > What would you prefer? > > 2.1) Setting HOME of the _ipfs user to /var/ipfs and have the data > under /var/ipfs/.ipfs. > 2.2) Setting IPFS_PATH=/var/ipfs in the rc file and whenever a user wants to > interact with ipfs. Wouldn't a normal user want the IPFS files under the default ~/.ipfs? So they wouldn't need to remember anything? The rc script doesn't work though? ---8<--- $ doas rcctl start ipfs ipfs(failed) --->8--- If you add `-d` you will see why: ---8<--- $ doas rcctl -d start ipfs doing _rc_parse_conf doing _rc_quirks ipfs_flags empty, using default >daemon< doing _rc_parse_conf /var/run/rc.d/ipfs doing _rc_quirks doing rc_check ipfs doing _rc_wait start doing rc_start doing rc_check Initializing daemon... 23:03:41.326 ERROR cmd/ipfs: setting file descriptor limit: cannot set rlimit, IPFS_FD_MAX is larger than the hard limit daemon.go:200 Error: no IPFS repo found in /var/ipfs. please run: 'ipfs init' doing _rc_rm_runfile (failed) --->8--- If that's correct, we'd need instructions for the user on how to up the fd limit. Probably via a pkg README. My only other comment is that the Makefile has a lot of whitespace. Can we make it look closer to other port Makefiles? -- Best Regards Edd Barrett http://www.theunixzoo.co.uk
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sebas...@cvs.openbsd.org2018/09/18 15:23:50 Modified files: sysutils/ruby-r10k: Makefile distinfo sysutils/ruby-r10k/pkg: PLIST Log message: update to 2.6.4
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sebas...@cvs.openbsd.org2018/09/18 15:19:15 Modified files: textproc/py-commonmark: Makefile distinfo Log message: update to 0.7.5
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sebas...@cvs.openbsd.org2018/09/18 15:16:26 Modified files: databases/ruby-hiera3: Makefile distinfo Log message: Update to 3.4.4
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sebas...@cvs.openbsd.org2018/09/18 15:09:46 Modified files: sysutils/ruby-puppet/5: Makefile distinfo sysutils/ruby-puppet/5/patches: patch-lib_puppet_defaults_rb sysutils/ruby-puppet/5/pkg: PLIST Log message: Update to 5.5.6
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sebas...@cvs.openbsd.org2018/09/18 15:10:31 Modified files: sysutils/mcollective: Makefile distinfo Log message: update to 2.12.3
[NEW] fonts/spleen
Hi ports@, Here is a new port: fonts/spleen. >From DESCR: Spleen is a monospaced bitmap font for consoles and terminals. It is available in 5 sizes: 5x8, 8x16, 12x24, 16x32, and 32x64. Comments? OK? spleen.tar.gz Description: application/tar-gz
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2018/09/18 13:21:05 Modified files: net/bird : Makefile Added files: net/bird : Makefile.inc net/bird/1 : Makefile distinfo net/bird/1/patches: patch-sysdep_bsd_setkey_h patch-sysdep_bsd_sysio_h patch-sysdep_unix_io_c patch-sysdep_unix_random_c patch-tools_Makefile_in patch-tools_Rules_in net/bird/1/pkg : DESCR-doc DESCR-main PLIST-doc PLIST-main bird.rc bird6.rc net/bird/2 : Makefile distinfo net/bird/2/patches: patch-sysdep_bsd_setkey_h patch-sysdep_bsd_sysio_h patch-sysdep_unix_random_c net/bird/2/pkg : DESCR PLIST bird.rc Removed files: net/bird : distinfo net/bird/patches: patch-sysdep_bsd_setkey_h patch-sysdep_bsd_sysio_h patch-sysdep_unix_io_c patch-sysdep_unix_random_c patch-tools_Makefile_in patch-tools_Rules_in net/bird/pkg : DESCR-doc DESCR-main PLIST-doc PLIST-main bird.rc bird6.rc Log message: split net/bird into subdirectories to accommodate multiple versions, and add 2.0.2 - the two are currently updated in parallel upstream and have incompatible configuration. notes at https://gitlab.labs.nic.cz/labs/bird/wikis/transition-notes-to-bird-2 bird 2 no longer needs separate builds for v4 and v6, so the various subpackages are merged for this version. conflict/pkgpath markers set.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2018/09/18 13:07:50 ports/net/bird/2/patches Update of /cvs/ports/net/bird/2/patches In directory cvs.openbsd.org:/tmp/cvs-serv58132/2/patches Log Message: Directory /cvs/ports/net/bird/2/patches added to the repository
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2018/09/18 13:07:50 ports/net/bird/1 Update of /cvs/ports/net/bird/1 In directory cvs.openbsd.org:/tmp/cvs-serv58132/1 Log Message: Directory /cvs/ports/net/bird/1 added to the repository
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2018/09/18 13:07:50 ports/net/bird/1/pkg Update of /cvs/ports/net/bird/1/pkg In directory cvs.openbsd.org:/tmp/cvs-serv58132/1/pkg Log Message: Directory /cvs/ports/net/bird/1/pkg added to the repository
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2018/09/18 13:07:50 ports/net/bird/2/pkg Update of /cvs/ports/net/bird/2/pkg In directory cvs.openbsd.org:/tmp/cvs-serv58132/2/pkg Log Message: Directory /cvs/ports/net/bird/2/pkg added to the repository
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2018/09/18 13:07:50 ports/net/bird/1/patches Update of /cvs/ports/net/bird/1/patches In directory cvs.openbsd.org:/tmp/cvs-serv58132/1/patches Log Message: Directory /cvs/ports/net/bird/1/patches added to the repository
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2018/09/18 13:07:50 ports/net/bird/2 Update of /cvs/ports/net/bird/2 In directory cvs.openbsd.org:/tmp/cvs-serv58132/2 Log Message: Directory /cvs/ports/net/bird/2 added to the repository
Re: [UPDATE] devel/ipython 5.3.0p0 -> 5.8.0 and devel/py-ipykernel 4.6.1p0 -> 4.9.0
Sorry for ping this but I really would like to update devel/spyder. 2018-09-07 13:27 GMT-03:00 Elias M. Mariani : > OK edd@ > > 2018-09-07 12:39 GMT-03:00 Edd Barrett : >> On Thu, Sep 06, 2018 at 01:17:02PM -0300, Elias M. Mariani wrote: >>> You are right, I forgot to attach the diff... >>> Here is the change in py-ipykernel that you requested. >> >> LGTM. OK edd@ >> >> -- >> Best Regards >> Edd Barrett >> >> http://www.theunixzoo.co.uk
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2018/09/18 12:40:22 Modified files: net/bird : Makefile distinfo net/bird/patches: patch-sysdep_bsd_sysio_h patch-sysdep_unix_io_c net/bird/pkg : PLIST-doc PLIST-main Removed files: net/bird/patches: patch-client_client_c Log message: update to bird-1.6.4
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: d...@cvs.openbsd.org2018/09/18 11:07:16 Modified files: devel/py-setuptools_trial: Makefile devel/py-setuptools_trial/pkg: PLIST Log message: Don't package conflicting files Found by and ok espie@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rpoin...@cvs.openbsd.org2018/09/18 10:53:48 Modified files: sysutils : Makefile Log message: SUBDIR += py-analyzemft
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rpoin...@cvs.openbsd.org2018/09/18 10:53:03 Log message: import analyzeMFT, a tool to parse the MFT file from an NTFS filesystem. ok benoit@. Status: Vendor Tag: rpointel Release Tags: rpointel_20180918 N ports/sysutils/py-analyzemft/Makefile N ports/sysutils/py-analyzemft/distinfo N ports/sysutils/py-analyzemft/pkg/PLIST N ports/sysutils/py-analyzemft/pkg/DESCR No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: d...@cvs.openbsd.org2018/09/18 10:43:12 Modified files: lang/python: Makefile.inc lang/python/2.7: Makefile lang/python/3.6: Makefile Log message: Tweak MASTER_SITES and HOMEPAGE Switch to https and remove dead mirror. Noticed by rsadowski@, ok rpointel@
Re: CVS: cvs.openbsd.org: ports
On Tue, Sep 18, 2018 at 05:00:13PM +0200, Marc Espie wrote: > On Tue, Sep 18, 2018 at 04:23:10PM +0200, Antoine Jacoutot wrote: > > On Mon, Sep 17, 2018 at 04:13:09AM -0600, Marc Espie wrote: > > > CVSROOT: /cvs > > > Module name: ports > > > Changes by: es...@cvs.openbsd.org 2018/09/17 04:13:09 > > > > > > Modified files: > > > graphics/tesseract/tessdata: Makefile > > > graphics/tesseract/tessdata/pkg: PLIST-afr PLIST-amh PLIST-ara > > >PLIST-asm PLIST-aze > > >PLIST-aze_cyrl PLIST-bel > > >PLIST-ben PLIST-bod PLIST-bos > > >PLIST-bul PLIST-cat PLIST-ceb > > >PLIST-ces PLIST-chi_sim > > >PLIST-chi_tra PLIST-chr > > >PLIST-cym PLIST-dan > > >PLIST-dan_frak PLIST-deu > > >PLIST-deu_frak PLIST-dzo > > >PLIST-ell PLIST-enm PLIST-epo > > >PLIST-equ PLIST-est PLIST-eus > > >PLIST-fas PLIST-fin PLIST-fra > > >PLIST-frk PLIST-frm PLIST-gle > > >PLIST-glg PLIST-grc PLIST-guj > > >PLIST-hat PLIST-heb PLIST-hin > > >PLIST-hrv PLIST-hun PLIST-iku > > >PLIST-ind PLIST-isl PLIST-ita > > >PLIST-ita_old PLIST-jav > > >PLIST-jpn PLIST-kan PLIST-kat > > >PLIST-kat_old PLIST-kaz > > >PLIST-khm PLIST-kir PLIST-kor > > >PLIST-kur PLIST-lao PLIST-lat > > >PLIST-lav PLIST-lit PLIST-main > > >PLIST-mal PLIST-mar PLIST-mkd > > >PLIST-mlt PLIST-msa PLIST-mya > > >PLIST-nep PLIST-nld PLIST-nor > > >PLIST-ori PLIST-osd PLIST-pan > > >PLIST-pol PLIST-por PLIST-pus > > >PLIST-ron PLIST-rus PLIST-san > > >PLIST-sin PLIST-slk > > >PLIST-slk_frak PLIST-slv > > >PLIST-spa PLIST-spa_old > > >PLIST-sqi PLIST-srp > > >PLIST-srp_latn PLIST-swa > > >PLIST-swe PLIST-syr PLIST-tam > > >PLIST-tel PLIST-tgk PLIST-tgl > > >PLIST-tha PLIST-tir PLIST-tur > > >PLIST-uig PLIST-ukr PLIST-urd > > >PLIST-uzb PLIST-uzb_cyrl > > >PLIST-vie PLIST-yid > > > > > > Log message: > > > common directory tessdata should be owned by something, even if it's > > > shared > > > ownership > > > > That broke it: > > > > Error: duplicate item in packing-list /usr/local/share/tessdata > > Fatal error: can't continue > > at /usr/libdata/perl5/OpenBSD/PkgCreate.pm line 1675. > > > > Superb example of just not giving me enough info, as it's *only* one > of those packages :) Superb example of just not testing before committing :-) -- Antoine
python https in the port itself
Hi,
As noted by Rafael, the mirror is down and we could use some https. I
want to address it in a separate diff than the 3.7 thing because it
needs to bump 2.7/3.6.
Comments? OK?
Cheers,
Daniel
Index: Makefile.inc
===
RCS file: /cvs/ports/lang/python/Makefile.inc,v
retrieving revision 1.124
diff -u -p -r1.124 Makefile.inc
--- Makefile.inc3 Nov 2017 13:13:05 - 1.124
+++ Makefile.inc18 Sep 2018 15:03:18 -
@@ -30,12 +30,11 @@ PKGNAME-tools = python-tools-${VERSION}$
PKGSPEC-tools =python-tools-${VERSION_SPEC}
CATEGORIES = lang
-MASTER_SITES = http://www.python.org/ftp/${PSUBDIR}/ \
- http://sunsite.informatik.rwth-aachen.de/python/ftp/${PSUBDIR}/
+MASTER_SITES = https://www.python.org/ftp/${PSUBDIR}/
PSUBDIR ?= python/${VERSION}${PATCHLEVEL}
EXTRACT_SUFX = .tgz
-HOMEPAGE = http://www.python.org/
+HOMEPAGE = https://www.python.org/
MAINTAINER = Remi Pointel
Index: 2.7/Makefile
===
RCS file: /cvs/ports/lang/python/2.7/Makefile,v
retrieving revision 1.56
diff -u -p -r1.56 Makefile
--- 2.7/Makefile3 May 2018 20:09:25 - 1.56
+++ 2.7/Makefile18 Sep 2018 15:03:18 -
@@ -9,6 +9,7 @@ VERSION = 2.7
PATCHLEVEL = .15
SHARED_LIBS = python2.7 0.0
VERSION_SPEC = >=2.7,<2.8
+REVISION = 0
CONFIGURE_ARGS += --with-ensurepip=no
Index: 3.6/Makefile
===
RCS file: /cvs/ports/lang/python/3.6/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- 3.6/Makefile30 Aug 2018 16:22:49 - 1.12
+++ 3.6/Makefile18 Sep 2018 15:03:18 -
@@ -9,7 +9,7 @@ VERSION = 3.6
PATCHLEVEL = .6
SHARED_LIBS = python3.6m 0.0
VERSION_SPEC = >=3.6,<3.7
-REVISION = 0
+REVISION = 1
CONFIGURE_ARGS += --with-ensurepip=no
CONFIGURE_ARGS += --enable-loadable-sqlite-extensions
Re: CVS: cvs.openbsd.org: ports
On Tue, Sep 18, 2018 at 04:23:10PM +0200, Antoine Jacoutot wrote: > On Mon, Sep 17, 2018 at 04:13:09AM -0600, Marc Espie wrote: > > CVSROOT:/cvs > > Module name:ports > > Changes by: es...@cvs.openbsd.org 2018/09/17 04:13:09 > > > > Modified files: > > graphics/tesseract/tessdata: Makefile > > graphics/tesseract/tessdata/pkg: PLIST-afr PLIST-amh PLIST-ara > > PLIST-asm PLIST-aze > > PLIST-aze_cyrl PLIST-bel > > PLIST-ben PLIST-bod PLIST-bos > > PLIST-bul PLIST-cat PLIST-ceb > > PLIST-ces PLIST-chi_sim > > PLIST-chi_tra PLIST-chr > > PLIST-cym PLIST-dan > > PLIST-dan_frak PLIST-deu > > PLIST-deu_frak PLIST-dzo > > PLIST-ell PLIST-enm PLIST-epo > > PLIST-equ PLIST-est PLIST-eus > > PLIST-fas PLIST-fin PLIST-fra > > PLIST-frk PLIST-frm PLIST-gle > > PLIST-glg PLIST-grc PLIST-guj > > PLIST-hat PLIST-heb PLIST-hin > > PLIST-hrv PLIST-hun PLIST-iku > > PLIST-ind PLIST-isl PLIST-ita > > PLIST-ita_old PLIST-jav > > PLIST-jpn PLIST-kan PLIST-kat > > PLIST-kat_old PLIST-kaz > > PLIST-khm PLIST-kir PLIST-kor > > PLIST-kur PLIST-lao PLIST-lat > > PLIST-lav PLIST-lit PLIST-main > > PLIST-mal PLIST-mar PLIST-mkd > > PLIST-mlt PLIST-msa PLIST-mya > > PLIST-nep PLIST-nld PLIST-nor > > PLIST-ori PLIST-osd PLIST-pan > > PLIST-pol PLIST-por PLIST-pus > > PLIST-ron PLIST-rus PLIST-san > > PLIST-sin PLIST-slk > > PLIST-slk_frak PLIST-slv > > PLIST-spa PLIST-spa_old > > PLIST-sqi PLIST-srp > > PLIST-srp_latn PLIST-swa > > PLIST-swe PLIST-syr PLIST-tam > > PLIST-tel PLIST-tgk PLIST-tgl > > PLIST-tha PLIST-tir PLIST-tur > > PLIST-uig PLIST-ukr PLIST-urd > > PLIST-uzb PLIST-uzb_cyrl > > PLIST-vie PLIST-yid > > > > Log message: > > common directory tessdata should be owned by something, even if it's shared > > ownership > > That broke it: > > Error: duplicate item in packing-list /usr/local/share/tessdata > Fatal error: can't continue > at /usr/libdata/perl5/OpenBSD/PkgCreate.pm line 1675. > Superb example of just not giving me enough info, as it's *only* one of those packages :)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: es...@cvs.openbsd.org 2018/09/18 08:33:17 Modified files: graphics/tesseract/tessdata/pkg: PLIST-main Log message: zap duplicate dir no packagy, no bumpy
Re: CVS: cvs.openbsd.org: ports
On Mon, Sep 17, 2018 at 04:13:09AM -0600, Marc Espie wrote: > CVSROOT: /cvs > Module name: ports > Changes by: es...@cvs.openbsd.org 2018/09/17 04:13:09 > > Modified files: > graphics/tesseract/tessdata: Makefile > graphics/tesseract/tessdata/pkg: PLIST-afr PLIST-amh PLIST-ara >PLIST-asm PLIST-aze >PLIST-aze_cyrl PLIST-bel >PLIST-ben PLIST-bod PLIST-bos >PLIST-bul PLIST-cat PLIST-ceb >PLIST-ces PLIST-chi_sim >PLIST-chi_tra PLIST-chr >PLIST-cym PLIST-dan >PLIST-dan_frak PLIST-deu >PLIST-deu_frak PLIST-dzo >PLIST-ell PLIST-enm PLIST-epo >PLIST-equ PLIST-est PLIST-eus >PLIST-fas PLIST-fin PLIST-fra >PLIST-frk PLIST-frm PLIST-gle >PLIST-glg PLIST-grc PLIST-guj >PLIST-hat PLIST-heb PLIST-hin >PLIST-hrv PLIST-hun PLIST-iku >PLIST-ind PLIST-isl PLIST-ita >PLIST-ita_old PLIST-jav >PLIST-jpn PLIST-kan PLIST-kat >PLIST-kat_old PLIST-kaz >PLIST-khm PLIST-kir PLIST-kor >PLIST-kur PLIST-lao PLIST-lat >PLIST-lav PLIST-lit PLIST-main >PLIST-mal PLIST-mar PLIST-mkd >PLIST-mlt PLIST-msa PLIST-mya >PLIST-nep PLIST-nld PLIST-nor >PLIST-ori PLIST-osd PLIST-pan >PLIST-pol PLIST-por PLIST-pus >PLIST-ron PLIST-rus PLIST-san >PLIST-sin PLIST-slk >PLIST-slk_frak PLIST-slv >PLIST-spa PLIST-spa_old >PLIST-sqi PLIST-srp >PLIST-srp_latn PLIST-swa >PLIST-swe PLIST-syr PLIST-tam >PLIST-tel PLIST-tgk PLIST-tgl >PLIST-tha PLIST-tir PLIST-tur >PLIST-uig PLIST-ukr PLIST-urd >PLIST-uzb PLIST-uzb_cyrl >PLIST-vie PLIST-yid > > Log message: > common directory tessdata should be owned by something, even if it's shared > ownership That broke it: Error: duplicate item in packing-list /usr/local/share/tessdata Fatal error: can't continue at /usr/libdata/perl5/OpenBSD/PkgCreate.pm line 1675. -- Antoine
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2018/09/18 06:51:55 Modified files: lang/node : Makefile Log message: use DPB_PROPERTIES=parallel, ok abieber@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: es...@cvs.openbsd.org 2018/09/18 06:51:44 Modified files: www/chromium : Makefile Log message: annotate the monster with parallel2. dpb now has a special feature where parallel2 may be set to use even more cores than parallel.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2018/09/18 06:03:25 Modified files: www/owncloud : Tag: OPENBSD_6_3 Makefile distinfo www/owncloud/patches: Tag: OPENBSD_6_3 patch-version_php www/owncloud/pkg: Tag: OPENBSD_6_3 PLIST Log message: Update to owncloud-10.0.10.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2018/09/18 05:39:08 Modified files: security/heimdal: Makefile Added files: security/heimdal/patches: patch-lib_gssapi_ntlm_acquire_cred_c patch-lib_krb5_context_c Log message: Fix memory leak with the Squid Kerberos authentication helper. from Markus Moelle via Matthias Pitzl
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2018/09/18 05:37:08 Modified files: www/owncloud : Makefile distinfo www/owncloud/patches: patch-version_php www/owncloud/pkg: PLIST Log message: Update to owncloud-10.0.10.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2018/09/18 05:36:23 Modified files: sysutils/amazon-ssm-agent: Makefile distinfo sysutils/amazon-ssm-agent/patches: patch-makefile Log message: Update to amazon-ssm-agent-2.3.68.0.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ki...@cvs.openbsd.org 2018/09/18 04:54:55 Modified files: graphics/pecl-imagick: Makefile graphics/pecl-imagick/pkg: PLIST Log message: @sample config OK sthen@
lang/node DPB_PROPERTIES=parallel
A test "make package MAKE_JOBS=4" worked ok here, this is on the chain to chromium and is big enough that parallel seems worthwhile. OK to add this? Index: Makefile === RCS file: /cvs/ports/lang/node/Makefile,v retrieving revision 1.71 diff -u -p -r1.71 Makefile --- Makefile21 Jun 2018 23:13:28 - 1.71 +++ Makefile18 Sep 2018 10:41:03 - @@ -5,6 +5,7 @@ # - Needs bundled libcares as arpa/nameser.h does not include ns_t_a. ONLY_FOR_ARCHS = amd64 aarch64 i386 +DPB_PROPERTIES = parallel USE_WXNEEDED = Yes
Re: UPDATE: mail/p5-Mail-SpamAssassin
On Tue, Sep 18, 2018 at 09:13:24AM +0200, Giovanni Bechis wrote:
> On Mon, Sep 17, 2018 at 07:50:03PM +0200, Pierre-Emmanuel André wrote:
> > On Mon, Sep 17, 2018 at 09:14:43AM +0200, Giovanni Bechis wrote:
> > > Hi,
> > > update to latest version, this a major update, there are many new features
> > > and a lot of bug fixed.
> > > Some CVE has been fixed and a old SA versions will not be compatible with
> > > new rules sooner or later.
> > > I used several iterations of this diff in production, ok to put it in
> > > before 6.4 ?
> > >
> > > More info here:
> > > http://svn.apache.org/repos/asf/spamassassin/trunk/build/announcements/3.4.2.txt
> > >
> > > Thanks & Cheers
> > > Giovanni
> >
> >
> > Works fine on my small setup.
> > ok pea@
> >
> > Any plans to backport CVE to -stable ?
> >
> some of them has been backported before a CVE has been assigned, anyway I feel
> more confident in updating to 3.4.2 in -stable as well.
> Diff follows.
> Giovanni
Looks good to me.
ok pea@ FWIW
> Index: Makefile
> ===
> RCS file: /cvs/ports/mail/p5-Mail-SpamAssassin/Makefile,v
> retrieving revision 1.108
> diff -u -p -r1.108 Makefile
> --- Makefile 13 Mar 2018 07:51:59 - 1.108
> +++ Makefile 18 Sep 2018 07:08:03 -
> @@ -2,11 +2,10 @@
>
> COMMENT= mailfilter to identify and mark spam
>
> -VER= 3.4.1
> +VER= 3.4.2
> DISTNAME=Mail-SpamAssassin-${VER}
> PKGNAME= p5-${DISTNAME}
> -REVISION=14
> -RULESNAME= Mail-SpamAssassin-rules-${VER}.r1675274.tgz
> +RULESNAME= Mail-SpamAssassin-rules-${VER}.r1840640.tgz
> CATEGORIES= mail perl5
>
> DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${RULESNAME}
> @@ -33,8 +32,9 @@ COMMON_DEPENDS= www/p5-HTML-Parser>=3.3
> BUILD_DEPENDS= ${COMMON_DEPENDS}
> RUN_DEPENDS= ${COMMON_DEPENDS} \
> devel/re2c \
> + devel/p5-BSD-Resource \
> p5-Mail-SPF-*|p5-Mail-SPF-Query-*:mail/p5-Mail-SPF \
> - net/p5-Geo-IP \
> +
> p5-Geo-IP-*|p5-IP-Country-DB_File-*|p5-IP-Country-*:net/p5-Geo-IP \
> net/p5-Net-LibIDN \
> net/p5-Net-Patricia \
> security/gnupg \
> Index: distinfo
> ===
> RCS file: /cvs/ports/mail/p5-Mail-SpamAssassin/distinfo,v
> retrieving revision 1.38
> diff -u -p -r1.38 distinfo
> --- distinfo 30 Apr 2015 14:41:53 - 1.38
> +++ distinfo 18 Sep 2018 07:08:03 -
> @@ -1,4 +1,4 @@
> -SHA256 (Mail-SpamAssassin-3.4.1.tar.bz2) =
> oMHJgI8GhLOJWU64ssy6zmSGVGWTST+TCMlVRWPRRlE=
> -SHA256 (Mail-SpamAssassin-rules-3.4.1.r1675274.tgz) =
> OC9+4WCpahWq5Vn1PfksNvLhdkexnFlU7+3oYUn40Ss=
> -SIZE (Mail-SpamAssassin-3.4.1.tar.bz2) = 2710985
> -SIZE (Mail-SpamAssassin-rules-3.4.1.r1675274.tgz) = 270622
> +SHA256 (Mail-SpamAssassin-3.4.2.tar.bz2) =
> zwMEWkmRdSFF7tAH51c38+TH80zyJdtBHOP9NZKA6No=
> +SHA256 (Mail-SpamAssassin-rules-3.4.2.r1840640.tgz) =
> jUgaIIHx5ioleSOPZrWNIST3ounzz6PUqisD/nsBmbs=
> +SIZE (Mail-SpamAssassin-3.4.2.tar.bz2) = 2700016
> +SIZE (Mail-SpamAssassin-rules-3.4.2.r1840640.tgz) = 284758
> Index: patches/patch-Makefile_PL
> ===
> RCS file: /cvs/ports/mail/p5-Mail-SpamAssassin/patches/patch-Makefile_PL,v
> retrieving revision 1.13
> diff -u -p -r1.13 patch-Makefile_PL
> --- patches/patch-Makefile_PL 30 Apr 2015 14:41:53 - 1.13
> +++ patches/patch-Makefile_PL 18 Sep 2018 07:08:03 -
> @@ -1,7 +1,8 @@
> $OpenBSD: patch-Makefile_PL,v 1.13 2015/04/30 14:41:53 sthen Exp $
> Makefile.PL.orig Tue Apr 28 20:57:01 2015
> -+++ Makefile.PL Thu Apr 30 14:25:54 2015
> -@@ -832,7 +832,7 @@ sub MY::install {
> +Index: Makefile.PL
> +--- Makefile.PL.orig
> Makefile.PL
> +@@ -856,7 +856,7 @@ sub MY::install {
>
> foreach (@code) {
> # Add our install targets as a dependency to all top-level install
> targets
> Index: patches/patch-lib_Mail_SpamAssassin_BayesStore_pm
> ===
> RCS file: patches/patch-lib_Mail_SpamAssassin_BayesStore_pm
> diff -N patches/patch-lib_Mail_SpamAssassin_BayesStore_pm
> --- patches/patch-lib_Mail_SpamAssassin_BayesStore_pm 31 Oct 2017 07:41:51
> - 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,15 +0,0 @@
> -$OpenBSD: patch-lib_Mail_SpamAssassin_BayesStore_pm,v 1.1 2017/10/31
> 07:41:51 giovanni Exp $
> -
> -# bug 7340: remove expire flag after token expiration is done
> -
> -Index: lib/Mail/SpamAssassin/BayesStore.pm
> lib/Mail/SpamAssassin/BayesStore.pm.orig
> -+++ lib/Mail/SpamAssassin/BayesStore.pm
> -@@ -419,6 +419,7 @@ sub expire_old_tokens_trapped {
> - dbg("bayes: $msg: $msg2");
> - }
> -
>
[Update] sqlite 3.25.0
Hi,
Small diff to update sqlite3 to it's latest version.
Changelog here : https://sqlite.org/releaselog/3_25_0.html
Tested on @amd64.
Who can test it in a bulk ?
Regards,
Index: Makefile
===
RCS file: /cvs/ports/databases/sqlite3/Makefile,v
retrieving revision 1.95
diff -u -p -u -p -r1.95 Makefile
--- Makefile 29 Jun 2018 19:51:00 - 1.95
+++ Makefile 18 Sep 2018 10:25:45 -
@@ -2,11 +2,10 @@
COMMENT= embedded SQL implementation
-DISTNAME = sqlite-autoconf-324
-PKGNAME= sqlite3-3.24.0
-REVISION = 0
+DISTNAME = sqlite-autoconf-325
+PKGNAME= sqlite3-3.25.0
-SHARED_LIBS += sqlite3 37.3 # 8.6
+SHARED_LIBS += sqlite3 37.4 # 8.6
CATEGORIES= databases
@@ -15,7 +14,7 @@ HOMEPAGE= http://www.sqlite.org/
# PD
PERMIT_PACKAGE_CDROM= Yes
-WANTLIB += c m pthread readline termcap
+WANTLIB += c m pthread readline curses z
MASTER_SITES = ${HOMEPAGE}2018/
Index: distinfo
===
RCS file: /cvs/ports/databases/sqlite3/distinfo,v
retrieving revision 1.50
diff -u -p -u -p -r1.50 distinfo
--- distinfo 27 Jun 2018 04:55:34 - 1.50
+++ distinfo 18 Sep 2018 10:25:45 -
@@ -1,2 +1,2 @@
-SHA256 (sqlite-autoconf-324.tar.gz) = 2dFOiMb7bWjenKDR+Xl0d9gvw67WE1WPh/+9u8XOt0o=
-SIZE (sqlite-autoconf-324.tar.gz) = 2699252
+SHA256 (sqlite-autoconf-325.tar.gz) = 3hqT38HqI9k+6FRA/kNH0LnNk28lwpZF7g7hcNEwf3E=
+SIZE (sqlite-autoconf-325.tar.gz) = 2763727
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2018/09/18 04:22:03 Log message: Import kdiagram-2.6.1 Powerful libraries (KChart, KGantt) for creating business diagrams. Tweaks from solene@, ok bentley@ Status: Vendor Tag: rsadowski Release Tags: rsadowski_20180918 N ports/graphics/kdiagram/Makefile N ports/graphics/kdiagram/distinfo N ports/graphics/kdiagram/patches/patch-src_KChart_CMakeLists_txt N ports/graphics/kdiagram/patches/patch-src_KGantt_CMakeLists_txt N ports/graphics/kdiagram/patches/patch-examples_tools_CMakeLists_txt N ports/graphics/kdiagram/pkg/DESCR N ports/graphics/kdiagram/pkg/PLIST No conflicts created by this import
graphics/pecl-imagick sample config
Hi!
@sample connfig as dome in other php modules.
OK?
Index: Makefile
===
RCS file: /cvs/ports/graphics/pecl-imagick/Makefile,v
retrieving revision 1.34
diff -u -r1.34 Makefile
--- Makefile26 Apr 2018 15:08:56 - 1.34
+++ Makefile18 Sep 2018 10:19:37 -
@@ -4,7 +4,7 @@
DISTNAME= imagick-3.4.3
CATEGORIES=graphics
-REVISION= 1
+REVISION= 2
# PHP
PERMIT_PACKAGE_CDROM= Yes
Index: pkg/PLIST
===
RCS file: /cvs/ports/graphics/pecl-imagick/pkg/PLIST,v
retrieving revision 1.10
diff -u -r1.10 PLIST
--- pkg/PLIST 26 Apr 2018 15:08:56 - 1.10
+++ pkg/PLIST 18 Sep 2018 10:19:37 -
@@ -3,6 +3,7 @@
${MODPECL_56ONLY}@pkgpath graphics/pecl-imagick
lib/php-${MODPHP_VERSION}/modules/${MODULE_NAME}.so
share/examples/php-${MODPHP_VERSION}/${MODULE_NAME}.ini
+@sample ${SYSCONFDIR}/php-${MODPHP_VERSION}.sample/${MODULE_NAME}.ini
share/php-${MODPHP_VERSION}/include/ext/${MODULE_NAME}/
share/php-${MODPHP_VERSION}/include/ext/${MODULE_NAME}/php_${MODULE_NAME}_shared.h
@extra ${SYSCONFDIR}/php-${MODPHP_VERSION}/${MODULE_NAME}.ini
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: p...@cvs.openbsd.org2018/09/18 04:08:23 Modified files: devel/npth : Makefile distinfo devel/npth/patches: patch-configure Log message: Update to 1.6 ok sthen@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: p...@cvs.openbsd.org2018/09/18 04:07:19 Modified files: security/gnupg2: Makefile distinfo Log message: Update to 2.2.10 ok sthen@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: matth...@cvs.openbsd.org2018/09/18 04:05:56 Modified files: lang/rust/pkg : PFRAG.aarch64-doc Log message: Remove duplicate -doc plist entries on aarch64. no version bump since rust-doc didn't package before on aarch64 and doesn't change on other architectures. ok semarie.
Re: HW_NCPUONLINE
On 2018/09/17 19:47, Scott Cheloha wrote: > Hi, > > The new sysctl(2) for determining how many CPUs the scheduler has > access to at a particular moment is HW_NCPUONLINE. > > A lot of software in ports uses HW_NCPU for this purpose, so this > software may need to be patched. Caveat: I'm not a performance > expert. It may be the case that e.g. spawning more threads than > CPUs does not degrade performance for some software. It may be the > case that this brings other software to its knees. > > If there is not enough time to do this auditing before release, > that's on me. But I figure you need to start somewhere. > > Some background: > > We opted not to change HW_NCPU to return the number of online CPUs > in order to preserve the kernel ABI. HW_NCPU has always been an > immutable value after boot. Monitoring software that uses HW_NCPU > to allocate resources might break if the value of HW_NCPU were to > change while it is running. I think this risk outweighs the cost > of having some software perform suboptimally until patched to use > HW_NCPUONLINE. I agree with thus decision, there are two categories of program: - those using HW_NCPU for stats - programs like top(1) - those using it to decide how many threads/processes to run (and maybe some doing both). I think the "stats" category should continue to use HW_NCPU, partly these programs are often not setup to cope with changing numbers of CPUs, partly because it's useful to check that the "offline" (not used for scheduling) CPUs are indeed quiescent. So I 100% think it was the right thing to add a new sysctl rather than change HW_NCPU semantics. I think the "number of parallel processes" category should be changed but don't think it's urgent. Some are in the built code - some are just in the build system (which should not be used for ports anyway - this should purely be controlled from ports via the MAKE_JOBS variable). For C, sysconf is probably the best interface to use here, its simpler to implement than direct sysctl calls, and has better cross-OS support on current OS versions. #include int ncpu; ncpu = sysconf(_SC_NPROCESSORS_ONLN); For C++ >= 11, afaik the standard is std::thread::hardware_concurrency(). > As for the choice of HW_NCPUONLINE over some of Apple's sysctl(2) > extensions, I guess I had a kneejerk reaction to the lack of > documentation and opted to copy what NetBSD did. I am wondering if we should #define HW_AVAILCPU HW_NCPUONLINE, but it depends on how the programs use it. Definitely needs looking over source. > -- > > I don't have a fully extracted ports checkout, but I was able to > grep the distfiles I do have. I think I have many, but not all > of them. > > It'd be a good idea for someone with a proper ports extract > to look for ports using HW_NCPU. I suggest Debian codesearch. I have extracted ports source on my workstation but searching over it generally results in many short freezes (no keyboard/mouse response), it's very frustrating to use the machine when this goes on so I am not doing many of these searches at the moment. > That said, here is what I was able to find. I don't know how > or why they are using HW_NCPU. > > I trimmed the version numbers and paths here. I can just send > the raw grep if that's more useful. > > boost > chromium > collectd > coreutils > darktable > ffmpeg-git > firefox-52.7.3esr > freeradius-server > gkrellm > glib > hexchat > hugin > iridium-browser > libgtop > nim > p7zip > radare2 > sslsplit > supertuxkart > texlive > valgrind > webkitgtk > x264-snapshot > xvidcore > 0ad > MoarVM > SuperTux > Vitallium > beats > blender > blink1 > cargo/libc > cargo/num_cpus > cmake > conky > desmume > distcc > doxygen > e17/eina > facter > fpc/fpcbuild > freerdp > fzf > gc > gcc/avr32-gcc > ghc/cabal-install > git > go > guile > hmmer > htop > jamvm > kamailio > kore > lcdproc > libmemcached > libstatgrab > libuv > libvirt > lscpu > mariadb > mercurial > minetest > mongodb > monit > mozilla/tor-browser > myrddin > net-snmp > node > nspr > octave > opencv > openmpi > openttd/openttd > otp > pinot > posixtestsuite > psutil > pyuv > qt-creator-opensource > qt-everywhere-opensource > retroarch > rust/rustc > rust/rustc-bootstrap-amd64 > samba > sendmail > suricata > symon > syslog-ng > tmux-mem-cpu-load > tor-browser/v7.0.6-esr52.4.0 > vice > wkhtmltopdf-qt > x265 > xemacs-sumo > xscreensaver > xz > zabbix
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sol...@cvs.openbsd.org 2018/09/18 02:18:01 Modified files: mail/hypermail : Makefile distinfo mail/hypermail/patches: patch-configure patch-docs_hmrc_4 patch-docs_hmrc_html patch-docs_hypermail_1 patch-docs_hypermail_html patch-src_Makefile_in patch-src_parse_c mail/hypermail/pkg: DESCR PLIST Removed files: mail/hypermail/patches: patch-src_print_c patch-src_proto_h Log message: Update to hypermail 2.3.0 ok sthen@ danj@ Thanks to Hiltjo Posthuma for the diff and sthen@ for remarks
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ki...@cvs.openbsd.org 2018/09/18 02:04:06 Modified files: net/seafile: Makefile.inc net/seafile/client: distinfo net/seafile/libsearpc: distinfo net/seafile/seafile: distinfo Log message: update to seafile-6.2.5
Re: UPDATE: mail/p5-Mail-SpamAssassin
On Mon, Sep 17, 2018 at 07:50:03PM +0200, Pierre-Emmanuel André wrote:
> On Mon, Sep 17, 2018 at 09:14:43AM +0200, Giovanni Bechis wrote:
> > Hi,
> > update to latest version, this a major update, there are many new features
> > and a lot of bug fixed.
> > Some CVE has been fixed and a old SA versions will not be compatible with
> > new rules sooner or later.
> > I used several iterations of this diff in production, ok to put it in
> > before 6.4 ?
> >
> > More info here:
> > http://svn.apache.org/repos/asf/spamassassin/trunk/build/announcements/3.4.2.txt
> >
> > Thanks & Cheers
> > Giovanni
>
>
> Works fine on my small setup.
> ok pea@
>
> Any plans to backport CVE to -stable ?
>
some of them has been backported before a CVE has been assigned, anyway I feel
more confident in updating to 3.4.2 in -stable as well.
Diff follows.
Giovanni
Index: Makefile
===
RCS file: /cvs/ports/mail/p5-Mail-SpamAssassin/Makefile,v
retrieving revision 1.108
diff -u -p -r1.108 Makefile
--- Makefile13 Mar 2018 07:51:59 - 1.108
+++ Makefile18 Sep 2018 07:08:03 -
@@ -2,11 +2,10 @@
COMMENT= mailfilter to identify and mark spam
-VER= 3.4.1
+VER= 3.4.2
DISTNAME= Mail-SpamAssassin-${VER}
PKGNAME= p5-${DISTNAME}
-REVISION= 14
-RULESNAME= Mail-SpamAssassin-rules-${VER}.r1675274.tgz
+RULESNAME= Mail-SpamAssassin-rules-${VER}.r1840640.tgz
CATEGORIES=mail perl5
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${RULESNAME}
@@ -33,8 +32,9 @@ COMMON_DEPENDS= www/p5-HTML-Parser>=3.3
BUILD_DEPENDS= ${COMMON_DEPENDS}
RUN_DEPENDS= ${COMMON_DEPENDS} \
devel/re2c \
+ devel/p5-BSD-Resource \
p5-Mail-SPF-*|p5-Mail-SPF-Query-*:mail/p5-Mail-SPF \
- net/p5-Geo-IP \
+
p5-Geo-IP-*|p5-IP-Country-DB_File-*|p5-IP-Country-*:net/p5-Geo-IP \
net/p5-Net-LibIDN \
net/p5-Net-Patricia \
security/gnupg \
Index: distinfo
===
RCS file: /cvs/ports/mail/p5-Mail-SpamAssassin/distinfo,v
retrieving revision 1.38
diff -u -p -r1.38 distinfo
--- distinfo30 Apr 2015 14:41:53 - 1.38
+++ distinfo18 Sep 2018 07:08:03 -
@@ -1,4 +1,4 @@
-SHA256 (Mail-SpamAssassin-3.4.1.tar.bz2) =
oMHJgI8GhLOJWU64ssy6zmSGVGWTST+TCMlVRWPRRlE=
-SHA256 (Mail-SpamAssassin-rules-3.4.1.r1675274.tgz) =
OC9+4WCpahWq5Vn1PfksNvLhdkexnFlU7+3oYUn40Ss=
-SIZE (Mail-SpamAssassin-3.4.1.tar.bz2) = 2710985
-SIZE (Mail-SpamAssassin-rules-3.4.1.r1675274.tgz) = 270622
+SHA256 (Mail-SpamAssassin-3.4.2.tar.bz2) =
zwMEWkmRdSFF7tAH51c38+TH80zyJdtBHOP9NZKA6No=
+SHA256 (Mail-SpamAssassin-rules-3.4.2.r1840640.tgz) =
jUgaIIHx5ioleSOPZrWNIST3ounzz6PUqisD/nsBmbs=
+SIZE (Mail-SpamAssassin-3.4.2.tar.bz2) = 2700016
+SIZE (Mail-SpamAssassin-rules-3.4.2.r1840640.tgz) = 284758
Index: patches/patch-Makefile_PL
===
RCS file: /cvs/ports/mail/p5-Mail-SpamAssassin/patches/patch-Makefile_PL,v
retrieving revision 1.13
diff -u -p -r1.13 patch-Makefile_PL
--- patches/patch-Makefile_PL 30 Apr 2015 14:41:53 - 1.13
+++ patches/patch-Makefile_PL 18 Sep 2018 07:08:03 -
@@ -1,7 +1,8 @@
$OpenBSD: patch-Makefile_PL,v 1.13 2015/04/30 14:41:53 sthen Exp $
Makefile.PL.orig Tue Apr 28 20:57:01 2015
-+++ Makefile.PLThu Apr 30 14:25:54 2015
-@@ -832,7 +832,7 @@ sub MY::install {
+Index: Makefile.PL
+--- Makefile.PL.orig
Makefile.PL
+@@ -856,7 +856,7 @@ sub MY::install {
foreach (@code) {
# Add our install targets as a dependency to all top-level install targets
Index: patches/patch-lib_Mail_SpamAssassin_BayesStore_pm
===
RCS file: patches/patch-lib_Mail_SpamAssassin_BayesStore_pm
diff -N patches/patch-lib_Mail_SpamAssassin_BayesStore_pm
--- patches/patch-lib_Mail_SpamAssassin_BayesStore_pm 31 Oct 2017 07:41:51
- 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,15 +0,0 @@
-$OpenBSD: patch-lib_Mail_SpamAssassin_BayesStore_pm,v 1.1 2017/10/31 07:41:51
giovanni Exp $
-
-# bug 7340: remove expire flag after token expiration is done
-
-Index: lib/Mail/SpamAssassin/BayesStore.pm
lib/Mail/SpamAssassin/BayesStore.pm.orig
-+++ lib/Mail/SpamAssassin/BayesStore.pm
-@@ -419,6 +419,7 @@ sub expire_old_tokens_trapped {
- dbg("bayes: $msg: $msg2");
- }
-
-+ $self->remove_running_expire_tok();
- return 1;
- }
-
Index: patches/patch-lib_Mail_SpamAssassin_Conf_Parser_pm
===
RCS file: patches/patch-lib_Mail_SpamAssassin_Conf_Parser_pm
diff -N
Re: UPDATE: www/netsurf
Anthony J. Bentley writes: > Hi, > > Here's an update to netsurf-3.8. > > From the release announcement: > > "This release will primarily be to incorporate all the bug fixes from > the developer weekends and does not contain any major feature updates." > > As always, test reports welcome, especially from unusual architectures. By request, updated patches to remove fuzz: Index: browser/Makefile === RCS file: /cvs/ports/www/netsurf/browser/Makefile,v retrieving revision 1.34 diff -u -p -r1.34 Makefile --- browser/Makefile18 Jul 2018 10:46:54 - 1.34 +++ browser/Makefile18 Sep 2018 06:55:51 - @@ -3,8 +3,7 @@ COMMENT = lightweight web browser, with GTK interface NETSURF_PROJECT = netsurf -NETSURF_VERSION = 3.7 -REVISION = 2 +NETSURF_VERSION = 3.8 HOMEPAGE = https://www.netsurf-browser.org/ MASTER_SITES = https://download.netsurf-browser.org/netsurf/releases/source/ Index: browser/distinfo === RCS file: /cvs/ports/www/netsurf/browser/distinfo,v retrieving revision 1.13 diff -u -p -r1.13 distinfo --- browser/distinfo4 Nov 2017 22:28:01 - 1.13 +++ browser/distinfo18 Sep 2018 06:55:51 - @@ -1,2 +1,2 @@ -SHA256 (netsurf-3.7-src.tar.gz) = 78IKhqI7oalm3IcPArMX0/YC4buy4bUHYI40/r+zfhY= -SIZE (netsurf-3.7-src.tar.gz) = 3911738 +SHA256 (netsurf-3.8-src.tar.gz) = oA7m8+fqeuUMbB+VyB04E1kXG/aHTliJHyHFUAkMVUI= +SIZE (netsurf-3.8-src.tar.gz) = 3945752 Index: browser/patches/patch-frontends_gtk_res_options_gtk2_ui === RCS file: /cvs/ports/www/netsurf/browser/patches/patch-frontends_gtk_res_options_gtk2_ui,v retrieving revision 1.1 diff -u -p -r1.1 patch-frontends_gtk_res_options_gtk2_ui --- browser/patches/patch-frontends_gtk_res_options_gtk2_ui 30 Nov 2016 07:35:00 - 1.1 +++ browser/patches/patch-frontends_gtk_res_options_gtk2_ui 18 Sep 2018 06:55:51 - @@ -1,7 +1,137 @@ $OpenBSD: patch-frontends_gtk_res_options_gtk2_ui,v 1.1 2016/11/30 07:35:00 bentley Exp $ frontends/gtk/res/options.gtk2.ui.orig Sat Nov 19 06:37:41 2016 -+++ frontends/gtk/res/options.gtk2.ui Mon Nov 21 02:36:27 2016 -@@ -5,7 +5,7 @@ +Index: frontends/gtk/res/options.gtk2.ui +--- frontends/gtk/res/options.gtk2.ui.orig frontends/gtk/res/options.gtk2.ui +@@ -106,19 +106,19 @@ + + + +-preferencesFonttypeSans ++Sans-serif + + +-preferencesFonttypeSerif ++Serif + + +-preferencesFonttypeMonospace ++Monospace + + +-preferencesFonttypeCursive ++Cursive + + +-preferencesFonttypeFantasy ++Fantasy + + + +@@ -129,13 +129,13 @@ + + + +-preferencesDeveloperViewWindow ++Window + + +-preferencesDeveloperViewTab ++Tab + + +-preferencesDeveloperViewEditor ++Editor + + + +@@ -146,16 +146,16 @@ + + + +-preferencesImageLoadBoth ++foreground and background images + + +-preferencesImageLoadFore ++foreground images + + +-preferencesImageLoadBack ++background images + + +-preferencesImageLoadNone ++no images + + + +@@ -166,19 +166,19 @@ + + + +-preferencesProxyTypeDirect ++Direct connection + + +-preferencesProxyTypeManual ++Manual with no authentication + + +-preferencesProxyTypeBasic ++Manual with basic authentication + + +-preferencesProxyTypeNLTM ++Manual with NTLM authentication + + +-preferencesProxyTypeSystem ++System settings + + + +@@ -260,16 +260,16 @@ + + + +-preferencesTabLocTop ++Top + + +-preferencesTabLocLeft ++Left + + +-preferencesTabLocRight ++Right + + +-preferencesTabLocBottom ++Bottom + + + +@@ -280,23 +280,23 @@ + + + +-preferencesButtonTypeSmall ++Small Icons + + +-preferencesButtonTypeLarge ++Large Icons + + +-preferencesButtonTypeLargeText ++Large Icons and Text + + +-preferencesButtonTypeText ++Text only + + + False 5 @@ -10,7 +140,7 @@ $OpenBSD: patch-frontends_gtk_res_option center-on-parent True dialog -@@ -94,7 +94,7 @@ +@@ -385,7 +385,7 @@ True
Re: lang/rust-doc: duplicate plist elements
On Mon, Sep 17, 2018 at 08:46:13PM +0200, Matthieu Herrb wrote: > Hi, > > > the patch below fixes 'make package' for rust-doc on aarch64 for me. it surprised me a bit. If I am unsure to have ran `make package', I definitively ran `make update-plist'... anyway, I agree there are duplicate elements in pkg/PFRAG.aarch64-doc and pkg/PLIST-doc . I will be unable to check it by regenerating the plist in sane delay (I cleared my build and rerun it will take 3-4 days). If I remove from pkg/PFRAG.aarch64-doc files already present in pkg/PLIST-doc, I have the same diff so I assume it is ok. Please commit it. Thanks. -- Sebastien Marie > Index: pkg/PFRAG.aarch64-doc > === > RCS file: /cvs/ports/lang/rust/pkg/PFRAG.aarch64-doc,v > retrieving revision 1.3 > diff -u -p -u -r1.3 PFRAG.aarch64-doc > --- pkg/PFRAG.aarch64-doc 16 Sep 2018 16:35:27 - 1.3 > +++ pkg/PFRAG.aarch64-doc 17 Sep 2018 18:44:26 - > @@ -7,144 +7,6 @@ share/doc/rust/html/core/arch/aarch64/fn > share/doc/rust/html/core/arch/aarch64/fn._clz_u32.html > share/doc/rust/html/core/arch/aarch64/fn._clz_u8.html > share/doc/rust/html/core/arch/aarch64/fn._rbit_u32.html > -share/doc/rust/html/core/arch/aarch64/fn.vadd_f32.html > -share/doc/rust/html/core/arch/aarch64/fn.vadd_f64.html > -share/doc/rust/html/core/arch/aarch64/fn.vadd_s16.html > -share/doc/rust/html/core/arch/aarch64/fn.vadd_s32.html > -share/doc/rust/html/core/arch/aarch64/fn.vadd_s8.html > -share/doc/rust/html/core/arch/aarch64/fn.vadd_u16.html > -share/doc/rust/html/core/arch/aarch64/fn.vadd_u32.html > -share/doc/rust/html/core/arch/aarch64/fn.vadd_u8.html > -share/doc/rust/html/core/arch/aarch64/fn.vaddd_s64.html > -share/doc/rust/html/core/arch/aarch64/fn.vaddd_u64.html > -share/doc/rust/html/core/arch/aarch64/fn.vaddl_s16.html > -share/doc/rust/html/core/arch/aarch64/fn.vaddl_s32.html > -share/doc/rust/html/core/arch/aarch64/fn.vaddl_s8.html > -share/doc/rust/html/core/arch/aarch64/fn.vaddl_u16.html > -share/doc/rust/html/core/arch/aarch64/fn.vaddl_u32.html > -share/doc/rust/html/core/arch/aarch64/fn.vaddl_u8.html > -share/doc/rust/html/core/arch/aarch64/fn.vaddq_f32.html > -share/doc/rust/html/core/arch/aarch64/fn.vaddq_f64.html > -share/doc/rust/html/core/arch/aarch64/fn.vaddq_s16.html > -share/doc/rust/html/core/arch/aarch64/fn.vaddq_s32.html > -share/doc/rust/html/core/arch/aarch64/fn.vaddq_s64.html > -share/doc/rust/html/core/arch/aarch64/fn.vaddq_s8.html > -share/doc/rust/html/core/arch/aarch64/fn.vaddq_u16.html > -share/doc/rust/html/core/arch/aarch64/fn.vaddq_u32.html > -share/doc/rust/html/core/arch/aarch64/fn.vaddq_u64.html > -share/doc/rust/html/core/arch/aarch64/fn.vaddq_u8.html > -share/doc/rust/html/core/arch/aarch64/fn.vmaxv_f32.html > -share/doc/rust/html/core/arch/aarch64/fn.vmaxv_s16.html > -share/doc/rust/html/core/arch/aarch64/fn.vmaxv_s32.html > -share/doc/rust/html/core/arch/aarch64/fn.vmaxv_s8.html > -share/doc/rust/html/core/arch/aarch64/fn.vmaxv_u16.html > -share/doc/rust/html/core/arch/aarch64/fn.vmaxv_u32.html > -share/doc/rust/html/core/arch/aarch64/fn.vmaxv_u8.html > -share/doc/rust/html/core/arch/aarch64/fn.vmaxvq_f32.html > -share/doc/rust/html/core/arch/aarch64/fn.vmaxvq_f64.html > -share/doc/rust/html/core/arch/aarch64/fn.vmaxvq_s16.html > -share/doc/rust/html/core/arch/aarch64/fn.vmaxvq_s32.html > -share/doc/rust/html/core/arch/aarch64/fn.vmaxvq_s8.html > -share/doc/rust/html/core/arch/aarch64/fn.vmaxvq_u16.html > -share/doc/rust/html/core/arch/aarch64/fn.vmaxvq_u32.html > -share/doc/rust/html/core/arch/aarch64/fn.vmaxvq_u8.html > -share/doc/rust/html/core/arch/aarch64/fn.vminv_f32.html > -share/doc/rust/html/core/arch/aarch64/fn.vminv_s16.html > -share/doc/rust/html/core/arch/aarch64/fn.vminv_s32.html > -share/doc/rust/html/core/arch/aarch64/fn.vminv_s8.html > -share/doc/rust/html/core/arch/aarch64/fn.vminv_u16.html > -share/doc/rust/html/core/arch/aarch64/fn.vminv_u32.html > -share/doc/rust/html/core/arch/aarch64/fn.vminv_u8.html > -share/doc/rust/html/core/arch/aarch64/fn.vminvq_f32.html > -share/doc/rust/html/core/arch/aarch64/fn.vminvq_f64.html > -share/doc/rust/html/core/arch/aarch64/fn.vminvq_s16.html > -share/doc/rust/html/core/arch/aarch64/fn.vminvq_s32.html > -share/doc/rust/html/core/arch/aarch64/fn.vminvq_s8.html > -share/doc/rust/html/core/arch/aarch64/fn.vminvq_u16.html > -share/doc/rust/html/core/arch/aarch64/fn.vminvq_u32.html > -share/doc/rust/html/core/arch/aarch64/fn.vminvq_u8.html > -share/doc/rust/html/core/arch/aarch64/fn.vmovl_s16.html > -share/doc/rust/html/core/arch/aarch64/fn.vmovl_s32.html > -share/doc/rust/html/core/arch/aarch64/fn.vmovl_s8.html > -share/doc/rust/html/core/arch/aarch64/fn.vmovl_u16.html > -share/doc/rust/html/core/arch/aarch64/fn.vmovl_u32.html > -share/doc/rust/html/core/arch/aarch64/fn.vmovl_u8.html > -share/doc/rust/html/core/arch/aarch64/fn.vmovn_s16.html > -share/doc/rust/html/core/arch/aarch64/fn.vmovn_s32.html >
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: giova...@cvs.openbsd.org2018/09/18 00:42:57 Modified files: mail/p5-Mail-SpamAssassin: Makefile distinfo mail/p5-Mail-SpamAssassin/patches: patch-Makefile_PL patch-t_sa_compile_t mail/p5-Mail-SpamAssassin/pkg: PLIST spamassassin.rc Removed files: mail/p5-Mail-SpamAssassin/patches: patch-lib_Mail_SpamAssassin_BayesStore_pm patch-lib_Mail_SpamAssassin_Conf_Parser_pm patch-lib_Mail_SpamAssassin_Conf_pm patch-lib_Mail_SpamAssassin_DnsResolver_pm patch-lib_Mail_SpamAssassin_Message_Metadata_Received_pm patch-lib_Mail_SpamAssassin_Message_pm patch-lib_Mail_SpamAssassin_Plugin_DKIM_pm patch-lib_Mail_SpamAssassin_Plugin_PDFInfo_pm patch-lib_Mail_SpamAssassin_Plugin_SPF_pm patch-lib_Mail_SpamAssassin_Plugin_URIDNSBL_pm patch-lib_Mail_SpamAssassin_Plugin_URILocalBL_pm patch-lib_Mail_SpamAssassin_Util_pm patch-spamc_libspamc_c patch-spamd_spamd_raw patch-t_SATest_pm patch-t_spf_t Log message: Major update to 3.4.2, lot of fixes and new features, four CVE security bug fixed for PDFInfo.pm and the SA core: CVE-2017-15705, CVE-2016-1238, CVE-2018-11780 & CVE-2018-11781 ok pea@
UPDATE: www/netsurf
Hi, Here's an update to netsurf-3.8. >From the release announcement: "This release will primarily be to incorporate all the bug fixes from the developer weekends and does not contain any major feature updates." As always, test reports welcome, especially from unusual architectures. Index: browser/Makefile === RCS file: /cvs/ports/www/netsurf/browser/Makefile,v retrieving revision 1.34 diff -u -p -r1.34 Makefile --- browser/Makefile18 Jul 2018 10:46:54 - 1.34 +++ browser/Makefile18 Sep 2018 05:46:57 - @@ -3,8 +3,7 @@ COMMENT = lightweight web browser, with GTK interface NETSURF_PROJECT = netsurf -NETSURF_VERSION = 3.7 -REVISION = 2 +NETSURF_VERSION = 3.8 HOMEPAGE = https://www.netsurf-browser.org/ MASTER_SITES = https://download.netsurf-browser.org/netsurf/releases/source/ Index: browser/distinfo === RCS file: /cvs/ports/www/netsurf/browser/distinfo,v retrieving revision 1.13 diff -u -p -r1.13 distinfo --- browser/distinfo4 Nov 2017 22:28:01 - 1.13 +++ browser/distinfo18 Sep 2018 05:46:57 - @@ -1,2 +1,2 @@ -SHA256 (netsurf-3.7-src.tar.gz) = 78IKhqI7oalm3IcPArMX0/YC4buy4bUHYI40/r+zfhY= -SIZE (netsurf-3.7-src.tar.gz) = 3911738 +SHA256 (netsurf-3.8-src.tar.gz) = oA7m8+fqeuUMbB+VyB04E1kXG/aHTliJHyHFUAkMVUI= +SIZE (netsurf-3.8-src.tar.gz) = 3945752 Index: browser/patches/patch-frontends_gtk_res_options_gtk2_ui === RCS file: /cvs/ports/www/netsurf/browser/patches/patch-frontends_gtk_res_options_gtk2_ui,v retrieving revision 1.1 diff -u -p -r1.1 patch-frontends_gtk_res_options_gtk2_ui --- browser/patches/patch-frontends_gtk_res_options_gtk2_ui 30 Nov 2016 07:35:00 - 1.1 +++ browser/patches/patch-frontends_gtk_res_options_gtk2_ui 18 Sep 2018 05:46:57 - @@ -1,7 +1,137 @@ $OpenBSD: patch-frontends_gtk_res_options_gtk2_ui,v 1.1 2016/11/30 07:35:00 bentley Exp $ frontends/gtk/res/options.gtk2.ui.orig Sat Nov 19 06:37:41 2016 -+++ frontends/gtk/res/options.gtk2.ui Mon Nov 21 02:36:27 2016 -@@ -5,7 +5,7 @@ +Index: frontends/gtk/res/options.gtk2.ui +--- frontends/gtk/res/options.gtk2.ui.orig frontends/gtk/res/options.gtk2.ui +@@ -106,19 +106,19 @@ + + + +-preferencesFonttypeSans ++Sans-serif + + +-preferencesFonttypeSerif ++Serif + + +-preferencesFonttypeMonospace ++Monospace + + +-preferencesFonttypeCursive ++Cursive + + +-preferencesFonttypeFantasy ++Fantasy + + + +@@ -129,13 +129,13 @@ + + + +-preferencesDeveloperViewWindow ++Window + + +-preferencesDeveloperViewTab ++Tab + + +-preferencesDeveloperViewEditor ++Editor + + + +@@ -146,16 +146,16 @@ + + + +-preferencesImageLoadBoth ++foreground and background images + + +-preferencesImageLoadFore ++foreground images + + +-preferencesImageLoadBack ++background images + + +-preferencesImageLoadNone ++no images + + + +@@ -166,19 +166,19 @@ + + + +-preferencesProxyTypeDirect ++Direct connection + + +-preferencesProxyTypeManual ++Manual with no authentication + + +-preferencesProxyTypeBasic ++Manual with basic authentication + + +-preferencesProxyTypeNLTM ++Manual with NTLM authentication + + +-preferencesProxyTypeSystem ++System settings + + + +@@ -260,16 +260,16 @@ + + + +-preferencesTabLocTop ++Top + + +-preferencesTabLocLeft ++Left + + +-preferencesTabLocRight ++Right + + +-preferencesTabLocBottom ++Bottom + + + +@@ -280,23 +280,23 @@ + + + +-preferencesButtonTypeSmall ++Small Icons + + +-preferencesButtonTypeLarge ++Large Icons + + +-preferencesButtonTypeLargeText ++Large Icons and Text + + +-preferencesButtonTypeText ++Text only + + + False 5 @@ -10,7 +140,7 @@ $OpenBSD: patch-frontends_gtk_res_option center-on-parent True dialog -@@ -94,7 +94,7 @@ +@@ -385,7 +385,7 @@ True False @@ -19,7 +149,7 @@ $OpenBSD: patch-frontends_gtk_res_option
