CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2020/05/15 23:57:15 Modified files: devel/kdevelop : Makefile distinfo devel/kdevelop/pkg: PLIST Removed files: devel/kdevelop/patches: patch-plugins_clang_CMakeLists_txt Log message: Update kdevelop to 5.5.1
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2020/05/15 19:46:35 Modified files: sysutils/arm-trusted-firmware: Makefile distinfo Removed files: sysutils/arm-trusted-firmware/patches: patch-plat_rockchip_common_params_setup_c patch-plat_rockchip_rk3399_drivers_pmu_pmu_c patch-plat_rockchip_rk3399_drivers_pmu_pmu_h patch-plat_rockchip_rk3399_drivers_soc_soc_c Log message: update to Arm Trusted Firmware 2.3 ok kurt@ who tested on rock64 gen2 and rockpro64
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bl...@cvs.openbsd.org 2020/05/15 17:49:47 Modified files: textproc/p5-XML-LibXML: Makefile distinfo textproc/p5-XML-LibXML/patches: patch-Makefile_PL Log message: update p5-XML-LibXML to 2.0205
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bl...@cvs.openbsd.org 2020/05/15 16:08:12 Modified files: devel/p5-FFI-CheckLib: Makefile distinfo Log message: update p5-FFI-CheckLib to 0.27
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bl...@cvs.openbsd.org 2020/05/15 16:00:37 Modified files: devel/p5-MCE : Makefile distinfo Log message: update p5-MCE to 1.868 from wen heping; OK sthen@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2020/05/15 15:50:24 Modified files: devel/happy: Makefile distinfo devel/happy/pkg: PLIST Removed files: devel/happy/patches: patch-tests_Makefile Log message: Update to happy-0.19.10. >From Greg Steuck. Thanks! In addition to Gregs diff, I also removed charset from WANTLIB (not used, test results with and without libcharset.so are identical).
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2020/05/15 15:32:18 Modified files: lang/ghc : Makefile Removed files: lang/ghc/patches: patch-rts_ghc_mk Log message: Some ghc cleanups: - Remove -no-pie from GHC_CC_OPTS. - Remove obsolete ffi related patch. - Remove explicit wxneeded from Makefile. >From Greg Steuck. Thanks!
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bl...@cvs.openbsd.org 2020/05/15 15:27:47 Modified files: devel/p5-Exporter-Tiny: Makefile distinfo Log message: update p5-Exporter-Tiny to 1.002002
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bl...@cvs.openbsd.org 2020/05/15 14:46:35 Modified files: converters/p5-JSON-MaybeXS: Makefile distinfo Log message: update p5-JSON-MaybeXS to 1.004001
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bl...@cvs.openbsd.org 2020/05/15 14:35:10 Modified files: misc/p5-File-LibMagic: Makefile distinfo misc/p5-File-LibMagic/pkg: PLIST Removed files: misc/p5-File-LibMagic/patches: patch-MANIFEST Log message: update p5-File-LibMagic to 1.22 from wen heping
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: na...@cvs.openbsd.org 2020/05/15 14:23:43 Modified files: misc/vttest: Makefile distinfo Log message: update to 20200420
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bcal...@cvs.openbsd.org 2020/05/15 13:57:34 Modified files: games/gnukem : Makefile distinfo games/gnukem/patches: patch-src_djimage_cpp patch-src_sdl_djgraph_cpp games/gnukem/pkg: PLIST Removed files: games/gnukem/patches: patch-src_datadir_h patch-src_game_cpp patch-src_sdl_djsound_cpp patch-src_sys_defs_h Log message: Update to gnukem-1.0.1
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/05/15 11:22:28 Modified files: sysutils/terragrunt: Makefile distinfo Log message: Update to terragrunt-0.23.18.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/05/15 11:12:48 Modified files: sysutils/nomad : Makefile distinfo Log message: Update to nomad-0.11.2.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/05/15 11:04:28 Modified files: sysutils/consul: Makefile distinfo Log message: Update to consul-1.7.3.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/05/15 11:02:48 Modified files: sysutils/terraform: Makefile distinfo Log message: Update to terraform-0.12.25.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/05/15 10:57:47 Modified files: sysutils/google-cloud-sdk: Makefile distinfo sysutils/google-cloud-sdk/pkg: PLIST Log message: Update to google-cloud-sdk-292.0.0.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/05/15 10:52:42 Modified files: sysutils/amazon-ssm-agent: Makefile distinfo Log message: Update to amazon-ssm-agent-2.3.1205.0.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: na...@cvs.openbsd.org 2020/05/15 10:51:26 Modified files: x11/wmctrl : Makefile Added files: x11/wmctrl/patches: patch-main_c Log message: Fix XGetWindowProperty() usage on LP64 archs. Based on a submission by Alessandro De Laurenzis.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/05/15 10:48:18 Modified files: multimedia/py-chromecast: Makefile distinfo multimedia/py-chromecast/pkg: PLIST Log message: Update to py3-chromecast-5.2.0.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: na...@cvs.openbsd.org 2020/05/15 10:49:13 ports/x11/wmctrl/patches Update of /cvs/ports/x11/wmctrl/patches In directory cvs.openbsd.org:/tmp/cvs-serv14912/patches Log Message: Directory /cvs/ports/x11/wmctrl/patches added to the repository
Re: CVS: cvs.openbsd.org: ports
On Fri, May 15, 2020 at 02:48:04PM +0200, Jeremie Courreges-Anglas wrote: > +cc maintainer > The port Makefile seems to reproduce the upstream requirements. I see no > rationale in > > https://github.com/elastic/curator/commit/0cc508244b667cb933846f80f9c5f4690f8df05b > for limiting urllib3 versions to <1.25. I suspect it's just the "these > versions are known to work, let's pin them" pattern. > The diff below just drops the <1.25 requirement. Build-tested only. > ok? I run into this with python ports often. I usually just patch like this and run the tests. Most often, they work just fine. --Kurt
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2020/05/15 09:54:25 Modified files: graphics/digikam: Makefile distinfo graphics/digikam/patches: patch-core_CMakeLists_txt patch-core_showfoto_CMakeLists_txt graphics/digikam/pkg: PLIST Removed files: graphics/digikam/patches: patch-core_app_DigikamTarget_cmake patch-core_app_utils_digikam_version_h_cmake_in patch-core_libs_pgfutils_libpgf_PGFplatform_h patch-core_tests_dimg_magickloader_cpp Log message: Update digikam to 6.4.0
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2020/05/15 09:53:58 Modified files: astro/kstars : Makefile distinfo astro/kstars/pkg: PLIST Log message: Update kstars to 3.4.2
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2020/05/15 09:50:54 Removed files: benchmarks/fio/patches: patch-gettime_c patch-os_os-openbsd_h Log message: Update to fio-3.19 - remove patches accepted upstream
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/05/15 09:44:44 Modified files: graphics/ctl : Makefile graphics/ctl/patches: patch-config_OpenEXR_CTL_pc_in graphics/ctl/pkg: PLIST Log message: Use pkg-config --libs OpenEXR output.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2020/05/15 09:42:00 Modified files: benchmarks/fio : Makefile distinfo Log message: Update to fio-3.19
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/05/15 08:47:41 Modified files: devel/subversion: Makefile devel/subversion/pkg: PLIST-ap2 PLIST-main PLIST-perl PLIST-python PLIST-ruby Log message: Move bash completions in their proper directory. Regen all PLISTs while here. ok stsp@ (maintainer)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/05/15 08:46:37 Modified files: security/lastpass-cli: Makefile security/lastpass-cli/pkg: PLIST Log message: Add bash completions. ok bket@ (maintainer)
Re: CVS: cvs.openbsd.org: ports
On 05/15, Jeremie Courreges-Anglas wrote: > for limiting urllib3 versions to <1.25. I suspect it's just the "these > versions are known to work, let's pin them" pattern. > The diff below just drops the <1.25 requirement. Build-tested only. Jeremie, thanks! I've already had the similar fix in my tree, commited after testing with Elasticsearch. -- With best regards, Pavel Korovin
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: p...@cvs.openbsd.org2020/05/15 07:09:36 Modified files: sysutils/py-elasticsearch-curator: Makefile sysutils/py-elasticsearch-curator/patches: patch-setup_cfg patch-setup_py Log message: Loosen urllib3 python dependency, similar patch from jca@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2020/05/15 07:01:32 Modified files: sysutils/pciutils: Makefile distinfo Log message: update to pciutils 3.6.4
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2020/05/15 06:53:14 Modified files: sysutils/u-boot: Makefile distinfo sysutils/u-boot/patches: patch-configs_firefly-rk3399_defconfig patch-configs_rock960-rk3399_defconfig patch-configs_rockpro64-rk3399_defconfig sysutils/u-boot/pkg: PFRAG.arm Added files: sysutils/u-boot/patches: patch-drivers_usb_host_dwc2_c patch-lib_rsa_rsa-sign_c Removed files: sysutils/u-boot/patches: patch-arch_arm_dts_rk3328-sdram-ddr4-666_dtsi patch-arch_arm_dts_rk3328-sdram-lpddr3-666_dtsi patch-drivers_ram_rockchip_sdram_rk3328_c Log message: update to U-Boot 2020.04
Re: CVS: cvs.openbsd.org: ports
On Fri, May 15 2020, Antoine Jacoutot wrote:
> On Thu, May 14, 2020 at 12:12:36PM -0600, Paco Esteban wrote:
>> CVSROOT: /cvs
>> Module name: ports
>> Changes by: p...@cvs.openbsd.org2020/05/14 12:12:36
>>
>> Modified files:
>> www/py-urllib3 : Makefile distinfo
>> Removed files:
>> www/py-urllib3/patches: patch-setup_cfg
>>
>> Log message:
>> update py-urllib3 to 1.25.9
>>
>> ok sthen@ jca@
>
> This broke sysutils/py-elasticsearch-curator:
>
> ===> py3-elasticsearch-curator-5.8.1 depends on: py3-urllib3->=1.24.2,<1.25 -
> default py3-urllib3-1.25.9 does not match
+cc maintainer
The port Makefile seems to reproduce the upstream requirements. I see no
rationale in
https://github.com/elastic/curator/commit/0cc508244b667cb933846f80f9c5f4690f8df05b
for limiting urllib3 versions to <1.25. I suspect it's just the "these
versions are known to work, let's pin them" pattern.
The diff below just drops the <1.25 requirement. Build-tested only.
ok?
Index: Makefile
===
RCS file: /cvs/ports/sysutils/py-elasticsearch-curator/Makefile,v
retrieving revision 1.22
diff -u -p -r1.22 Makefile
--- Makefile24 Oct 2019 13:35:04 - 1.22
+++ Makefile15 May 2020 12:46:52 -
@@ -3,6 +3,7 @@
COMMENT= manage Elasticsearch indices
MODPY_EGG_VERSION=5.8.1
+REVISION= 0
DISTNAME= elasticsearch-curator-${MODPY_EGG_VERSION}
PKGNAME= ${MODPY_PY_PREFIX}elasticsearch-curator-${MODPY_EGG_VERSION}
@@ -30,7 +31,7 @@ RUN_DEPENDS= devel/py-certifi${MODPY_FLA
textproc/py-elasticsearch${MODPY_FLAVOR}>=7.0.4,<8.0.0 \
textproc/py-yaml${MODPY_FLAVOR}>=3.13 \
www/py-requests${MODPY_FLAVOR}>=2.20.0 \
- www/py-urllib3${MODPY_FLAVOR}>=1.24.2,<1.25
+ www/py-urllib3${MODPY_FLAVOR}>=1.24.2
BUILD_DEPENDS= ${RUN_DEPENDS}
Index: patches/patch-setup_cfg
===
RCS file: /cvs/ports/sysutils/py-elasticsearch-curator/patches/patch-setup_cfg,v
retrieving revision 1.1
diff -u -p -r1.1 patch-setup_cfg
--- patches/patch-setup_cfg 24 Oct 2019 13:35:04 - 1.1
+++ patches/patch-setup_cfg 15 May 2020 12:46:52 -
@@ -1,9 +1,17 @@
$OpenBSD: patch-setup_cfg,v 1.1 2019/10/24 13:35:04 pvk Exp $
+Loosen requirements.
+
Index: setup.cfg
--- setup.cfg.orig
+++ setup.cfg
-@@ -27,7 +27,7 @@ install_requires =
+@@ -22,23 +22,23 @@ classifiers =
+ install_requires =
+ voluptuous>=0.9.3
+ elasticsearch>=7.0.4,<8.0.0
+- urllib3>=1.24.2,<1.25
++ urllib3>=1.24.2
+ requests>=2.20.0
boto3>=1.9.142
requests_aws4auth>=0.9
click>=6.7,<7.0
@@ -12,7 +20,11 @@ Index: setup.cfg
certifi>=2019.9.11
six>=1.11.0
setup_requires =
-@@ -38,7 +38,7 @@ setup_requires =
+ voluptuous>=0.9.3
+ elasticsearch>=7.0.4,<8.0.0
+- urllib3>=1.24.2,<1.25
++ urllib3>=1.24.2
+ requests>=2.20.0
boto3>=1.9.142
requests_aws4auth>=0.9
click>=6.7,<7.0
Index: patches/patch-setup_py
===
RCS file: /cvs/ports/sysutils/py-elasticsearch-curator/patches/patch-setup_py,v
retrieving revision 1.5
diff -u -p -r1.5 patch-setup_py
--- patches/patch-setup_py 24 Oct 2019 13:35:04 - 1.5
+++ patches/patch-setup_py 15 May 2020 12:46:52 -
@@ -1,9 +1,17 @@
$OpenBSD: patch-setup_py,v 1.5 2019/10/24 13:35:04 pvk Exp $
+Loosen requirements.
+
Index: setup.py
--- setup.py.orig
+++ setup.py
-@@ -28,7 +28,7 @@ def get_install_requires():
+@@ -23,12 +23,12 @@ def get_version():
+
+ def get_install_requires():
+ res = ['elasticsearch>=7.0.4,<8.0.0' ]
+-res.append('urllib3>=1.24.2,<1.25')
++res.append('urllib3>=1.24.2')
+ res.append('requests>=2.20.0')
res.append('boto3>=1.9.142')
res.append('requests_aws4auth>=0.9')
res.append('click>=6.7,<7.0')
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/05/15 06:03:54 Modified files: productivity/taskwarrior: Makefile productivity/taskwarrior/pkg: PLIST Log message: Better doc subdirectory (PREFIX/share/doc/taskwarrior/). Install completions and helpers in their corresponding directory. ok jasper@ (maintainer)
Re: CVS: cvs.openbsd.org: ports
On Thu, May 14, 2020 at 12:12:36PM -0600, Paco Esteban wrote: > CVSROOT: /cvs > Module name: ports > Changes by: p...@cvs.openbsd.org2020/05/14 12:12:36 > > Modified files: > www/py-urllib3 : Makefile distinfo > Removed files: > www/py-urllib3/patches: patch-setup_cfg > > Log message: > update py-urllib3 to 1.25.9 > > ok sthen@ jca@ This broke sysutils/py-elasticsearch-curator: ===> py3-elasticsearch-curator-5.8.1 depends on: py3-urllib3->=1.24.2,<1.25 - default py3-urllib3-1.25.9 does not match -- Antoine
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2020/05/15 05:40:51 Modified files: audio/ncmpc: Makefile distinfo Log message: Update to ncmpc-0.38 Changes: https://raw.githubusercontent.com/MusicPlayerDaemon/ncmpc/v0.38/NEWS OK landry@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2020/05/15 05:40:36 Modified files: audio/mpd : Makefile distinfo Log message: Update to mpd-0.21.23 Changes: https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/v0.21.23/NEWS OK landry@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2020/05/15 05:40:13 Modified files: x11/i3 : Makefile distinfo Log message: Update to i3-4.18.1 Release notes: https://i3wm.org/downloads/RELEASE-NOTES-4.18.1.txt OK sthen@ (who had the same diff)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/05/15 05:27:28 Modified files: shells/bash-completion: Makefile Log message: Do not RDEP on bash; this will allow to use this to add support for bash-completion in applications without adding an indirect build dependency on bash ok jasper@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2020/05/15 05:17:43 Modified files: x11/gnome/libgda: Makefile Added files: x11/gnome/libgda/patches: patch-libgda-report_RML_trml2html_trml2html_py patch-libgda-report_RML_trml2pdf___init___py patch-libgda-report_RML_trml2pdf_color_py patch-libgda-report_RML_trml2pdf_trml2pdf_py Log message: switch to python3, patches from upstream git
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2020/05/15 05:01:13 Modified files: sysutils/salt : Makefile Log message: include py-mysqlclient in TEST_DEPENDS to replace py-msql. the former is fork which includes python3 support
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/05/15 04:58:52 Modified files: graphics/colord: Makefile graphics/colord/pkg: PLIST multimedia/gstreamer1/core: Makefile multimedia/gstreamer1/core/pkg: PLIST x11/gnome/tracker: Makefile net/mtr: Makefile Log message: Add bash completions or rely on the shells/bash-completion pkg-config file if we already had them.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2020/05/15 04:41:29 Modified files: sysutils/firmware/amdgpu: Makefile distinfo sysutils/firmware/amdgpu/pkg: PLIST Log message: update amdgpu firmware to linux-firmware 20200421 Tested on polaris11 by Mark Patruck, picasso by kn@ robert@ and myself, and my vega10 which required kernel patches to work with the linux 4.19 drm in -current. ok sthen@ kn@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/05/15 04:40:26 Modified files: x11/gtk+4/patches: patch-testsuite_reftests_gtk-reftest_c Log message: Fix libexecinfo patch.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/05/15 04:37:20 Modified files: sysutils/libvirt: Makefile sysutils/libvirt/pkg: PLIST Log message: Add DEBUG_PACKAGES.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/05/15 04:24:00 Modified files: databases : Makefile databases/py-mysqlclient: Makefile databases/py-mysqlclient/pkg: DESCR PFRAG.no-python3 devel/quirks : Makefile devel/quirks/files: Quirks.pm Removed files: databases/py-mysql: Makefile distinfo databases/py-mysql/patches: patch-_mysql_c databases/py-mysql/pkg: DESCR PLIST Log message: remove py2-only databases/py-mysql and provide an upgrade path to the (compatible) databases/py-mysqlclient. ok jasper@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/05/15 04:23:05 Modified files: net/librenms : Makefile Log message: librenms tweaks: - switch dependency from databases/py-mysql to databases/py-mysqlclient, requested by (and original diff from) jasper@ - stop patching MODPHP_BIN now that we provide a symlink, makes it easier to use with newer PHP
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: feine...@cvs.openbsd.org2020/05/15 03:55:55 Modified files: multimedia/libv4l: Makefile distinfo multimedia/libv4l/pkg: PLIST Log message: Update to libv4l 1.18.1
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: p...@cvs.openbsd.org2020/05/15 03:38:42 Modified files: www/gitea : Makefile Log message: Remove GH_* references from sthen@, thanks!
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bl...@cvs.openbsd.org 2020/05/15 03:37:15 Modified files: misc/open62541 : Makefile Added files: misc/open62541/patches: patch-src_client_ua_client_highlevel_c Log message: Backport fix from uptream, prevents crash when request Id is missing.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bl...@cvs.openbsd.org 2020/05/15 03:34:29 Modified files: misc/p5-OPCUA-Open62541: Makefile distinfo Log message: update p5-OPCUA-Open62541 to 0.014
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/05/15 03:32:48 Modified files: devel/dconf: Makefile devel/dconf/pkg: PLIST Log message: Add bash completions.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: gonz...@cvs.openbsd.org 2020/05/15 03:17:39 Modified files: security/suricata: Makefile distinfo Log message: Update for Suricata to 5.0.3 https://suricata-ids.org/2020/04/28/suricata-5-0-3-released/ OK jasper@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/05/15 03:14:41 Modified files: shells/bash-completion: Makefile Log message: Append sysutils to CATEGORIES.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/05/15 03:08:28 Modified files: x11/gnome/tracker-miners: Makefile Log message: Move to py3.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/05/15 03:03:10 Modified files: x11/gnome/tracker: Makefile Log message: Fix TEST_DEPENDS.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/05/15 03:01:04 Modified files: x11/gnome/tracker: Makefile Log message: Move to py3.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/05/15 02:58:43 Modified files: mail : Makefile Log message: +notmuch
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/05/15 02:58:14 Log message: import ports/mail/notmuch, worked on by various people including me, Enric Morales and Olivier Taïbi, ok abieber@ kmos@ Notmuch is a mail indexing program providing a fast tag-based email reader with global search to use within a text editor. "Notmuch is not much of an email program. It doesn't receive messages (no POP or IMAP suport). It doesn't send messages (no mail composer, no network code at all). And for what it does do (email search) that work is provided by an external library, Xapian. So if Notmuch provides no user interface and Xapian does all the heavy lifting, then what's left here? Not much." Status: Vendor Tag: sthen Release Tags: sthen_20200515 N ports/mail/notmuch/Makefile N ports/mail/notmuch/Makefile.inc N ports/mail/notmuch/notmuch/Makefile N ports/mail/notmuch/notmuch/distinfo N ports/mail/notmuch/notmuch/patches/patch-devel_nmbug_doc_conf_py N ports/mail/notmuch/notmuch/patches/patch-Makefile_global N ports/mail/notmuch/notmuch/patches/patch-Makefile_local N ports/mail/notmuch/notmuch/patches/patch-configure N ports/mail/notmuch/notmuch/patches/patch-devel_RELEASING N ports/mail/notmuch/notmuch/patches/patch-bindings_python_notmuch_globals_py N ports/mail/notmuch/notmuch/patches/patch-emacs_Makefile_local N ports/mail/notmuch/notmuch/patches/patch-doc_conf_py N ports/mail/notmuch/notmuch/patches/patch-lib_Makefile_local N ports/mail/notmuch/notmuch/patches/patch-lib_notmuch_h N ports/mail/notmuch/notmuch/patches/patch-notmuch-dump_c N ports/mail/notmuch/notmuch/patches/patch-notmuch-restore_c N ports/mail/notmuch/notmuch/patches/patch-doc_man1_notmuch-dump_rst N ports/mail/notmuch/notmuch/patches/patch-util_zlib-extra_c N ports/mail/notmuch/notmuch/patches/patch-test_T360-symbol-hiding_sh N ports/mail/notmuch/notmuch/patches/patch-test_test-lib-OPENBSD_sh N ports/mail/notmuch/notmuch/patches/patch-test_test-lib_sh N ports/mail/notmuch/notmuch/patches/patch-test_T240-dump-restore_sh N ports/mail/notmuch/notmuch/patches/patch-test_T530-upgrade_sh N ports/mail/notmuch/notmuch/patches/patch-notmuch-new_c N ports/mail/notmuch/notmuch/patches/patch-test_T355-smime_sh N ports/mail/notmuch/notmuch/patches/patch-doc_Makefile_local N ports/mail/notmuch/notmuch/pkg/DESCR-emacs N ports/mail/notmuch/notmuch/pkg/DESCR-main N ports/mail/notmuch/notmuch/pkg/PLIST-emacs N ports/mail/notmuch/notmuch/pkg/PLIST-main N ports/mail/notmuch/py-notmuch/Makefile N ports/mail/notmuch/py-notmuch/distinfo N ports/mail/notmuch/py-notmuch/patches/patch-bindings_python_notmuch_globals_py N ports/mail/notmuch/py-notmuch/pkg/DESCR N ports/mail/notmuch/py-notmuch/pkg/PLIST No conflicts created by this import
Re: CVS: cvs.openbsd.org: ports
On 2020/05/15 11:14, Pavel Korovin wrote:
> On 05/15, Antoine Jacoutot wrote:
> > That's not the MASTER_SITES this port uses:
> > https://github.com/go-gitea/gitea/archive/v1.11.5/
> > Upstream provides tarballs, why not use them and set MASTER_SITES to
> > https://github.com/go-gitea/gitea/releases/download/v1.11.5/
>
> Fixed, thank you!
>
> --
> With best regards,
> Pavel Korovin
>
oh, this is not quite right, GH_* should just be used for the /archive/ URLs,
like this... but I don't know how to work that into the go.port.mk mess
Index: Makefile
===
RCS file: /cvs/ports/www/gitea/Makefile,v
retrieving revision 1.36
diff -u -p -r1.36 Makefile
--- Makefile15 May 2020 08:13:10 - 1.36
+++ Makefile15 May 2020 08:47:49 -
@@ -3,13 +3,10 @@
COMMENT = compact self-hosted Git service
VERSION = 1.11.5
-GH_ACCOUNT = go-gitea
-GH_PROJECT = gitea
-GH_TAGNAME = v${VERSION}
+DISTNAME = gitea-src-${VERSION}
+PKGNAME = gitea-${VERSION}
-MASTER_SITES =
https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/${GH_TAGNAME}/
-
-DISTFILES =${GH_PROJECT}-src-${VERSION}${EXTRACT_SUFX}
+MASTER_SITES =
https://github.com/go-gitea/gitea/releases/download/v${VERSION}/
CATEGORIES = www devel
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: de...@cvs.openbsd.org 2020/05/15 02:19:21 Modified files: graphics : Makefile Log message: Add libvips to the build
Re: CVS: cvs.openbsd.org: ports
On 05/15, Antoine Jacoutot wrote: > That's not the MASTER_SITES this port uses: > https://github.com/go-gitea/gitea/archive/v1.11.5/ > Upstream provides tarballs, why not use them and set MASTER_SITES to > https://github.com/go-gitea/gitea/releases/download/v1.11.5/ Fixed, thank you! -- With best regards, Pavel Korovin
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: p...@cvs.openbsd.org2020/05/15 02:13:10 Modified files: www/gitea : Makefile Log message: Fix MASTER_SITES thanks ajacoutot@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2020/05/15 02:09:27 Modified files: databases/py-mysqlclient: Makefile Log message: remove stale comment, py-django was removed a little while ago
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2020/05/15 02:07:55 Modified files: x11/polybar: Makefile distinfo Log message: update to polybar-3.4.3
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: de...@cvs.openbsd.org 2020/05/15 01:58:41 Log message: Import libvips-8.9.2 libvips is a demand-driven, horizontally threaded image processing library. Compared to similar libraries, libvips runs quickly and uses little memory. https://libvips.github.io/libvips/ Provided by Stephane Guedon ok sthen@ Status: Vendor Tag: denis Release Tags: denis_20200515 N ports/graphics/libvips/distinfo N ports/graphics/libvips/Makefile N ports/graphics/libvips/pkg/DESCR N ports/graphics/libvips/pkg/PLIST No conflicts created by this import
Re: CVS: cvs.openbsd.org: ports
On Fri, May 15, 2020 at 10:24:22AM +0300, Pavel Korovin wrote: > I think this is GitHub-related issue. > The distfile should be OK since the gitea team started to provide SHA256 > checksum for src tarball and it matches the port checksum. > I'm trying to refetch the disfile with dbp to check the difference, but unable > to refetch since yesterday. > > $ cat /usr/ports/www/gitea/distinfo > SHA256 (gitea-src-1.11.5.tar.gz) = > SXXUTSN/4VSIzpI5ZBwjUX8VbeXOQIHvJpFLPsrjHUc= > SIZE (gitea-src-1.11.5.tar.gz) = 68923871 > > $ ls -al /usr/ports/distfiles/gitea-src-1.11.5.tar.gz > -rw-r--r-- 1 root _pfetch 68923871 May 15 02:19 > /usr/ports/distfiles/gitea-src-1.11.5.tar.gz > > $ sha256 gitea-src-1.11.5.tar.gz > SHA256 (gitea-src-1.11.5.tar.gz) = > 4975d44d237fe15488ce9239641c23517f156de5ce4081ef26914b3ecae31d47 > > # CHECKSUM from > https://github.com/go-gitea/gitea/releases/download/v1.11.5/gitea-src-1.11.5.tar.gz.sha256 That's not the MASTER_SITES this port uses: https://github.com/go-gitea/gitea/archive/v1.11.5/ Upstream provides tarballs, why not use them and set MASTER_SITES to https://github.com/go-gitea/gitea/releases/download/v1.11.5/ > > On 05/15, Antoine Jacoutot wrote: > > On Thu, May 14, 2020 at 09:19:32AM -0600, Pavel Korovin wrote: > > > CVSROOT: /cvs > > > Module name: ports > > > Changes by: p...@cvs.openbsd.org2020/05/14 09:19:32 > > > > > > Modified files: > > > www/gitea : Makefile distinfo > > > > > > Log message: > > > Update gitea 1.11.4 -> 1.11.5 > > > Changelog: https://github.com/go-gitea/gitea/blob/master/CHANGELOG.md > > > > $ make fetch > > ===> Checking files for gitea-1.11.5 > > >> Fetch > > >> https://github.com/go-gitea/gitea/archive/v1.11.5/gitea-src-1.11.5.tar.gz > > >> Size does not match for gitea-src-1.11.5.tar.gz > > > > -- > > Antoine > > -- > With best regards, > Pavel Korovin -- Antoine
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/05/15 01:26:41 Modified files: emulators/qemu : Makefile distinfo emulators/qemu/patches: patch-audio_audio_c patch-audio_audio_template_h patch-configure patch-qapi_audio_json patch-tcg_ppc_tcg-target_inc_c emulators/qemu/pkg: PLIST Added files: emulators/qemu/patches: patch-docs_conf_py patch-qemu-options_hx Removed files: emulators/qemu/patches: patch-qemu-doc_texi Log message: SECURITY update to qemu-5.0.0 (CVE-2020-1983). from Brad (maintainer)
Re: CVS: cvs.openbsd.org: ports
I think this is GitHub-related issue. The distfile should be OK since the gitea team started to provide SHA256 checksum for src tarball and it matches the port checksum. I'm trying to refetch the disfile with dbp to check the difference, but unable to refetch since yesterday. $ cat /usr/ports/www/gitea/distinfo SHA256 (gitea-src-1.11.5.tar.gz) = SXXUTSN/4VSIzpI5ZBwjUX8VbeXOQIHvJpFLPsrjHUc= SIZE (gitea-src-1.11.5.tar.gz) = 68923871 $ ls -al /usr/ports/distfiles/gitea-src-1.11.5.tar.gz -rw-r--r-- 1 root _pfetch 68923871 May 15 02:19 /usr/ports/distfiles/gitea-src-1.11.5.tar.gz $ sha256 gitea-src-1.11.5.tar.gz SHA256 (gitea-src-1.11.5.tar.gz) = 4975d44d237fe15488ce9239641c23517f156de5ce4081ef26914b3ecae31d47 # CHECKSUM from https://github.com/go-gitea/gitea/releases/download/v1.11.5/gitea-src-1.11.5.tar.gz.sha256 $ cat gitea-src-1.11.5.tar.gz.sha256 4975d44d237fe15488ce9239641c23517f156de5ce4081ef26914b3ecae31d47 gitea-src-1.11.5.tar.gz On 05/15, Antoine Jacoutot wrote: > On Thu, May 14, 2020 at 09:19:32AM -0600, Pavel Korovin wrote: > > CVSROOT:/cvs > > Module name:ports > > Changes by: p...@cvs.openbsd.org2020/05/14 09:19:32 > > > > Modified files: > > www/gitea : Makefile distinfo > > > > Log message: > > Update gitea 1.11.4 -> 1.11.5 > > Changelog: https://github.com/go-gitea/gitea/blob/master/CHANGELOG.md > > $ make fetch > ===> Checking files for gitea-1.11.5 > >> Fetch > >> https://github.com/go-gitea/gitea/archive/v1.11.5/gitea-src-1.11.5.tar.gz > >> Size does not match for gitea-src-1.11.5.tar.gz > > -- > Antoine -- With best regards, Pavel Korovin
Re: CVS: cvs.openbsd.org: ports
On Thu, May 14, 2020 at 06:19:48AM -0600, Frederic Cambus wrote: > CVSROOT: /cvs > Module name: ports > Changes by: fcam...@cvs.openbsd.org 2020/05/14 06:19:48 > > Modified files: > audio/adplug : Makefile distinfo > audio/adplug/patches: patch-Makefile_in > patch-adplugdb_adplugdb_cpp > audio/adplug/pkg: PLIST > Removed files: > audio/adplug/patches: patch-src_herad_cpp patch-src_herad_h > > Log message: > Update adplug to 2.3.2. This broke audio/adplay ===> adplay-1.8p1 depends on: bzip2-* -> bzip2-1.0.8 ===> adplay-1.8p1 depends on: adplug-* -> adplug-2.3.2 ===> adplay-1.8p1 depends on: libbinio-* -> libbinio-1.5 ===> adplay-1.8p1 depends on: sdl2-* -> sdl2-2.0.12 ===> Verifying specs: c++ c++abi pthread SDL2 adplug binio c m samplerate sndio usbhid ===> found c++.4.0 c++abi.2.1 pthread.26.1 SDL2.0.8 adplug.2.0 binio.0.0 c.96.0 m.10.1 samplerate.2.1 sndio.7.1 usbhid.7.0 ===> Checking files for adplay-1.8p1 `/hack/cvs/ports/distfiles/adplay-1.8.tar.bz2' is up to date. >> (SHA256) adplay-1.8.tar.bz2: OK ===> Extracting for adplay-1.8p1 ===> Patching for adplay-1.8p1 ===> Applying OpenBSD patch patch-configure Hmm... Looks like a unified diff to me... The text leading up to this was: -- |$OpenBSD: patch-configure,v 1.1 2018/04/26 10:16:46 fcambus Exp $ | |Stop hardcoding -lstdc++. | |Index: configure |--- configure.orig |+++ configure -- Patching file configure using Plan A... Hunk #1 succeeded at 17017. done rm /hack/objdirs/pobj/adplay-1.8/adplay-1.8/src/getopt.h ===> Compiler link: clang -> /usr/bin/clang ===> Compiler link: clang++ -> /usr/bin/clang++ ===> Compiler link: cc -> /usr/bin/cc ===> Compiler link: c++ -> /usr/bin/c++ ===> Generating configure for adplay-1.8p1 ===> Configuring for adplay-1.8p1 Using /hack/objdirs/pobj/adplay-1.8/config.site (generated) configure: WARNING: unrecognized options: --disable-gtk-doc configure: loading site script /hack/objdirs/pobj/adplay-1.8/config.site checking build system type... x86_64-unknown-openbsd6.7 checking host system type... x86_64-unknown-openbsd6.7 checking target system type... x86_64-unknown-openbsd6.7 checking for a BSD-compatible install... /hack/objdirs/pobj/adplay-1.8/bin/install -c checking whether build environment is sane... yes checking for a thread-safe mkdir -p... mkdir -p checking for gawk... (cached) awk checking whether make sets $(MAKE)... (cached) yes checking whether make supports nested variables... yes checking how to print strings... print -r checking for style of include used by make... GNU checking for gcc... cc checking whether the C compiler works... yes checking for C compiler default output file name... a.out checking for suffix of executables... checking whether we are cross compiling... no checking for suffix of object files... (cached) o checking whether we are using the GNU C compiler... (cached) yes checking whether cc accepts -g... (cached) yes checking for cc option to accept ISO C89... none needed checking whether cc understands -c and -o together... yes checking dependency style of cc... gcc3 checking for a sed that does not truncate output... (cached) /usr/bin/sed checking for grep that handles long lines and -e... (cached) /usr/bin/grep checking for egrep... (cached) /usr/bin/egrep checking for fgrep... (cached) /usr/bin/fgrep checking for ld used by cc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B checking the name lister (/usr/bin/nm -B) interface... BSD nm checking whether ln -s works... yes checking the maximum length of command line arguments... (cached) 131072 checking how to convert x86_64-unknown-openbsd6.7 file names to x86_64-unknown-openbsd6.7 format... func_convert_file_noop checking how to convert x86_64-unknown-openbsd6.7 file names to toolchain format... func_convert_file_noop checking for /usr/bin/ld option to reload object files... -r checking for objdump... objdump checking how to recognize dependent libraries... match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$ checking for dlltool... no checking how to associate runtime and link libraries... print -r -- checking for ar... (cached) ar checking for archiver @FILE support... @ checking for strip... (cached) strip checking for ranlib... (cached) ranlib checking command to parse /usr/bin/nm -B output from cc object... ok checking for sysroot... no checking for a working dd... /bin/dd checking how to truncate binary pipes... /bin/dd bs=4096 count=1 checking for mt... mt checking if mt is a manifest tool... no checking how to run the C preprocessor... cc -E checking for ANSI C header files... (cached) yes checking for sys/types.h... (cached) yes checking for sys/stat.h... (cached) yes checking for stdlib.h... (cached) yes checking for string.h... (cached) yes checking for memory.h... (cached) yes checking
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ben...@cvs.openbsd.org 2020/05/15 00:56:35 Modified files: security/pdfcrack: Makefile distinfo Log message: Update to pdfcrack-0.19.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ben...@cvs.openbsd.org 2020/05/15 00:45:55 Modified files: textproc/highlight: Makefile distinfo textproc/highlight/pkg: PLIST Log message: Update to highlight-3.57.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/05/15 00:34:13 Modified files: net/ircd-hybrid: Makefile distinfo net/ircd-hybrid/patches: patch-doc_reference_conf patch-src_ircd_c net/ircd-hybrid/pkg: PLIST Log message: Update ircd-hybrid-8.2.31. from Brad
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/05/15 00:33:27 Modified files: graphics/libavif: Makefile distinfo Removed files: graphics/libavif/patches: patch-apps_avifdump_c patch-apps_avifenc_c patch-src_codec_aom_c Log message: Update to libavif-0.7.3. from Brad (maintainer)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/05/15 00:32:34 Modified files: x11/vlc: Makefile distinfo x11/vlc/patches: patch-configure_ac Log message: Update to vlc-3.0.10. from Brad (maintainer)
Re: CVS: cvs.openbsd.org: ports
Thank you!
On Fri, May 15, 2020 at 08:26:18AM +0200, Jasper Lievisse Adriaanse wrote:
> I missed this thread but I went ahead and removed the TDEP on py-msql for now
> as the
> least invasive workaround.
>
> Upstream’s latest release is from several years ago with a claim that python3
> support will
> be added in the future. It seems there’s a patch in the issue tracker to
> resolve the most
> glaring issues but I’d like to run that by the maintainer first.
>
> Cheers,
> Jasper
>
> > On 15 May 2020, at 08:12, Antoine Jacoutot wrote:
> >
> > On Fri, May 15, 2020 at 08:07:08AM +0200, Florian Obser wrote:
> >> On Fri, May 15, 2020 at 07:52:10AM +0200, Antoine Jacoutot wrote:
> >>> On Thu, May 14, 2020 at 10:47:28AM -0600, Florian Obser wrote:
> CVSROOT: /cvs
> Module name: ports
> Changes by: flor...@cvs.openbsd.org 2020/05/14 10:47:28
>
> Modified files:
> sysutils/salt : Makefile distinfo
> sysutils/salt/patches: patch-salt_modules_salt_proxy_py
> patch-salt_returners_zabbix_return_py
> sysutils/salt/pkg: PLIST
> Added files:
> sysutils/salt/patches: patch-requirements_crypto_txt
> patch-salt_utils_network_py
> Removed files:
> sysutils/salt/files: pf.py vmctl.py
> sysutils/salt/patches: patch-salt_master_py
> patch-salt_modules_openbsd_sysctl_py
> patch-salt_modules_openbsdpkg_py
> patch-salt_tokens_localfs_py
> patch-salt_utils_gitfs_py
> patch-salt_utils_verify_py
> patch-salt_wheel_config_py
> patch-salt_wheel_file_roots_py
>
> Log message:
> Update to salt stack 3000.3.
>
> All the heavy lifting for updating from 2018.3 to 3000.1 by robert.
> Trivial rebasing & updating to 3000.1 -> 3000.3 by me.
> "Please commit" robert
> OK robert, jasper
> >>>
> >>> This breaks databases/sqlports because databases/py-mysql,python3 does not
> >>> exist.
> >>> Please revert or add a python3 FLAVOR to databases/py-mysql.
> >>>
> >>> Thanks.
> >>>
> >>> --
> >>> Antoine
> >>
> >> Argh, sorry about that. I swear I will never ever commit to ports
> >> again (after fixing this).
> >>
> >> Now, I'm not entirely sure how to revert since the version number then
> >> moves backwards. Also I'm not sure about the right cvs incantation...
> >
> > Moving backwards would me increasing EPOCH (or set it to 0 in your case).
> >
> >> Anyway, since py-mysql is "only" used for tests, would this be an
> >> acceptable stop-gap?
> >
> > Sure, that's fine with me :-)
> > OK
> >
> >>
> >> diff --git Makefile Makefile
> >> index 8018247174c..02ec0e13596 100644
> >> --- Makefile
> >> +++ Makefile
> >> @@ -19,6 +19,7 @@ COMMENT =remote execution and
> >> configuration management system
> >>
> >> MODPY_EGG_VERSION =3000.3
> >> DISTNAME = salt-${MODPY_EGG_VERSION}
> >> +REVISION =0
> >>
> >> CATEGORIES = sysutils net devel
> >>
> >> @@ -57,19 +58,20 @@ RUN_DEPENDS +=
> >> devel/py-progressbar${MODPY_FLAVOR}
> >> RUN_DEPENDS += security/py-M2Crypto${MODPY_FLAVOR}
> >>
> >> # max openfiles, soft: 3072, hard: 4096; DBus system session running...
> >> -TEST_IS_INTERACTIVE = Yes
> >> -PORTHOME =${WRKDIST}
> >> -TEST_DEPENDS =databases/py-mysql${MODPY_FLAVOR} \
> >> - devel/git \
> >> - devel/py-gitpython${MODPY_FLAVOR} \
> >> - devel/py-pip${MODPY_FLAVOR} \
> >> - devel/py-six${MODPY_FLAVOR} \
> >> - devel/py-virtualenv${MODPY_FLAVOR} \
> >> - devel/subversion \
> >> - net/py-libcloud${MODPY_FLAVOR} \
> >> - net/rabbitmq \
> >> - sysutils/salt-testing \
> >> - www/py-CherryPy${MODPY_FLAVOR}
> >> +# XXX needs py-mysql python3 flavour
> >> +#TEST_IS_INTERACTIVE =Yes
> >> +#PORTHOME = ${WRKDIST}
> >> +#TEST_DEPENDS = databases/py-mysql${MODPY_FLAVOR} \
> >> +# devel/git \
> >> +# devel/py-gitpython${MODPY_FLAVOR} \
> >> +# devel/py-pip${MODPY_FLAVOR} \
> >> +# devel/py-six${MODPY_FLAVOR} \
> >> +# devel/py-virtualenv${MODPY_FLAVOR} \
> >> +# devel/subversion \
> >> +# net/py-libcloud${MODPY_FLAVOR} \
> >> +# net/rabbitmq \
> >> +# sysutils/salt-testing \
> >> +# www/py-CherryPy${MODPY_FLAVOR}
> >>
> >> pre-configure:
> >>${SUBST_CMD} ${WRKSRC}/salt/returners/zabbix_return.py
> >>
> >>
> >> --
> >> I'm not entirely sure you are real.
> >>
> >
> > --
> > Antoine
>
Re: CVS: cvs.openbsd.org: ports
I missed this thread but I went ahead and removed the TDEP on py-msql for now
as the
least invasive workaround.
Upstream’s latest release is from several years ago with a claim that python3
support will
be added in the future. It seems there’s a patch in the issue tracker to
resolve the most
glaring issues but I’d like to run that by the maintainer first.
Cheers,
Jasper
> On 15 May 2020, at 08:12, Antoine Jacoutot wrote:
>
> On Fri, May 15, 2020 at 08:07:08AM +0200, Florian Obser wrote:
>> On Fri, May 15, 2020 at 07:52:10AM +0200, Antoine Jacoutot wrote:
>>> On Thu, May 14, 2020 at 10:47:28AM -0600, Florian Obser wrote:
CVSROOT: /cvs
Module name: ports
Changes by:flor...@cvs.openbsd.org 2020/05/14 10:47:28
Modified files:
sysutils/salt : Makefile distinfo
sysutils/salt/patches: patch-salt_modules_salt_proxy_py
patch-salt_returners_zabbix_return_py
sysutils/salt/pkg: PLIST
Added files:
sysutils/salt/patches: patch-requirements_crypto_txt
patch-salt_utils_network_py
Removed files:
sysutils/salt/files: pf.py vmctl.py
sysutils/salt/patches: patch-salt_master_py
patch-salt_modules_openbsd_sysctl_py
patch-salt_modules_openbsdpkg_py
patch-salt_tokens_localfs_py
patch-salt_utils_gitfs_py
patch-salt_utils_verify_py
patch-salt_wheel_config_py
patch-salt_wheel_file_roots_py
Log message:
Update to salt stack 3000.3.
All the heavy lifting for updating from 2018.3 to 3000.1 by robert.
Trivial rebasing & updating to 3000.1 -> 3000.3 by me.
"Please commit" robert
OK robert, jasper
>>>
>>> This breaks databases/sqlports because databases/py-mysql,python3 does not
>>> exist.
>>> Please revert or add a python3 FLAVOR to databases/py-mysql.
>>>
>>> Thanks.
>>>
>>> --
>>> Antoine
>>
>> Argh, sorry about that. I swear I will never ever commit to ports
>> again (after fixing this).
>>
>> Now, I'm not entirely sure how to revert since the version number then
>> moves backwards. Also I'm not sure about the right cvs incantation...
>
> Moving backwards would me increasing EPOCH (or set it to 0 in your case).
>
>> Anyway, since py-mysql is "only" used for tests, would this be an
>> acceptable stop-gap?
>
> Sure, that's fine with me :-)
> OK
>
>>
>> diff --git Makefile Makefile
>> index 8018247174c..02ec0e13596 100644
>> --- Makefile
>> +++ Makefile
>> @@ -19,6 +19,7 @@ COMMENT = remote execution and configuration
>> management system
>>
>> MODPY_EGG_VERSION = 3000.3
>> DISTNAME = salt-${MODPY_EGG_VERSION}
>> +REVISION = 0
>>
>> CATEGORIES = sysutils net devel
>>
>> @@ -57,19 +58,20 @@ RUN_DEPENDS +=
>> devel/py-progressbar${MODPY_FLAVOR}
>> RUN_DEPENDS += security/py-M2Crypto${MODPY_FLAVOR}
>>
>> # max openfiles, soft: 3072, hard: 4096; DBus system session running...
>> -TEST_IS_INTERACTIVE = Yes
>> -PORTHOME = ${WRKDIST}
>> -TEST_DEPENDS = databases/py-mysql${MODPY_FLAVOR} \
>> -devel/git \
>> -devel/py-gitpython${MODPY_FLAVOR} \
>> -devel/py-pip${MODPY_FLAVOR} \
>> -devel/py-six${MODPY_FLAVOR} \
>> -devel/py-virtualenv${MODPY_FLAVOR} \
>> -devel/subversion \
>> -net/py-libcloud${MODPY_FLAVOR} \
>> -net/rabbitmq \
>> -sysutils/salt-testing \
>> -www/py-CherryPy${MODPY_FLAVOR}
>> +# XXX needs py-mysql python3 flavour
>> +#TEST_IS_INTERACTIVE = Yes
>> +#PORTHOME = ${WRKDIST}
>> +#TEST_DEPENDS = databases/py-mysql${MODPY_FLAVOR} \
>> +# devel/git \
>> +# devel/py-gitpython${MODPY_FLAVOR} \
>> +# devel/py-pip${MODPY_FLAVOR} \
>> +# devel/py-six${MODPY_FLAVOR} \
>> +# devel/py-virtualenv${MODPY_FLAVOR} \
>> +# devel/subversion \
>> +# net/py-libcloud${MODPY_FLAVOR} \
>> +# net/rabbitmq \
>> +# sysutils/salt-testing \
>> +# www/py-CherryPy${MODPY_FLAVOR}
>>
>> pre-configure:
>> ${SUBST_CMD} ${WRKSRC}/salt/returners/zabbix_return.py
>>
>>
>> --
>> I'm not entirely sure you are real.
>>
>
> --
> Antoine
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2020/05/15 00:22:55 Modified files: sysutils/salt-testing: Makefile distinfo sysutils/salt-testing/pkg: PLIST Log message: - update to a recent git version - switch to python3
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2020/05/15 00:18:31 Modified files: sysutils/salt : Makefile Log message: remove py-mysql from TEST_DEPENDS since the version we have in tree doesn't support python3 and upstream claims it will be added in a future release. for now, unbreak sqlports
Re: CVS: cvs.openbsd.org: ports
On Fri, May 15, 2020 at 08:07:08AM +0200, Florian Obser wrote:
> On Fri, May 15, 2020 at 07:52:10AM +0200, Antoine Jacoutot wrote:
> > On Thu, May 14, 2020 at 10:47:28AM -0600, Florian Obser wrote:
> > > CVSROOT: /cvs
> > > Module name: ports
> > > Changes by: flor...@cvs.openbsd.org 2020/05/14 10:47:28
> > >
> > > Modified files:
> > > sysutils/salt : Makefile distinfo
> > > sysutils/salt/patches: patch-salt_modules_salt_proxy_py
> > > patch-salt_returners_zabbix_return_py
> > > sysutils/salt/pkg: PLIST
> > > Added files:
> > > sysutils/salt/patches: patch-requirements_crypto_txt
> > > patch-salt_utils_network_py
> > > Removed files:
> > > sysutils/salt/files: pf.py vmctl.py
> > > sysutils/salt/patches: patch-salt_master_py
> > > patch-salt_modules_openbsd_sysctl_py
> > > patch-salt_modules_openbsdpkg_py
> > > patch-salt_tokens_localfs_py
> > > patch-salt_utils_gitfs_py
> > > patch-salt_utils_verify_py
> > > patch-salt_wheel_config_py
> > > patch-salt_wheel_file_roots_py
> > >
> > > Log message:
> > > Update to salt stack 3000.3.
> > >
> > > All the heavy lifting for updating from 2018.3 to 3000.1 by robert.
> > > Trivial rebasing & updating to 3000.1 -> 3000.3 by me.
> > > "Please commit" robert
> > > OK robert, jasper
> >
> > This breaks databases/sqlports because databases/py-mysql,python3 does not
> > exist.
> > Please revert or add a python3 FLAVOR to databases/py-mysql.
> >
> > Thanks.
> >
> > --
> > Antoine
>
> Argh, sorry about that. I swear I will never ever commit to ports
> again (after fixing this).
>
> Now, I'm not entirely sure how to revert since the version number then
> moves backwards. Also I'm not sure about the right cvs incantation...
Moving backwards would me increasing EPOCH (or set it to 0 in your case).
> Anyway, since py-mysql is "only" used for tests, would this be an
> acceptable stop-gap?
Sure, that's fine with me :-)
OK
>
> diff --git Makefile Makefile
> index 8018247174c..02ec0e13596 100644
> --- Makefile
> +++ Makefile
> @@ -19,6 +19,7 @@ COMMENT = remote execution and configuration
> management system
>
> MODPY_EGG_VERSION = 3000.3
> DISTNAME = salt-${MODPY_EGG_VERSION}
> +REVISION = 0
>
> CATEGORIES = sysutils net devel
>
> @@ -57,19 +58,20 @@ RUN_DEPENDS +=
> devel/py-progressbar${MODPY_FLAVOR}
> RUN_DEPENDS += security/py-M2Crypto${MODPY_FLAVOR}
>
> # max openfiles, soft: 3072, hard: 4096; DBus system session running...
> -TEST_IS_INTERACTIVE =Yes
> -PORTHOME = ${WRKDIST}
> -TEST_DEPENDS = databases/py-mysql${MODPY_FLAVOR} \
> - devel/git \
> - devel/py-gitpython${MODPY_FLAVOR} \
> - devel/py-pip${MODPY_FLAVOR} \
> - devel/py-six${MODPY_FLAVOR} \
> - devel/py-virtualenv${MODPY_FLAVOR} \
> - devel/subversion \
> - net/py-libcloud${MODPY_FLAVOR} \
> - net/rabbitmq \
> - sysutils/salt-testing \
> - www/py-CherryPy${MODPY_FLAVOR}
> +# XXX needs py-mysql python3 flavour
> +#TEST_IS_INTERACTIVE = Yes
> +#PORTHOME = ${WRKDIST}
> +#TEST_DEPENDS = databases/py-mysql${MODPY_FLAVOR} \
> +#devel/git \
> +#devel/py-gitpython${MODPY_FLAVOR} \
> +#devel/py-pip${MODPY_FLAVOR} \
> +#devel/py-six${MODPY_FLAVOR} \
> +#devel/py-virtualenv${MODPY_FLAVOR} \
> +#devel/subversion \
> +#net/py-libcloud${MODPY_FLAVOR} \
> +#net/rabbitmq \
> +#sysutils/salt-testing \
> +#www/py-CherryPy${MODPY_FLAVOR}
>
> pre-configure:
> ${SUBST_CMD} ${WRKSRC}/salt/returners/zabbix_return.py
>
>
> --
> I'm not entirely sure you are real.
>
--
Antoine
Re: CVS: cvs.openbsd.org: ports
On Fri, May 15, 2020 at 07:52:10AM +0200, Antoine Jacoutot wrote:
> On Thu, May 14, 2020 at 10:47:28AM -0600, Florian Obser wrote:
> > CVSROOT:/cvs
> > Module name:ports
> > Changes by: flor...@cvs.openbsd.org 2020/05/14 10:47:28
> >
> > Modified files:
> > sysutils/salt : Makefile distinfo
> > sysutils/salt/patches: patch-salt_modules_salt_proxy_py
> >patch-salt_returners_zabbix_return_py
> > sysutils/salt/pkg: PLIST
> > Added files:
> > sysutils/salt/patches: patch-requirements_crypto_txt
> >patch-salt_utils_network_py
> > Removed files:
> > sysutils/salt/files: pf.py vmctl.py
> > sysutils/salt/patches: patch-salt_master_py
> >patch-salt_modules_openbsd_sysctl_py
> >patch-salt_modules_openbsdpkg_py
> >patch-salt_tokens_localfs_py
> >patch-salt_utils_gitfs_py
> >patch-salt_utils_verify_py
> >patch-salt_wheel_config_py
> >patch-salt_wheel_file_roots_py
> >
> > Log message:
> > Update to salt stack 3000.3.
> >
> > All the heavy lifting for updating from 2018.3 to 3000.1 by robert.
> > Trivial rebasing & updating to 3000.1 -> 3000.3 by me.
> > "Please commit" robert
> > OK robert, jasper
>
> This breaks databases/sqlports because databases/py-mysql,python3 does not
> exist.
> Please revert or add a python3 FLAVOR to databases/py-mysql.
>
> Thanks.
>
> --
> Antoine
Argh, sorry about that. I swear I will never ever commit to ports
again (after fixing this).
Now, I'm not entirely sure how to revert since the version number then
moves backwards. Also I'm not sure about the right cvs incantation...
Anyway, since py-mysql is "only" used for tests, would this be an
acceptable stop-gap?
diff --git Makefile Makefile
index 8018247174c..02ec0e13596 100644
--- Makefile
+++ Makefile
@@ -19,6 +19,7 @@ COMMENT = remote execution and configuration
management system
MODPY_EGG_VERSION =3000.3
DISTNAME = salt-${MODPY_EGG_VERSION}
+REVISION = 0
CATEGORIES = sysutils net devel
@@ -57,19 +58,20 @@ RUN_DEPENDS +=
devel/py-progressbar${MODPY_FLAVOR}
RUN_DEPENDS += security/py-M2Crypto${MODPY_FLAVOR}
# max openfiles, soft: 3072, hard: 4096; DBus system session running...
-TEST_IS_INTERACTIVE = Yes
-PORTHOME = ${WRKDIST}
-TEST_DEPENDS = databases/py-mysql${MODPY_FLAVOR} \
- devel/git \
- devel/py-gitpython${MODPY_FLAVOR} \
- devel/py-pip${MODPY_FLAVOR} \
- devel/py-six${MODPY_FLAVOR} \
- devel/py-virtualenv${MODPY_FLAVOR} \
- devel/subversion \
- net/py-libcloud${MODPY_FLAVOR} \
- net/rabbitmq \
- sysutils/salt-testing \
- www/py-CherryPy${MODPY_FLAVOR}
+# XXX needs py-mysql python3 flavour
+#TEST_IS_INTERACTIVE = Yes
+#PORTHOME =${WRKDIST}
+#TEST_DEPENDS =databases/py-mysql${MODPY_FLAVOR} \
+# devel/git \
+# devel/py-gitpython${MODPY_FLAVOR} \
+# devel/py-pip${MODPY_FLAVOR} \
+# devel/py-six${MODPY_FLAVOR} \
+# devel/py-virtualenv${MODPY_FLAVOR} \
+# devel/subversion \
+# net/py-libcloud${MODPY_FLAVOR} \
+# net/rabbitmq \
+# sysutils/salt-testing \
+# www/py-CherryPy${MODPY_FLAVOR}
pre-configure:
${SUBST_CMD} ${WRKSRC}/salt/returners/zabbix_return.py
--
I'm not entirely sure you are real.
