Re: [maintainer update] remind 3.3.9 -> 3.3.10
On Tue Nov 30, 2021 at 04:03:16PM +0100, Martin Ziemer wrote: > This patch updates remind from 3.3.9 to 3.3.10. > > Tested on two amd64 systems. (One with and one without tkremind) Committed, thanks > > Index: Makefile > === > RCS file: /cvs/ports/misc/remind/Makefile,v > retrieving revision 1.48 > diff -u -p -r1.48 Makefile > --- Makefile 15 Oct 2021 10:50:31 - 1.48 > +++ Makefile 30 Nov 2021 15:00:40 - > @@ -2,8 +2,8 @@ > > COMMENT= scripting language for reminders, with a Tk front end > > -DISTNAME=remind-03.03.09 > -PKGNAME= remind-3.3.9 > +DISTNAME=remind-03.03.10 > +PKGNAME= remind-3.3.10 > > CATEGORIES= misc > > Index: distinfo > === > RCS file: /cvs/ports/misc/remind/distinfo,v > retrieving revision 1.20 > diff -u -p -r1.20 distinfo > --- distinfo 15 Oct 2021 10:50:31 - 1.20 > +++ distinfo 30 Nov 2021 15:00:40 - > @@ -1,2 +1,2 @@ > -SHA256 (remind-03.03.09.tar.gz) = > yQh6jGkRNkQvPoguRmd6025pCEsvO7w8W3YNO2vztvM= > -SIZE (remind-03.03.09.tar.gz) = 408928 > +SHA256 (remind-03.03.10.tar.gz) = > BqFt3f4+hfz4njzOI1mkrUJhR7zOqzT/TNWS+sk2XEc= > +SIZE (remind-03.03.10.tar.gz) = 420644 >
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2021/12/05 00:44:27 Modified files: misc/remind: Makefile distinfo Log message: Updates remind from 3.3.9 to 3.3.10 While here, zap some spaces >From Martin Ziemer (maintainer)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2021/12/05 00:35:30 Modified files: devel/jenkins/devel: Makefile distinfo Log message: Update jenkins to 2.232
UPDATE: devel/netbeans
Update NetBeans to 12.6
diff --git a/devel/netbeans/Makefile b/devel/netbeans/Makefile
index 15d40d4229a..bac4745f3f0 100644
--- a/devel/netbeans/Makefile
+++ b/devel/netbeans/Makefile
@@ -2,7 +2,7 @@
COMMENT= NetBeans Java IDE
-V= 12.5
+V= 12.6
DISTNAME= netbeans-${V}-bin
PKGNAME= netbeans-${V}
CATEGORIES=devel
@@ -17,9 +17,12 @@ PERMIT_PACKAGE= Yes
MASTER_SITES= ${MASTER_SITE_APACHE:=netbeans/netbeans/${V}/}
EXTRACT_SUFX= .zip
-MODULES= java
+MODULES= java \
+ lang/python
MODJAVA_VER= 1.8+
+MODPY_RUNDEP = No
+
RUN_DEPENDS= java/javaPathHelper \
devel/desktop-file-utils
@@ -48,4 +51,8 @@ do-install:
@${SUBST_DATA} ${FILESDIR}/netbeans.desktop \
${PREFIX}/share/applications/netbeans.desktop
+post-install:
+ ${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py \
+ ${PREFIX}/netbeans/extide/ant/bin/runant.py
+
.include
diff --git a/devel/netbeans/distinfo b/devel/netbeans/distinfo
index c14038e00c8..0b2bf8f9d22 100644
--- a/devel/netbeans/distinfo
+++ b/devel/netbeans/distinfo
@@ -1,2 +1,2 @@
-SHA256 (netbeans-12.5-bin.zip) = N8Ie9k+ElzPPYGufK8283bzGkZ3TsoH9janj4iTYNnk=
-SIZE (netbeans-12.5-bin.zip) = 431298129
+SHA256 (netbeans-12.6-bin.zip) = leo/iquVTuROaO4vKogo5G+R/ahu+pMSsRhudzari0k=
+SIZE (netbeans-12.6-bin.zip) = 432790335
diff --git a/devel/netbeans/pkg/PLIST b/devel/netbeans/pkg/PLIST
index c3356555242..6143b57c532 100644
--- a/devel/netbeans/pkg/PLIST
+++ b/devel/netbeans/pkg/PLIST
@@ -795,6 +795,8 @@ netbeans/extide/
netbeans/extide/VERSION.txt
netbeans/extide/ant/
netbeans/extide/ant/bin/
+${MODPY_COMMENT}netbeans/extide/ant/bin/${MODPY_PYCACHE}/
+netbeans/extide/ant/bin/${MODPY_PYCACHE}runant.${MODPY_PYC_MAGIC_TAG}pyc
netbeans/extide/ant/bin/ant
netbeans/extide/ant/bin/antRun
netbeans/extide/ant/bin/antRun.pl
@@ -1148,6 +1150,7 @@
netbeans/ide/config/Modules/org-netbeans-libs-json_simple.xml
netbeans/ide/config/Modules/org-netbeans-libs-jvyamlb.xml
netbeans/ide/config/Modules/org-netbeans-libs-lucene.xml
netbeans/ide/config/Modules/org-netbeans-libs-smack.xml
+netbeans/ide/config/Modules/org-netbeans-libs-snakeyaml_engine.xml
netbeans/ide/config/Modules/org-netbeans-libs-svnClientAdapter-javahl.xml
netbeans/ide/config/Modules/org-netbeans-libs-svnClientAdapter.xml
netbeans/ide/config/Modules/org-netbeans-libs-truffleapi.xml
@@ -1444,6 +1447,7 @@ netbeans/ide/modules/ext/salvation.jar
netbeans/ide/modules/ext/servlet-2.2.jar
netbeans/ide/modules/ext/smack.jar
netbeans/ide/modules/ext/smackx.jar
+netbeans/ide/modules/ext/snakeyaml-engine.jar
netbeans/ide/modules/ext/svnClientAdapter-javahl.jar
netbeans/ide/modules/ext/svnClientAdapter-main.jar
netbeans/ide/modules/ext/svnjavahl.jar
@@ -1507,6 +1511,7 @@ netbeans/ide/modules/org-netbeans-libs-json_simple.jar
netbeans/ide/modules/org-netbeans-libs-jvyamlb.jar
netbeans/ide/modules/org-netbeans-libs-lucene.jar
netbeans/ide/modules/org-netbeans-libs-smack.jar
+netbeans/ide/modules/org-netbeans-libs-snakeyaml_engine.jar
netbeans/ide/modules/org-netbeans-libs-svnClientAdapter-javahl.jar
netbeans/ide/modules/org-netbeans-libs-svnClientAdapter.jar
netbeans/ide/modules/org-netbeans-libs-truffleapi.jar
@@ -1774,6 +1779,7 @@
netbeans/ide/update_tracking/org-netbeans-libs-json_simple.xml
netbeans/ide/update_tracking/org-netbeans-libs-jvyamlb.xml
netbeans/ide/update_tracking/org-netbeans-libs-lucene.xml
netbeans/ide/update_tracking/org-netbeans-libs-smack.xml
+netbeans/ide/update_tracking/org-netbeans-libs-snakeyaml_engine.xml
netbeans/ide/update_tracking/org-netbeans-libs-svnClientAdapter-javahl.xml
netbeans/ide/update_tracking/org-netbeans-libs-svnClientAdapter.xml
netbeans/ide/update_tracking/org-netbeans-libs-truffleapi.xml
@@ -2260,13 +2266,13 @@ netbeans/java/modules/ext/docs/
netbeans/java/modules/ext/docs/javax.persistence-2.2.1-doc.zip
netbeans/java/modules/ext/eclipselink/
netbeans/java/modules/ext/eclipselink/javax.persistence-2.2.1.jar
-netbeans/java/modules/ext/eclipselink/org.eclipse.persistence.antlr-2.7.7.jar
-netbeans/java/modules/ext/eclipselink/org.eclipse.persistence.asm-2.7.7.jar
-netbeans/java/modules/ext/eclipselink/org.eclipse.persistence.core-2.7.7.jar
-netbeans/java/modules/ext/eclipselink/org.eclipse.persistence.jpa-2.7.7.jar
-netbeans/java/modules/ext/eclipselink/org.eclipse.persistence.jpa.jpql-2.7.7.jar
-netbeans/java/modules/ext/eclipselink/org.eclipse.persistence.jpa.modelgen.processor-2.7.7.jar
-netbeans/java/modules/ext/eclipselink/org.eclipse.persistence.moxy-2.7.7.jar
+netbeans/java/modules/ext/eclipselink/org.eclipse.persistence.antlr-2.7.9.jar
+netbeans/java/modules/ext/eclipselink/org.eclipse.persistence.asm-9.1.0.jar
+netbeans/java/modules/ext/eclipselink/org.eclipse.persistence.core-2.7.9.jar
UPDATE: devel/kdiff3
Update kdiff3 to 1.9.4 diff --git a/devel/kdiff3/Makefile b/devel/kdiff3/Makefile index 15e05de6a67..75e710975d0 100644 --- a/devel/kdiff3/Makefile +++ b/devel/kdiff3/Makefile @@ -2,7 +2,7 @@ COMMENT = compares and merges multiple files or directories -DISTNAME = kdiff3-1.9.3 +DISTNAME = kdiff3-1.9.4 CATEGORIES = devel @@ -22,7 +22,7 @@ WANTLIB += KF5Crash KF5I18n KF5JobWidgets KF5KIOCore KF5KIOGui WANTLIB += KF5KIOWidgets KF5Parts KF5Service KF5Solid KF5SonnetUi WANTLIB += KF5TextWidgets KF5WidgetsAddons KF5WindowSystem KF5XmlGui WANTLIB += Qt5Concurrent Qt5Core Qt5DBus Qt5Gui Qt5Network Qt5PrintSupport -WANTLIB += Qt5Widgets Qt5Xml c m +WANTLIB += Qt5Widgets Qt5Xml X11 c m MODULES = devel/kf5 diff --git a/devel/kdiff3/distinfo b/devel/kdiff3/distinfo index 0e425d53288..190f9452a7b 100644 --- a/devel/kdiff3/distinfo +++ b/devel/kdiff3/distinfo @@ -1,2 +1,2 @@ -SHA256 (kdiff3-1.9.3.tar.xz) = MXv1x+J8uoG85+GnpXkQVEMTO2M8u3G8HxaehqI1r5w= -SIZE (kdiff3-1.9.3.tar.xz) = 1056920 +SHA256 (kdiff3-1.9.4.tar.xz) = oTBxLO7wdN9pFCaQn8SjMrZvTD8UkKVIq1v7RjFsOFo= +SIZE (kdiff3-1.9.4.tar.xz) = 1057404
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2021/12/05 00:12:22 Modified files: x11/kde-plasma : Makefile.inc x11/kde-plasma/breeze: distinfo x11/kde-plasma/breeze-grub: distinfo x11/kde-plasma/breeze-gtk: distinfo x11/kde-plasma/kdecoration: distinfo x11/kde-plasma/oxygen: Makefile distinfo Log message: Update KDE Plasma to 5.23.4, Bugfix update https://kde.org/announcements/changelogs/plasma/5/5.23.3-5.23.4/
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2021/12/04 23:53:59 Modified files: devel/clang-tools-extra: Makefile Log message: Adjust licence comment, LLVM is no longer pure BSD >From Brad
[PATCH] Upgrade devel/cabal-install to 3.6.2.0
I rebuilt the downstream dependencies, so I feel this should be a safe
update.
OK?
>From 2a7f941776071389212cf350165fe5c235d0b160 Mon Sep 17 00:00:00 2001
From: Greg Steuck
Date: Sat, 4 Dec 2021 20:29:56 -0800
Subject: [PATCH] Upgrade devel/cabal-install to 3.6.2.0
The goal is to have an easier time with future lang/ghc upgrades.
The openbsd.json file was regenerated by following cabal
bootstrap/README.md. The Makefile was then updated manually.
---
devel/cabal-install/Makefile | 50 +++--
devel/cabal-install/distinfo | 144 +++---
devel/cabal-install/files/openbsd.json | 250 +
3 files changed, 224 insertions(+), 220 deletions(-)
diff --git a/devel/cabal-install/Makefile b/devel/cabal-install/Makefile
index a8144225626..819495df461 100644
--- a/devel/cabal-install/Makefile
+++ b/devel/cabal-install/Makefile
@@ -2,12 +2,10 @@
COMMENT = command-line interface for Cabal and Hackage
-DISTNAME = cabal-install-3.4.0.0
+DISTNAME = cabal-install-3.6.2.0
CATEGORIES = devel
-REVISION = 3
-
GH_ACCOUNT = haskell
-GH_TAGNAME = ${DISTNAME}
+GH_TAGNAME = Cabal-v3.6.2.0
GH_PROJECT = cabal
HOMEPAGE = https://github.com/haskell/cabal
@@ -33,38 +31,36 @@ DISTFILES = ${EXTRACT_ONLY}
DIST_SUBDIR = hackage
MASTER_SITES0 =https://hackage.haskell.org/package/
-# Produced by:
-# cabal v2-run -w /usr/local/bin/ghc exe:cabal-bundler -- \
-# --openbsd cabal -w /usr/local/bin/ghc -p
cabal/dist-newstyle/cache/plan.json
+# Produced by manually copying values out of files/openbsd.json.
_MANIFEST = \
- HTTP4000.3.15 2 \
- async 2.2.2 1 \
- base16-bytestring 0.1.1.7 3 \
- base64-bytestring 1.2.0.1 0 \
- cryptohash-sha256 0.11.101.0 4 \
- echo0.1.3 1 \
+ HTTP4000.3.16 1 \
+ async 2.2.4 1 \
+ base16-bytestring 1.0.2.0 0 \
+ base64-bytestring 1.2.1.0 0 \
+ cryptohash-sha256 0.11.102.1 0\
+ echo0.1.4 0 \
ed25519 0.0.5.0 3 \
edit-distance 0.2.2.1 1 \
- hackage-security0.6.0.1 4 \
- hashable1.3.0.0 2 \
- hsc2hs 0.68.7 0 \
- lukko 0.1.1.2 0 \
- network 3.1.2.1 1 \
- network-uri 2.6.3.0 0 \
- random 1.2.0 3 \
- regex-base 0.94.0.01 \
- regex-posix 0.96.0.01 \
- resolv 0.1.2.0 0 \
- splitmix0.1.0.3 0 \
- tar 0.5.1.1 2 \
- zlib0.6.2.2 0 \
+ hackage-security0.6.0.1 8 \
+ hashable1.3.5.0 0 \
+ lukko 0.1.1.3 1 \
+ network 3.1.2.5 0 \
+ network-uri 2.6.4.1 0 \
+ random 1.2.1 0 \
+ regex-base 0.94.0.20 \
+ regex-posix 0.96.0.10 \
+ resolv 0.1.2.0 3 \
+ splitmix0.1.0.4 0 \
+ th-compat 0.1.3 0 \
+ tar 0.5.1.1 4 \
+ zlib0.6.2.3 1 \
.for _package _version _revision in ${_MANIFEST}
DISTFILES += {${_package}-${_version}/}${_package}-${_version}.tar.gz:0
DISTFILES +=
${_package}-${_version}_${_revision}{${_package}-${_version}/revision/${_revision}}.cabal:0
.endfor
-BUILD_DEPENDS += lang/ghc>=8.10.3
+BUILD_DEPENDS += lang/ghc>=8.10.6
MODULES = lang/python
diff --git a/devel/cabal-install/distinfo b/devel/cabal-install/distinfo
index 8a2437a4efd..adae4454431 100644
--- a/devel/cabal-install/distinfo
+++ b/devel/cabal-install/distinfo
@@ -1,86 +1,86 @@
-SHA256 (hackage/HTTP-4000.3.15.tar.gz) =
DWs2jkMAHARmYODiCb+XldyZDLRQFkR/z5LoIsIuFZQ=
-SHA256 (hackage/HTTP-4000.3.15_2.cabal) =
K6nPxAr7sjEybE/2ha5njERU5En9QWcuXKdf11f+auY=
-SHA256 (hackage/async-2.2.2.tar.gz) =
S0qxrILEUUTYLG2vbLa6Req5lX2tRHh/pehp4j1zu/8=
-SHA256 (hackage/async-2.2.2_1.cabal) =
oXjBZoVtp/8i/kUAM3tUgS6U/SBZQJRSGH1y4Fft6c0=
-SHA256 (hackage/base16-bytestring-0.1.1.7.tar.gz) =
UlaJZ51cyA+lMsHVz+rOD2K7tUE0+tUU8boA0Of+abo=
-SHA256 (hackage/base16-bytestring-0.1.1.7_3.cabal) =
ACElapYolxwI2pXLj00NchkvO7inswtVwIBWLRfEPdM=
-SHA256 (hackage/base64-bytestring-1.2.0.1.tar.gz) =
rwmxfQcusTkdkeMLQYbdF5czBkfveSaOzX/M6PWvxjg=
-SHA256 (hackage/base64-bytestring-1.2.0.1_0.cabal) =
9PmYI1/Aglq2NsqSQbgn3lgFszZiXrHHgi8XmKI4tqw=
-SHA256 (hackage/cabal-install-3.4.0.0.tar.gz) =
5PvV6x13QAdGqZNnkYHxWapBWje5MbJtZ/VgL2POlxw=
-SHA256 (hackage/cryptohash-sha256-0.11.101.0.tar.gz) =
UnVkNdvqJI40T7y8xd9TB/YN+s8zff0RrjDxx6TaBd0=
-SHA256 (hackage/cryptohash-sha256-0.11.101.0_4.cabal) =
uWPWMI2wljYtc9nGA7MxzxiKppMQGV9Hnf7fYEXX5gI=
-SHA256 (hackage/echo-0.1.3.tar.gz) =
cE8HMQ+CctFw+Kt/sqLBPxXYUB74MQgB42lkyO/0he8=
-SHA256
update ocaml to 4.12.1
See below for a diff for ocaml to the 4.12.x series. Only a few changes
were needed for this update and they're already in the tree:
- mldonkey and unison 2.4.x needed a small diff
- dune needed to be updated to 2.7.0
All ocaml ports were built successfully on amd64 (except coccinelle which
is still broken).
As usual the ocaml update requires an update to a matching camlp4 which is
included in the diff below.
All consumer ports will also be bumped when this goes in.
ok for the update?
p.s. Anil, not sure if you want to stay as maintainer of ocaml or not. I'm
dropping you in the proposed diff. But if you want to stay as maintainer
please let me know.
Index: lang/ocaml/Makefile
===
RCS file: /cvs/ports/lang/ocaml/Makefile,v
retrieving revision 1.89
diff -u -p -u -r1.89 Makefile
--- lang/ocaml/Makefile 4 Dec 2021 21:17:10 - 1.89
+++ lang/ocaml/Makefile 5 Dec 2021 04:29:23 -
@@ -4,8 +4,7 @@ COMMENT = ML language with complete c
# XXX Don't even think of updating ocaml alone.
# Do check that the ports that depend on it still work, or repair them.
-VERSION= 4.11.2
-REVISION = 0
+VERSION= 4.12.1
PKGNAME = ocaml-${VERSION:C/\+//}
@@ -20,7 +19,6 @@ DISTFILES=${DISTNAME}.tar.gz ${DOCFILES
DISTNAME = ocaml-${VERSION}
HOMEPAGE= https://ocaml.org/
-MAINTAINER=Anil Madhavapeddy
# QPL/LGPL
PERMIT_PACKAGE=Yes
Index: lang/ocaml/distinfo
===
RCS file: /cvs/ports/lang/ocaml/distinfo,v
retrieving revision 1.28
diff -u -p -u -r1.28 distinfo
--- lang/ocaml/distinfo 2 Dec 2021 03:59:20 - 1.28
+++ lang/ocaml/distinfo 5 Dec 2021 04:29:23 -
@@ -1,4 +1,4 @@
-SHA256 (ocaml-4.11-refman-html.tar.gz) =
88vAwTLfHhI2oWJpAI32Vk6fuLh0XCLGyWjK0TStUHY=
-SHA256 (ocaml-4.11.2.tar.gz) = T1UdfLDAhdxXJW0ZbKUdMvqqywKYyE0JBSuETecCCSE=
-SIZE (ocaml-4.11-refman-html.tar.gz) = 1762039
-SIZE (ocaml-4.11.2.tar.gz) = 4969981
+SHA256 (ocaml-4.12-refman-html.tar.gz) =
eLtzsc6LiAUty+m1n97k/amUzCl46ll4gx8if3fagvs=
+SHA256 (ocaml-4.12.1.tar.gz) = bWHsE6fRtS7uc1r6xhZVK1btEt2hmBxNRBBX5S2RD9c=
+SIZE (ocaml-4.12-refman-html.tar.gz) = 1444139
+SIZE (ocaml-4.12.1.tar.gz) = 5181551
Index: lang/ocaml/patches/patch-configure_ac
===
RCS file: /cvs/ports/lang/ocaml/patches/patch-configure_ac,v
retrieving revision 1.5
diff -u -p -u -r1.5 patch-configure_ac
--- lang/ocaml/patches/patch-configure_ac 4 Dec 2021 21:17:10 -
1.5
+++ lang/ocaml/patches/patch-configure_ac 5 Dec 2021 04:29:23 -
@@ -3,7 +3,7 @@ $OpenBSD: patch-configure_ac,v 1.5 2021/
Index: configure.ac
--- configure.ac.orig
+++ configure.ac
-@@ -700,6 +700,11 @@ AS_CASE([$CC,$host],
+@@ -735,6 +735,11 @@ AS_CASE([$CC,$host],
)
@@ -15,13 +15,16 @@ Index: configure.ac
## Program to use to install files
AC_PROG_INSTALL
-@@ -824,8 +829,8 @@ AS_IF([test x"$enable_shared" != "xno"],
+@@ -867,10 +872,10 @@ AS_IF([test x"$enable_shared" != "xno"],
[[*-*-linux*|*-*-freebsd[3-9]*|*-*-freebsd[1-9][0-9]*\
|*-*-openbsd*|*-*-netbsd*|*-*-dragonfly*|*-*-gnu*|*-*-haiku*]],
[sharedlib_cflags="-fPIC"
-- mksharedlib="$CC -shared"
- oc_ldflags="$oc_ldflags -Wl,-E"
-+ mksharedlib="$CC -shared $oc_ldflags"
++ oc_ldflags="$oc_ldflags -Wl,-E"
+AS_CASE([$CC,$host],
+[gcc*,powerpc-*-linux*], [mksharedlib="$CC -shared -mbss-plt"],
+- [mksharedlib="$CC -shared"])
+- oc_ldflags="$oc_ldflags -Wl,-E"
++ [mksharedlib="$CC -shared $oc_ldflags"])
rpath="-Wl,-rpath,"
mksharedlibrpath="-Wl,-rpath,"
natdynlinkopts="-Wl,-E"
Index: lang/ocaml/pkg/PFRAG.native
===
RCS file: /cvs/ports/lang/ocaml/pkg/PFRAG.native,v
retrieving revision 1.19
diff -u -p -u -r1.19 PFRAG.native
--- lang/ocaml/pkg/PFRAG.native 2 Dec 2021 03:59:20 - 1.19
+++ lang/ocaml/pkg/PFRAG.native 5 Dec 2021 04:29:23 -
@@ -16,6 +16,7 @@ bin/ocamlopt.byte
lib/ocaml/bigarray.a
lib/ocaml/bigarray.cmx
lib/ocaml/bigarray.cmxa
+lib/ocaml/camlinternalAtomic.cmx
lib/ocaml/camlinternalFormat.cmx
lib/ocaml/camlinternalFormatBasics.cmx
lib/ocaml/camlinternalLazy.cmx
@@ -91,6 +92,7 @@ lib/ocaml/compiler-libs/backend_var.cmt
lib/ocaml/compiler-libs/backend_var.cmti
lib/ocaml/compiler-libs/backend_var.cmx
lib/ocaml/compiler-libs/backend_var.mli
+lib/ocaml/compiler-libs/binutils.cmx
lib/ocaml/compiler-libs/branch_relaxation.cmi
lib/ocaml/compiler-libs/branch_relaxation.cmt
lib/ocaml/compiler-libs/branch_relaxation.cmti
@@ -425,6 +427,7 @@ lib/ocaml/compiler-libs/linear.cmt
lib/ocaml/compiler-libs/linear.cmti
lib/ocaml/compiler-libs/linear.cmx
lib/ocaml/compiler-libs/linear.mli
+lib/ocaml/compiler-libs/linear_format.cmx
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2021/12/04 20:55:06 Modified files: lang/jruby : Makefile distinfo lang/jruby/pkg : PLIST Log message: Update to JRuby 9.3.2.0
Re: CVS: cvs.openbsd.org: ports
On Fri, Dec 3, 2021 at 10:06 PM Daniel Dickman wrote: > > CVSROOT:/cvs > Module name:ports > Changes by: dan...@cvs.openbsd.org 2021/12/03 20:05:30 > > Modified files: > devel/dune : Makefile distinfo > graphics/ocaml-cairo: Makefile > Added files: > devel/dune/pkg : DESCR-configurator DESCR-main DESCR-private > PFRAG.dynlink-native-configurator > PFRAG.dynlink-native-private > PFRAG.native-configurator PFRAG.native-private > PLIST-configurator PLIST-main PLIST-private > Removed files: > devel/dune/patches: patch-Makefile > devel/dune/pkg : DESCR PLIST > > Log message: > update dune to 2.7.0 > > ok chrisz@ (MAINTAINER) > whoops. meant to say that most of the work for this update was done by chrisz@ not me.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: t...@cvs.openbsd.org2021/12/04 14:37:58 Modified files: security/p5-Crypt-OpenSSL-RSA: Makefile Added files: security/p5-Crypt-OpenSSL-RSA/patches: patch-RSA_xs Log message: security/p5-Crypt-OpenSSL-RSA: fix build with opaque RSA in LibreSSL 3.5.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: t...@cvs.openbsd.org2021/12/04 14:30:04 Modified files: telephony/baresip/re: Makefile Added files: telephony/baresip/re/patches: patch-src_hmac_openssl_hmac_c patch-src_tls_openssl_tls_h Log message: telephony/baresip/re: fix build with opaque HMAC_CTX and BIO_METHOD in LibreSSL 3.5.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: t...@cvs.openbsd.org2021/12/04 14:22:58 Modified files: telephony/kamailio: Makefile telephony/kamailio/patches: patch-src_modules_tls_tls_bio_c patch-src_modules_tls_tls_domain_c Log message: telephony/kamailio: Take OpenSSL 1.1 code path twice to fix build with opaque DH and BIO_METHOD.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: chr...@cvs.openbsd.org 2021/12/04 14:17:11 Modified files: infrastructure/mk: arch-defines.mk lang/ocaml : Makefile lang/ocaml/patches: patch-configure_ac Log message: lang/ocaml supports native code on aarch64 ok daniel@
Re: devel/xtensa-esp32-elf/gdb failed to build
On December 3, 2021 5:04:32 PM MST, Antoine Jacoutot
wrote:
>Hi.
>
>Once again, falling with gawk.
>Can't we set something up in Makefile.inc or whatever?
I'll get it fixed up in the morning.
>
>
>Configuring in ./sim
>configure: creating cache ./config.cache
>checking for x86_64-unknown-openbsd7.0-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... o
>checking whether we are using the GNU C compiler... yes
>checking whether cc accepts -g... yes
>checking for cc option to accept ISO C89... none needed
>checking for a BSD-compatible install...
>/exopi-obj/pobj/xtensa-esp32-elf-gdb-2.35.1.2021.2/bin/install -c
>checking for x86_64-unknown-openbsd7.0-ar... ar
>checking for x86_64-unknown-openbsd7.0-ranlib... ranlib
>checking build system type... x86_64-unknown-openbsd7.0
>checking host system type... x86_64-unknown-openbsd7.0
>checking target system type... xtensa-esp32-elf
>checking for x86_64-unknown-openbsd7.0-gcc... (cached) cc
>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... (cached) none needed
>checking for x86_64-unknown-openbsd7.0-ranlib... (cached) ranlib
>configure: updating cache ./config.cache
>configure: creating ./config.status
>config.status: creating Makefile
>./config.status: gawk: not found
>config.status: error: could not create Makefile
>gmake[1]: *** [Makefile:8245: configure-sim] Error 1
>gmake[1]: Leaving directory
>'/exopi-obj/pobj/xtensa-esp32-elf-gdb-2.35.1.2021.2/build-amd64'
>gmake: *** [Makefile:851: all] Error 2
>*** Error 2 in devel/xtensa-esp32-elf/gdb
>(/exopi-cvs/ports/infrastructure/mk/bsd.port.mk:2948
>'/exopi-obj/pobj/xtensa-esp32-elf-gdb-2.35.1.2021.2/build-amd64/.build_done')
>*** Error 2 in devel/xtensa-esp32-elf/gdb
>(/exopi-cvs/ports/infrastructure/mk/bsd.port.mk:2594 'build':
>@lock=xtensa-esp32-elf-gdb-2.35.1.20...)
>===> Exiting devel/xtensa-esp32-elf/gdb with an error
>*** Error 1 in /exopi-cvs/ports (infrastructure/mk/bsd.port.subdir.mk:137
>'build': @: ${echo_msg:=echo}; : ${target:=build}; for i in ; do...)
Ended at 1638572858.53
>max_stuck=114.32/depends=6.83/show-prepare-results=1.83/patch=134.20/configure=12.80/build=336.46
>Error: job failed with 512 on exopi-5 at 1638572858
>
>
--
Tracey Emery
Sent from my phone.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rob...@cvs.openbsd.org 2021/12/04 11:54:44 Modified files: net/zabbix : Makefile distinfo net/zabbix/patches: patch-configure patch-src_libs_zbxnix_daemon_c Log message: update to 5.0.18; from Mark Patruck
Re: CVS: cvs.openbsd.org: ports
On Sat, Dec 4, 2021 at 10:24 AM Solene Rapenne wrote:
> On Tue, 30 Nov 2021 12:04:10 -0700 (MST)
> Jeremy Evans :
>
> > CVSROOT: /cvs
> > Module name: ports
> > Changes by: jer...@cvs.openbsd.org 2021/11/30 12:04:10
> >
> > Modified files:
> > lang/ruby/2.6 : Tag: OPENBSD_7_0 Makefile distinfo
> > lang/ruby/2.6/pkg: Tag: OPENBSD_7_0 PLIST-main
> > lang/ruby/2.7 : Tag: OPENBSD_7_0 Makefile distinfo
> > lang/ruby/2.7/pkg: Tag: OPENBSD_7_0 PLIST-main
> > lang/ruby/3.0 : Tag: OPENBSD_7_0 Makefile distinfo
> > lang/ruby/3.0/pkg: Tag: OPENBSD_7_0 PLIST-main PLIST-ri_docs
> >
> > Log message:
> > Update to Ruby 2.6.9, 2.7.5, and 3.0.3
> >
>
>
> ruby 2.6.9 doesn't compile on sparc64 -stable
>
> ===> Building for ruby-2.6.9
> cc -O2 -pipe -fPIC -D_FORTIFY_SOURCE=2 -fstack-protector-strong
> -fno-strict-overflow -fvisibility=hidden -DRUBY_EXPORT
> -DCANONICALIZATION_FOR_MATHN -DOPENSSL_NO_STATIC_ENGINE
> -I/usr/local/include -I. -I.ext/include/sparc64-openbsd -I./include -I.
> -I./enc/unicode/12.1.0 -o hash.o -c hash.c
> hash.c: In function 'keylist_delete':
> hash.c:5661: error: 'for' loop initial declaration used outside C99 mode
> *** Error 1 in /build/tmp/pobj/ruby-2.6.9/ruby-2.6.9 (Makefile:419
> 'hash.o')
> *** Error 2 in . (/home/ports//infrastructure/mk/bsd.port.mk:2956
> '/build/tmp/pobj//ruby-2.6.9/.build_done': @cd
> /build/tmp/pobj//ruby-2.6.9...)
> *** Error 2 in /home/ports/lang/ruby/2.6 (/home/ports//infrastructure/mk/
> bsd.port.mk:2602 'all': @lock=ruby-2.6.9; export _LOCKS_HELD=" rub...)
>
>
Looks like we need a -std=c99 in there. Does adding CFLAGS="${CFLAGS}
-std=c99" to CONFIGURE_ENV fix the issue?
I believe this is an upstream bug. IIRC, Ruby didn't require C99 until
Ruby 2.7. So basically a bug fix must have been backported to Ruby 2.6
without checking for C99 issues. I'll raise the issue upstream.
Thanks,
Jeremy
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: de...@cvs.openbsd.org 2021/12/04 10:21:20 Modified files: databases/timescaledb: Makefile distinfo databases/timescaledb/pkg: PLIST Log message: Update to v2.5.1 Also enable TSL-licensed modules. Tested by Mark Patruck, thanks.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2021/12/04 10:06:35 Modified files: multimedia : Makefile Log message: + playerctl
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2021/12/04 10:05:08 Log message: Import multimedia/playerctl 2.4.1 Port from Lewis ingraham < louise9841 AT gmail DOT com>, thanks! Feedback sthen kn OK sdk Playerctl is a command-line utility and library for controlling media players that implement the MPRIS D-Bus Interface Specification. Playerctl makes it easy to bind player actions, such as play and pause, to media keys. You can also get metadata about the playing track such as the artist and title for integration into statusline generators or other command-line tools. Status: Vendor Tag: kn Release Tags: kn_20211204 N ports/multimedia/playerctl/Makefile N ports/multimedia/playerctl/distinfo N ports/multimedia/playerctl/pkg/DESCR N ports/multimedia/playerctl/pkg/PLIST No conflicts created by this import
Re: games/godot: install manpage and desktop file
Omar Polo writes:
> Hello,
>
> I'd like to include the desktop file (+ icon) and the manpage in the
> Godot package.
>
> The manpage is some release old and lacks some newer flags, but it's way
> better than `godot --help | less` and the missing options are not
> super-important IMHO. Moreover, it specifies also where godot store its
> files which is nice.
>
> For the curious, these are the flags mentioned in the help message that
> are currently missing in the manpage:
>
> --enable-delta-smoothing When vsync is enabled, enabled frame
> delta smoothing.
> --disable-delta-smoothingDisable frame delta smoothing.
> --tablet-driver Tablet input driver () (Windows only).
>
> Comments/thoughts/OK?
friendly ping :)
Index: Makefile
===
RCS file: /home/cvs/ports/games/godot/Makefile,v
retrieving revision 1.29
diff -u -p -r1.29 Makefile
--- Makefile10 Nov 2021 13:20:17 - 1.29
+++ Makefile18 Nov 2021 21:52:23 -
@@ -8,6 +8,7 @@ V = 3.4
GODOTSTEAM_V = g333-s151-g397
DISTNAME = godot-${V}-stable
PKGNAME = godot-${V}
+REVISION = 0
CATEGORIES = games
HOMEPAGE = https://godotengine.org/
MAINTAINER = Omar Polo
@@ -82,6 +83,7 @@ LIB_DEPENDS = archivers/zstd \
multimedia/libvpx \
net/enet \
security/polarssl
+RUN_DEPENDS = devel/desktop-file-utils
NO_TEST = Yes
@@ -107,5 +109,17 @@ pre-configure:
do-install:
${INSTALL_PROGRAM} ${WRKBUILD}/bin/godot* \
${PREFIX}/bin/godot
+ ${INSTALL_MAN_DIR} ${PREFIX}/man/man6
+ ${INSTALL_MAN} ${WRKSRC}/misc/dist/linux/godot.6 \
+ ${PREFIX}/man/man6
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps
+ ${INSTALL_DATA} ${WRKSRC}/icon.svg \
+ ${PREFIX}/share/pixmaps/godot.svg
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/applications
+ ${INSTALL_DATA} ${WRKSRC}/misc/dist/linux/*.desktop \
+ ${PREFIX}/share/applications
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/metainfo
+ ${INSTALL_DATA} ${WRKSRC}/misc/dist/linux/*.appdata.xml \
+ ${PREFIX}/share/metainfo/
.include
Index: patches/patch-misc_dist_linux_godot_6
===
RCS file: patches/patch-misc_dist_linux_godot_6
diff -N patches/patch-misc_dist_linux_godot_6
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-misc_dist_linux_godot_6 18 Nov 2021 11:37:59 -
@@ -0,0 +1,20 @@
+$OpenBSD$
+
+Index: misc/dist/linux/godot.6
+--- misc/dist/linux/godot.6.orig
misc/dist/linux/godot.6
+@@ -1,4 +1,4 @@
+-.TH GODOT "6" "January 2020" "godot 3.2" "Games"
++.TH GODOT "6" "January 2020" "Godot" "Games"
+ .SH NAME
+ godot \- multi\-platform 2D and 3D game engine with a feature\-rich editor
+ .SH SYNOPSIS
+@@ -56,7 +56,7 @@ Remote filesystem ([:] address).
+ Password for remote filesystem.
+ .TP
+ \fB\-\-audio\-driver\fR
+-Audio driver ('PulseAudio', 'ALSA', 'Dummy').
++Audio driver ('sndio', 'Dummy').
+ .TP
+ \fB\-\-video\-driver\fR
+ Video driver ('GLES3', 'GLES2').
Index: pkg/PLIST
===
RCS file: /home/cvs/ports/games/godot/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- pkg/PLIST 10 Nov 2021 13:20:17 - 1.2
+++ pkg/PLIST 18 Nov 2021 21:31:19 -
@@ -1,3 +1,10 @@
@comment $OpenBSD: PLIST,v 1.2 2021/11/10 13:20:17 jca Exp $
@bin bin/godot
+@man man/man6/godot.6
+share/applications/org.godotengine.Godot.desktop
share/doc/pkg-readmes/${PKGSTEM}
+share/metainfo/
+share/metainfo/org.godotengine.Godot.appdata.xml
+share/pixmaps/
+share/pixmaps/godot.svg
+@tag update-desktop-database
Re: Feedback on upcoming port [playerctl]
Klemens Nanni wrote:
> On Sat, Nov 06, 2021 at 07:12:23PM +, Klemens Nanni wrote:
> > On Sat, Nov 06, 2021 at 07:40:33PM +, Lewis ingraham wrote:
> > > Thank you for answering! So I have done what you recommended. Would this
> > > revision suffice?
> >
> > Better but still lack tabs and newlines, comments can be zapped.
> >
> > More importantly, use meson OR cmake, not both. The project only uses
> > the former, so remove the cmake module.
> >
> > Shared libraries are best annotated with their original versions as per
> > ${WRKBUILD}/shared_libs.log.
> >
> > audio is the wrong category, imho. Players do video as well, so I'd go
> > with multimedia.
> >
> > Your port builds and packages playerctld which could benefit from a
> > proper playerctld.rc script so users can do use it via rcctl(8).
> > Not a requirement and I have not (yet) used playerctld, but certainly
> > worth thinking about.
> >
> > The rest looks good, the targets `port-lib-depends-check' and
> > `update-list' show no missing pieces and playerctl(1) just works with
> > ncspot on amd64 for me, nice!
> >
> > With meson, SEPARATE_BUILD=Yes is the default already.
> >
> > I've done all of the above for you, here's an updated tarball.
> > OK kn for someone to import this -- I can also import on your behalf
> > with another OK.
>
> Now that I know of the existence of playerctl(1), I'd be quite happy to
> have it in ports.
>
> Did anyone look at this? Lewis, do you have further input?
> I've reattached my updated version of your work, thanks again.
The usual checks pass. Plist looks correct. I tested it shortly with vlc
on amd64. This is quite an interesting port.
Nit: One of the tabs after GH_ACCOUNT is spaces.
ok sdk@
Re: [maintainer update] chicken-5.3.0
Timo Myyrä writes:
> Hi,
>
> Here's an bump to chicken scheme.
> Works here on amd64.
Hello,
builds fine, WANTLIB and plist ok, and from a quick test it's working
correctly. `make test` passes too :D
I've only one doubt
> -SHARED_LIBS= chicken 7.1 # 11
> +SHARED_LIBS= chicken 7.2 # 11
I think this should be a major bump because C_startup_time_seconds was
removed according to check_sym. It's not a big deal, libchicken isn't
used by anything in port, but anyway...
% /usr/src/lib/check_sym /usr/local/lib/libchicken.so.7.1 \
/usr/ports/pobj/chicken-5.3.0/fake-amd64/usr/local/lib/libchicken.so.*
/usr/local/lib/libchicken.so.7.1 -->
/usr/ports/pobj/chicken-5.3.0/fake-amd64/usr/local/lib/libchicken.so.7.2
Dynamic export changes:
added:
C_current_process_milliseconds
C_heap_half_min_free
C_startup_time_msec
C_startup_time_sec
heap_shrink_counter
removed:
C_startup_time_seconds
PLT added:
C_current_process_milliseconds
PLT removed:
C_pair
Index: Makefile.inc
===
RCS file: /home/cvs/ports/lang/chicken/Makefile.inc,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile.inc
--- Makefile.inc3 Mar 2020 10:27:40 - 1.16
+++ Makefile.inc4 Dec 2021 15:30:07 -
@@ -2,7 +2,7 @@
COMMENT= practical and portable Scheme system
-V= 5.2.0
+V= 5.3.0
DISTNAME= chicken-${V}
MAINTAINER=Timo Myyra
Index: bootstrap/distinfo
===
RCS file: /home/cvs/ports/lang/chicken/bootstrap/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- bootstrap/distinfo 3 Mar 2020 10:27:40 - 1.9
+++ bootstrap/distinfo 4 Dec 2021 15:30:07 -
@@ -1,2 +1,2 @@
-SHA256 (chicken-5.2.0.tar.gz) = gZFJyM5zA6mzgdP9wdV2XF+axN7m9ifRZS9HlmqHgPo=
-SIZE (chicken-5.2.0.tar.gz) = 4052305
+SHA256 (chicken-5.3.0.tar.gz) = w62Z2PnhftgQkS75gaw7DC4vRvsOzAM7XDttyhvbDXY=
+SIZE (chicken-5.3.0.tar.gz) = 4069549
Index: core/Makefile
===
RCS file: /home/cvs/ports/lang/chicken/core/Makefile,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile
--- core/Makefile 3 Mar 2020 10:27:40 - 1.15
+++ core/Makefile 4 Dec 2021 16:43:01 -
@@ -1,6 +1,6 @@
# $OpenBSD: Makefile,v 1.15 2020/03/03 10:27:40 semarie Exp $
-SHARED_LIBS= chicken 7.1 # 11
+SHARED_LIBS= chicken 8.0 # 11
TEST_TARGET= check
TEST_DEPENDS= ${BUILD_PKGPATH}
Index: core/distinfo
===
RCS file: /home/cvs/ports/lang/chicken/core/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- core/distinfo 3 Mar 2020 10:27:40 - 1.9
+++ core/distinfo 4 Dec 2021 15:30:07 -
@@ -1,2 +1,2 @@
-SHA256 (chicken-5.2.0.tar.gz) = gZFJyM5zA6mzgdP9wdV2XF+axN7m9ifRZS9HlmqHgPo=
-SIZE (chicken-5.2.0.tar.gz) = 4052305
+SHA256 (chicken-5.3.0.tar.gz) = w62Z2PnhftgQkS75gaw7DC4vRvsOzAM7XDttyhvbDXY=
+SIZE (chicken-5.3.0.tar.gz) = 4069549
Index: core/patches/patch-Makefile_bsd
===
RCS file: /home/cvs/ports/lang/chicken/core/patches/patch-Makefile_bsd,v
retrieving revision 1.3
diff -u -p -r1.3 patch-Makefile_bsd
--- core/patches/patch-Makefile_bsd 27 Aug 2015 22:40:33 - 1.3
+++ core/patches/patch-Makefile_bsd 4 Dec 2021 15:30:07 -
@@ -1,15 +1,14 @@
-$OpenBSD: patch-Makefile_bsd,v 1.3 2015/08/27 22:40:33 juanfra Exp $
Makefile.bsd.orig Tue Aug 4 21:46:22 2015
-+++ Makefile.bsd Thu Aug 27 19:11:22 2015
-@@ -45,10 +45,9 @@ endif
+$OpenBSD$
+
+Index: Makefile.bsd
+--- Makefile.bsd.orig
Makefile.bsd
+@@ -45,7 +45,7 @@ endif
LINKER_LINK_SHARED_LIBRARY_OPTIONS = -shared
- LINKER_LINK_SHARED_DLOADABLE_OPTIONS = -shared -Wl,-R"$(RUNTIME_LINKER_PATH)"
-Wl,-L.
- LINKER_LINK_SHARED_PROGRAM_OPTIONS = -Wl,-R"$(RUNTIME_LINKER_PATH)"
+ LINKER_LINK_SHARED_DLOADABLE_OPTIONS = -shared
-Wl,-rpath="$(RUNTIME_LINKER_PATH)" -Wl,-L.
+ LINKER_LINK_SHARED_PROGRAM_OPTIONS = -Wl,-rpath="$(RUNTIME_LINKER_PATH)"
-LIBCHICKEN_SO_LINKER_OPTIONS =
-Wl,-soname,lib$(PROGRAM_PREFIX)chicken$(PROGRAM_SUFFIX).so.$(BINARYVERSION)
+LIBCHICKEN_SO_LINKER_OPTIONS =
-Wl,-soname,lib$(PROGRAM_PREFIX)chicken$(PROGRAM_SUFFIX).so.$(LIBchicken_VERSION)
LIBRARIES = -lm -lpthread
NEEDS_RELINKING = yes
--USES_SONAME = yes
-
- # special files
-
+ USES_SONAME = yes
Index: core/patches/patch-eval_scm
===
RCS file: /home/cvs/ports/lang/chicken/core/patches/patch-eval_scm,v
retrieving revision 1.5
diff -u -p -r1.5 patch-eval_scm
--- core/patches/patch-eval_scm 6 Aug 2019 18:19:51 - 1.5
+++ core/patches/patch-eval_scm 4 Dec 2021 15:30:07 -
@@ -2,7 +2,7 @@ $OpenBSD: patch-eval_scm,v 1.5 2019/08/0
Index: eval.scm
---
Re: Add support for %0d format specifier to base m4
- long width; + int width; and then: - width = strtol(argv[pos++], NULL, 10); + width = (int)strtol(argv[pos++], NULL, 10); This is not right. You need to leave the type as long, and then range check it. I understand you are uncomfortable passing it later in an int context, where it gets truncated. But truncating it explicitly like that a cast is even worse. A huge number should not get bits chopped off and behave strangely, it should behave like the standard printf operation.
Re: devel/llvm13 port ?
On Sat, Dec 04, 2021 at 10:11:19AM +, Stuart Henderson wrote: > On 2021/12/04 10:37, Sebastien Marie wrote: > > I started to look at sparc64: it will an interesting arch, as c++ > > ports are using estdc++ by default. For now I don't copied the related > > code from devel/llvm to devel/llvm13 (to make clang-13 to use estdc++ > > instead of libc++ for generated code), as I am unsure it would be > > useful for building programs (but building libraries would be > > problematic as mixing estdc++ and libc++ code will not work). For now, > > I am experimenting. > > libestdc++ is necessary for building programs too, if they link against > any library that uses C++ itself. I suppose this probably doesn't matter > for your needs though. yes, but I need to properly think about it: we are building programs and libraries which are used to build programs and libraries (it is commonly called a compiler). here, I don't have particular requirement regarding libc++ or estdc++ for libLLVM itself, neither for rustc or zig. but the resulting binary (rustc or zig compilers) should be able to properly build programs/libraries with libc++ or estdc++ (on sparc64) in order to interact properly in port tree. > No objection as a temporary measure (as long as it's clear that it's > to support rust/zig rather than for general use), but I do hope it's fairly > short-lived. > It should be possible to remove at least some binaries (maybe clang, clang++, etc...) from the port and only keep libraries. It would enforce the "only for supporting rust/zig". But it could also help to do some tests on base/ports with more recent clang version (seeing which new warning option is breaking the build). Regarding the live time, for Rust, it should be fine to go back quickly to devel/llvm (as soon it is version >=12). rustc changed the minimal llvm support due to codegen problems with llvm10 and llvm11. Currently, they supports both llvm12 and llvm13. But zig is only supporting one llvm release at time. the 0.8.x series we have in ports is using llvm12 (I made the port to embedded it), and the next serie (currently the main branch, which will be 0.9.x) is using llvm13. I could go back to have embedded llvm version in zig when they will use llvm14, or go back to devel/llvm14 for zig and rust (if rust supports it at this time). Thanks. -- Sebastien Marie
[UPDATE] emulators/fceux to 2.5.0
Hi,
Here's an update to emulators/fceux to v2.5.0. A few highlights:
* Dependency on graphics/ffmpeg for recording videos
* Cmakelists patch changed. Some upstream changes went in
* QT ConsoleWindow.cpp patch no longer needed (upstream changes)
Runs well on my amd64 system -- tested with a few roms.
OK?
Thanks,
Tom
Index: Makefile
===
RCS file: /cvs/ports/emulators/fceux/Makefile,v
retrieving revision 1.22
diff -u -p -r1.22 Makefile
--- Makefile29 Oct 2021 10:26:23 - 1.22
+++ Makefile4 Dec 2021 13:00:58 -
@@ -2,7 +2,7 @@
COMMENT = emulator for Nintendo Entertainment System
-V =2.4.0
+V =2.5.0
DISTNAME = fceux-${V}
CATEGORIES = emulators games
@@ -16,14 +16,16 @@ PERMIT_PACKAGE =Yes
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=fceultra/}
WANTLIB += ${COMPILER_LIBCXX} ${MODLUA_WANTLIB}
-WANTLIB += GL GLU Qt5Core Qt5Gui Qt5OpenGL Qt5Widgets
-WANTLIB += SDL2 c m minizip x264 z
+WANTLIB += avcodec avformat avutil GL GLU Qt5Core
+WANTLIB += Qt5Gui Qt5OpenGL Qt5Widgets SDL2
+WANTLIB += swresample swscale c m minizip x264 x265 z
COMPILER = base-clang ports-gcc base-gcc
RUN_DEPENDS = devel/desktop-file-utils
LIB_DEPENDS = archivers/minizip \
devel/sdl2 \
+ graphics/ffmpeg \
multimedia/x264
MODULES = devel/cmake \
Index: distinfo
===
RCS file: /cvs/ports/emulators/fceux/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo29 Oct 2021 10:13:16 - 1.5
+++ distinfo4 Dec 2021 13:00:58 -
@@ -1,2 +1,2 @@
-SHA256 (fceux-2.4.0.tar.gz) = p4wm2EfCIlPRTSZO8DiWk3GIowL8GQtgiLAaYFYsLno=
-SIZE (fceux-2.4.0.tar.gz) = 21807471
+SHA256 (fceux-2.5.0.tar.gz) = ZdhKPMWBStlYuKBrg1wWYMgyC9Zss07zPBR9Y3TNGyA=
+SIZE (fceux-2.5.0.tar.gz) = 21992303
Index: patches/patch-src_CMakeLists_txt
===
RCS file: /cvs/ports/emulators/fceux/patches/patch-src_CMakeLists_txt,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_CMakeLists_txt
--- patches/patch-src_CMakeLists_txt29 Oct 2021 10:13:16 - 1.1
+++ patches/patch-src_CMakeLists_txt4 Dec 2021 13:00:58 -
@@ -3,7 +3,7 @@ $OpenBSD: patch-src_CMakeLists_txt,v 1.1
Index: src/CMakeLists.txt
--- src/CMakeLists.txt.orig
+++ src/CMakeLists.txt
-@@ -98,7 +98,7 @@ else(WIN32)
+@@ -128,7 +128,7 @@ else(WIN32)
endif()
# Check for LUA
@@ -11,17 +11,8 @@ Index: src/CMakeLists.txt
+ pkg_search_module( LUA lua51 lua-5.1 )
add_definitions( -DHAVE_ASPRINTF ) # What system wouldn't have this?
-
-@@ -106,7 +106,7 @@ else(WIN32)
- set( OPENGL_LDFLAGS "-framework OpenGL" )
- else()
- set( OPENGL_LDFLAGS ${OPENGL_LIBRARIES} )
-- set( SYS_LIBS -lrt -lpthread )
-+ set( SYS_LIBS -lpthread )
- endif()
-
- endif(WIN32)
-@@ -581,7 +581,7 @@ install( FILES ${CMAKE_CURRENT_SOURCE_DIR}/auxlib.
+ add_definitions( -DLUA_USE_LINUX ) # This needs to be set when link LUA
internally for linux and macosx
+@@ -631,7 +631,7 @@ install( FILES ${CMAKE_CURRENT_SOURCE_DIR}/auxlib.
install( DIRECTORY ${CMAKE_SOURCE_DIR}/output/.
DESTINATION share/fceux )
install( FILES ${CMAKE_SOURCE_DIR}/fceux1.png
DESTINATION share/pixmaps )
install( FILES ${CMAKE_SOURCE_DIR}/fceux.desktop
DESTINATION share/applications )
Index: patches/patch-src_drivers_Qt_ConsoleWindow_cpp
===
RCS file: patches/patch-src_drivers_Qt_ConsoleWindow_cpp
diff -N patches/patch-src_drivers_Qt_ConsoleWindow_cpp
--- patches/patch-src_drivers_Qt_ConsoleWindow_cpp 29 Oct 2021 10:13:16
- 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,41 +0,0 @@
-$OpenBSD: patch-src_drivers_Qt_ConsoleWindow_cpp,v 1.1 2021/10/29 10:13:16
bentley Exp $
-
-Index: src/drivers/Qt/ConsoleWindow.cpp
src/drivers/Qt/ConsoleWindow.cpp.orig
-+++ src/drivers/Qt/ConsoleWindow.cpp
-@@ -3817,7 +3817,7 @@ int consoleWin_t::getSchedParam( int , int
- {
- int ret = 0;
-
--#if defined(__linux__) || defined(__unix__)
-+#if defined(__linux__)
- struct sched_param p;
-
- policy = sched_getscheduler( getpid() );
-@@ -3833,7 +3833,7 @@ int consoleWin_t::getSchedParam( int , int
- priority = p.sched_priority;
- }
-
--#elif defined(__APPLE__)
-+#elif defined(__APPLE__) || defined(__OpenBSD__)
- struct sched_param p;
-
- if ( pthread_getschedparam( pthread_self(), , ) )
-@@ -3853,7 +3853,7 @@ int consoleWin_t::getSchedParam( int , int
- int consoleWin_t::setSchedParam( int policy, int priority )
- {
- int ret = 0;
--#if
Re: NEW: libcrossguid 0.2.2
I'm busy decorating atm. It was literally about 5 minutes work to do. The problem with using the Linux libuuid is that there's a function which conflicts with one of the uuid functions in libc so I'm really much happier to not pull it in unless unavoidable (and it's very avoidable here) -- Sent from a phone, apologies for poor formatting. On 4 December 2021 11:38:28 Brad Smith wrote: On 11/20/2021 6:16 PM, Brad Smith wrote: On Fri, Nov 19, 2021 at 09:03:56PM -0500, Brad Smith wrote: On Sat, Oct 02, 2021 at 04:42:53AM -0400, Brad Smith wrote: Attached is a port of libcrossguid. Comment: minimal and cross platform C++ GUID library Description: CrossGuid is a minimal, cross platform, C++ GUID library. It uses the best native GUID/UUID generator on the given platform and had a generic class for parsing, stringifying, and comparing IDs. Here is an updated port. I fixed the port so it builds a shared library instead and hooked up the test. Forgot the attachment. Can we can get this in as is? I don't mind converting over to the OpenBSD API if you can come up with a diff.
Add support for %0d format specifier to base m4
Hi,
current ocaml uses %02d format specifier in its autoconf. This is not
supported by our base m4. I had no idea how to force autoconf to use
devel/m4. So I added support for this flag to base m4. OK?
Alternatively suggestions are welcome how to force use of
/usr/local/bin/gm4 instead of /usr/bin/m4.
Christopher
Index: gnum4.c
===
RCS file: /cvs/src/usr.bin/m4/gnum4.c,v
retrieving revision 1.52
diff -u -p -r1.52 gnum4.c
--- gnum4.c 21 Aug 2017 21:41:13 - 1.52
+++ gnum4.c 4 Dec 2021 12:41:43 -
@@ -542,12 +542,12 @@ doformat(const char *argv[], int argc)
{
const char *format = argv[2];
int pos = 3;
- int left_padded;
- long width;
+ int left_padded, fill_0 = 0;
+ int width;
size_t l;
const char *thisarg;
- char temp[2];
- long extra;
+ char temp[32];
+ long extra, number;
while (*format != 0) {
if (*format != '%') {
@@ -564,15 +564,19 @@ doformat(const char *argv[], int argc)
addchar('%');
break;
}
+ if (*format == '0') {
+ format++;
+ fill_0 = 1;
+ }
if (*format == '*') {
format++;
if (pos >= argc)
m4errx(1,
"Format with too many format specifiers.");
- width = strtol(argv[pos++], NULL, 10);
+ width = (int)strtol(argv[pos++], NULL, 10);
} else {
- width = strtol(format, (char **), 10);
+ width = (int)strtol(format, (char **), 10);
}
if (width < 0) {
left_padded = 1;
@@ -599,6 +603,18 @@ doformat(const char *argv[], int argc)
switch(*format) {
case 's':
thisarg = argv[pos++];
+ break;
+ case 'd':
+ number = strtol(argv[pos], (char **), 0);
+ if (*argv[pos] == '\0' || *thisarg != '\0')
+ m4errx(1,
+ "Unexpected argument to %%d format specifier:
%s.",
+ argv[pos]);
+ pos ++;
+ snprintf(temp, sizeof(temp),
+ fill_0 ? "%0*ld" : "%*ld",
+ left_padded ? -width : width, number);
+ thisarg = temp;
break;
case 'c':
temp[0] = strtoul(argv[pos++], NULL, 10);
Index: m4.1
===
RCS file: /cvs/src/usr.bin/m4/m4.1,v
retrieving revision 1.65
diff -u -p -r1.65 m4.1
--- m4.18 Mar 2021 02:47:28 - 1.65
+++ m4.14 Dec 2021 12:41:43 -
@@ -290,8 +290,8 @@ and following arguments, in a way simila
.Xr printf 3 .
This built-in is only available in GNU-m4 compatibility mode, and the only
parameters implemented are there for autoconf compatibility:
-left-padding flag, an optional field width, a maximum field width,
-*-specified field widths, and the %s and %c data type.
+left-padding flag, pad with leading zeros flag, an optional field width, a
+maximum field width, *-specified field widths, and the %d, %s and %c data type.
.It Fn ifdef name yes no
If the macro named by the first argument is defined then return the second
argument, otherwise the third.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2021/12/04 05:35:02 Modified files: devel/ipython : Makefile distinfo Log message: Update to ipython-7.30.1
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: t...@cvs.openbsd.org2021/12/04 05:06:14 Modified files: security/sslsplit: Makefile security/sslsplit/patches: patch-ssl_c Added files: security/sslsplit/patches: patch-cachedsess_t_c patch-cachefkcrt_t_c patch-cachessess_t_c Log message: security/sslsplit: use a few OpenSSL 1.1 codepaths to fix the build with opaque structs in libcrypto. Also skip a couple of tests for old OpenSSL that will no longer compile with recent LibreSSL.
回复: 回复: update databases/py-peewee
I attched my patch.
It build well and run well and passed all 910 tests on my amd64-7.0 system.
wen
发件人: Solene Rapenne
发送时间: 2021年12月3日 20:19
收件人: wen heping
抄送: ports@openbsd.org
主题: Re: 回复: update databases/py-peewee
On Fri, 3 Dec 2021 12:08:07 +
wen heping :
> Seems you disable the test.
> I submitted a patch to update peewee to 3.14.0 and enable the test
> in Feb 2021.
>
> I shall try to enable test on your new patch.
>
> wen
>
I didn't disable tests, the newer version doesn't run the test like it
used too, and certainly does that through setup.py so it automagically
works with the python ports module. The test target wasn't useful
anymore (and producing an error).
Index: Makefile
===
RCS file: /cvs/ports/databases/py-peewee/Makefile,v
retrieving revision 1.24
diff -u -p -r1.24 Makefile
--- Makefile2 Nov 2021 00:00:16 - 1.24
+++ Makefile4 Dec 2021 11:45:33 -
@@ -2,10 +2,9 @@
COMMENT= small expressive ORM
-MODPY_EGG_VERSION= 2.8.3
+MODPY_EGG_VERSION= 3.14.8
DISTNAME= peewee-${MODPY_EGG_VERSION}
PKGNAME= py-${DISTNAME}
-REVISION= 9
GH_ACCOUNT=coleifer
GH_PROJECT=peewee
@@ -20,13 +19,18 @@ PERMIT_PACKAGE= Yes
BUILD_DEPENDS= textproc/py-sphinx,python3>=4.0.2
+TEST_DEPENDS= databases/py-psycopg2 \
+ databases/sqlite3
+
FLAVORS= python3
FLAVOR=python3
MODULES= lang/python
MODPY_SETUPTOOLS= Yes
-MAKE_ENV +=PYTHONPATH=${WRKSRC}
+MAKE_ENV +=PYTHONPATH=${WRKSRC} \
+ SPHINXBUILD=${LOCALBASE}/bin/sphinx-build${MODPY_BIN_SUFFIX}\
+ NO_SQLITE=1
DOCSRC = ${WRKSRC}/docs
post-build:
cd ${DOCSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} html
@@ -41,6 +45,6 @@ post-install:
mv ${PREFIX}/bin/pwiz.py ${PREFIX}/bin/pwiz
do-test:
- cd ${WRKSRC} && ${MODPY_BIN} tests.py
+ cd ${WRKSRC} && ${MODPY_BIN} runtests.py
.include
Index: distinfo
===
RCS file: /cvs/ports/databases/py-peewee/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- distinfo17 Sep 2016 15:33:39 - 1.7
+++ distinfo4 Dec 2021 11:45:33 -
@@ -1,2 +1,2 @@
-SHA256 (peewee-2.8.3.tar.gz) = NW3QQbn6Ztbny8T/ROyHhFq/fXRxQn13vvD4+jye2dw=
-SIZE (peewee-2.8.3.tar.gz) = 639529
+SHA256 (peewee-3.14.8.tar.gz) = fWSHpi7Kies0UahFYXJUpmRq/SsBgIRrqur34bszhPQ=
+SIZE (peewee-3.14.8.tar.gz) = 891123
Index: patches/patch-setup_py
===
RCS file: patches/patch-setup_py
diff -N patches/patch-setup_py
--- patches/patch-setup_py 17 Sep 2016 15:33:39 - 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,25 +0,0 @@
-$OpenBSD: patch-setup_py,v 1.2 2016/09/17 15:33:39 danj Exp $
-
-1. For option --single-version-externally-managed
-2. Disable cython
-
setup.py.orig Thu Aug 25 20:17:54 2016
-+++ setup.py Sun Aug 28 10:12:56 2016
-@@ -1,7 +1,7 @@
- import os
- import sys
- import warnings
--from distutils.core import setup
-+from setuptools import setup
- from distutils.extension import Extension
- from distutils.version import StrictVersion
-
-@@ -28,7 +28,7 @@ else:
- 'C extensions, install Cython >=' + cython_min_version +
- '.')
- else:
--cython_installed = True
-+cython_installed = False
-
- speedups_ext_module = Extension(
- 'playhouse._speedups',
Index: pkg/PLIST
===
RCS file: /cvs/ports/databases/py-peewee/pkg/PLIST,v
retrieving revision 1.14
diff -u -p -r1.14 PLIST
--- pkg/PLIST 29 Oct 2021 15:38:41 - 1.14
+++ pkg/PLIST 4 Dec 2021 11:45:33 -
@@ -1,13 +1,15 @@
@comment $OpenBSD: PLIST,v 1.14 2021/10/29 15:38:41 sthen Exp $
-@pkgpath databases/py-peewee
@conflict py-peewee-<2.8.3p4
+@pkgpath databases/py-peewee
bin/pwiz
+lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}peewee.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}pwiz.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/peewee-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
lib/python${MODPY_VERSION}/site-packages/peewee-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
lib/python${MODPY_VERSION}/site-packages/peewee-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
lib/python${MODPY_VERSION}/site-packages/peewee-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
+lib/python${MODPY_VERSION}/site-packages/peewee-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/not-zip-safe
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: t...@cvs.openbsd.org2021/12/04 04:44:42 Modified files: security/aircrack-ng: Makefile Added files: security/aircrack-ng/patches: patch-src_crypto_c Log message: security/aircrack-ng: force use of OpenSSL 1.1 code path to fix build with opaque HMAC_CTX in upcoming libcrypto bump.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: t...@cvs.openbsd.org2021/12/04 04:35:34 Modified files: security/encfs : Makefile Added files: security/encfs/patches: patch-encfs_SSL_Compat_h Log message: security/encfs: neuter compat shims that break the build with opaque HMAC_CTX in preparation for upcoming libcrypto bump.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: t...@cvs.openbsd.org2021/12/04 04:27:20 Modified files: security/dsniff: Makefile security/dsniff/patches: patch-sshcrypto_c Added files: security/dsniff/patches: patch-arp_c patch-buf_c patch-ssh_c Log message: security/dsniff: fix build with opaque RSA in LibreSSL 3.5. Based on Debian's patchset with a couple of minor tweaks. Add some missing includes to make this compile without warnings. ok sthen
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2021/12/04 04:03:38 Modified files: inputmethods/ibus-kkc: Makefile inputmethods/ibus-kkc/pkg: PLIST Log message: Missing @tag ibus-write-cache
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2021/12/04 03:47:42 Modified files: x11/gnome/connections: Makefile distinfo Log message: Update to gnome-connections-41.2.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2021/12/04 03:42:15 Modified files: x11/gnome/yelp : Makefile distinfo Log message: Update to yelp-41.2.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2021/12/04 03:39:38 Modified files: x11/gnome/user-docs: Makefile distinfo x11/gnome/user-docs/pkg: PLIST Log message: Update to gnome-user-docs-41.1.
[maintainer update] chicken-5.3.0
Hi,
Here's an bump to chicken scheme.
Works here on amd64.
Timo
diff 1c7cb3a469cd4eafc1a5285d791d86da4f5c86b5 /usr/ports
blob - 2f597d8a02ca3a374834eea760842bda0da788ff
file + lang/chicken/Makefile.inc
--- lang/chicken/Makefile.inc
+++ lang/chicken/Makefile.inc
@@ -2,7 +2,7 @@
COMMENT= practical and portable Scheme system
-V= 5.2.0
+V= 5.3.0
DISTNAME= chicken-${V}
MAINTAINER=Timo Myyra
blob - 3ab250efefd57c869a9e4572bbd6b414496432af
file + lang/chicken/bootstrap/distinfo
--- lang/chicken/bootstrap/distinfo
+++ lang/chicken/bootstrap/distinfo
@@ -1,2 +1,2 @@
-SHA256 (chicken-5.2.0.tar.gz) = gZFJyM5zA6mzgdP9wdV2XF+axN7m9ifRZS9HlmqHgPo=
-SIZE (chicken-5.2.0.tar.gz) = 4052305
+SHA256 (chicken-5.3.0.tar.gz) = w62Z2PnhftgQkS75gaw7DC4vRvsOzAM7XDttyhvbDXY=
+SIZE (chicken-5.3.0.tar.gz) = 4069549
blob - 1dbda52c7782bf0ee97e43d9d265c52970626f54
file + lang/chicken/core/Makefile
--- lang/chicken/core/Makefile
+++ lang/chicken/core/Makefile
@@ -1,6 +1,6 @@
# $OpenBSD: Makefile,v 1.15 2020/03/03 10:27:40 semarie Exp $
-SHARED_LIBS= chicken 7.1 # 11
+SHARED_LIBS= chicken 7.2 # 11
TEST_TARGET= check
TEST_DEPENDS= ${BUILD_PKGPATH}
blob - 3ab250efefd57c869a9e4572bbd6b414496432af
file + lang/chicken/core/distinfo
--- lang/chicken/core/distinfo
+++ lang/chicken/core/distinfo
@@ -1,2 +1,2 @@
-SHA256 (chicken-5.2.0.tar.gz) = gZFJyM5zA6mzgdP9wdV2XF+axN7m9ifRZS9HlmqHgPo=
-SIZE (chicken-5.2.0.tar.gz) = 4052305
+SHA256 (chicken-5.3.0.tar.gz) = w62Z2PnhftgQkS75gaw7DC4vRvsOzAM7XDttyhvbDXY=
+SIZE (chicken-5.3.0.tar.gz) = 4069549
blob - 6bac523099a1c4fa479713dcf143a2dd21c0278d
file + lang/chicken/core/patches/patch-Makefile_bsd
--- lang/chicken/core/patches/patch-Makefile_bsd
+++ lang/chicken/core/patches/patch-Makefile_bsd
@@ -1,15 +1,14 @@
-$OpenBSD: patch-Makefile_bsd,v 1.3 2015/08/27 22:40:33 juanfra Exp $
Makefile.bsd.orig Tue Aug 4 21:46:22 2015
-+++ Makefile.bsd Thu Aug 27 19:11:22 2015
-@@ -45,10 +45,9 @@ endif
+$OpenBSD$
+
+Index: Makefile.bsd
+--- Makefile.bsd.orig
Makefile.bsd
+@@ -45,7 +45,7 @@ endif
LINKER_LINK_SHARED_LIBRARY_OPTIONS = -shared
- LINKER_LINK_SHARED_DLOADABLE_OPTIONS = -shared -Wl,-R"$(RUNTIME_LINKER_PATH)"
-Wl,-L.
- LINKER_LINK_SHARED_PROGRAM_OPTIONS = -Wl,-R"$(RUNTIME_LINKER_PATH)"
+ LINKER_LINK_SHARED_DLOADABLE_OPTIONS = -shared
-Wl,-rpath="$(RUNTIME_LINKER_PATH)" -Wl,-L.
+ LINKER_LINK_SHARED_PROGRAM_OPTIONS = -Wl,-rpath="$(RUNTIME_LINKER_PATH)"
-LIBCHICKEN_SO_LINKER_OPTIONS =
-Wl,-soname,lib$(PROGRAM_PREFIX)chicken$(PROGRAM_SUFFIX).so.$(BINARYVERSION)
+LIBCHICKEN_SO_LINKER_OPTIONS =
-Wl,-soname,lib$(PROGRAM_PREFIX)chicken$(PROGRAM_SUFFIX).so.$(LIBchicken_VERSION)
LIBRARIES = -lm -lpthread
NEEDS_RELINKING = yes
--USES_SONAME = yes
-
- # special files
-
+ USES_SONAME = yes
blob - 1eb6d105f8bc5a3f41e236e895421d3059024053
file + lang/chicken/core/patches/patch-eval_scm
--- lang/chicken/core/patches/patch-eval_scm
+++ lang/chicken/core/patches/patch-eval_scm
@@ -2,7 +2,7 @@ $OpenBSD: patch-eval_scm,v 1.5 2019/08/06 18:19:51 jua
Index: eval.scm
--- eval.scm.orig
+++ eval.scm
-@@ -1110,8 +1110,7 @@
+@@ -1115,8 +1115,7 @@
(if uses-soname?
(string-append
load-library-extension
blob - 4db8809563264170fb4632094112ff5be8296166
file + lang/chicken/core/patches/patch-rules_make
--- lang/chicken/core/patches/patch-rules_make
+++ lang/chicken/core/patches/patch-rules_make
@@ -12,3 +12,31 @@ Index: rules.make
$(LINKER) $(LINKER_OPTIONS) $(LINKER_LINK_SHARED_LIBRARY_OPTIONS)
$(LIBCHICKEN_SO_LINKER_OPTIONS) \
$(LINKER_OUTPUT) $^ $(LIBCHICKEN_SO_LIBRARIES)
ifdef USES_SONAME
+@@ -281,9 +281,6 @@ ifdef DLLSINPATH
+ $(INSTALL_PROGRAM) $(INSTALL_PROGRAM_SHARED_LIBRARY_OPTIONS)
$(LIBCHICKEN_SO_FILE) "$(DESTDIR)$(IBINDIR)"
+ else
+ ifdef USES_SONAME
+- $(INSTALL_PROGRAM) $(INSTALL_PROGRAM_SHARED_LIBRARY_OPTIONS)
$(LIBCHICKEN_SO_FILE)
"$(DESTDIR)$(ILIBDIR)$(SEP)$(LIBCHICKEN_SO_FILE).$(BINARYVERSION)"
+- cd "$(DESTDIR)$(ILIBDIR)" && ln -sf
$(LIBCHICKEN_SO_FILE).$(BINARYVERSION)
lib$(PROGRAM_PREFIX)chicken$(PROGRAM_SUFFIX)$(SO)
+-else
+ $(INSTALL_PROGRAM) $(INSTALL_PROGRAM_SHARED_LIBRARY_OPTIONS)
$(LIBCHICKEN_SO_FILE) "$(DESTDIR)$(ILIBDIR)$(SEP)$(LIBCHICKEN_SO_FILE)"
+ endif
+ endif
+@@ -415,7 +412,7 @@ uninstall:
+ $(REMOVE_COMMAND) $(REMOVE_COMMAND_OPTIONS)
"$(DESTDIR)$(ILIBDIR)$(SEP)lib$(PROGRAM_PREFIX)chicken$(PROGRAM_SUFFIX)$(A)"
+ $(REMOVE_COMMAND) $(REMOVE_COMMAND_OPTIONS)
"$(DESTDIR)$(ILIBDIR)$(SEP)lib$(PROGRAM_PREFIX)chicken$(PROGRAM_SUFFIX)$(SO)"
+ ifdef USES_SONAME
+- -$(REMOVE_COMMAND) $(REMOVE_COMMAND_OPTIONS)
"$(DESTDIR)$(ILIBDIR)$(SEP)lib$(PROGRAM_PREFIX)chicken$(PROGRAM_SUFFIX)$(SO).$(BINARYVERSION)"
++ -$(REMOVE_COMMAND) $(REMOVE_COMMAND_OPTIONS)
"$(DESTDIR)$(ILIBDIR)$(SEP)lib$(PROGRAM_PREFIX)chicken$(PROGRAM_SUFFIX)$(SO)"
+ endif
+ ifdef WINDOWS
+ $(REMOVE_COMMAND) $(REMOVE_COMMAND_OPTIONS)
Re: devel/llvm13 port ?
On 2021/12/04 10:37, Sebastien Marie wrote: > I started to look at sparc64: it will an interesting arch, as c++ > ports are using estdc++ by default. For now I don't copied the related > code from devel/llvm to devel/llvm13 (to make clang-13 to use estdc++ > instead of libc++ for generated code), as I am unsure it would be > useful for building programs (but building libraries would be > problematic as mixing estdc++ and libc++ code will not work). For now, > I am experimenting. libestdc++ is necessary for building programs too, if they link against any library that uses C++ itself. I suppose this probably doesn't matter for your needs though. No objection as a temporary measure (as long as it's clear that it's to support rust/zig rather than for general use), but I do hope it's fairly short-lived.
Re: dsniff: fix build for upcoming libcrypto bump
On 2021/12/04 00:49, Theo Buehler wrote:
> No feedback. I'm going to commit this patch tomorrow.
OK. I've never used sshmitm though (and fortunately there aren't many
devices around that still use SSHv1 to test it with!)
> On Fri, Nov 26, 2021 at 09:18:21AM +0100, Theo Buehler wrote:
> > The build fix is relatively straightforward, mostly based on Debian's
> > patch set.
> >
> > https://sources.debian.org/patches/dsniff/2.4b1+debian-30/24_Fix-OpenSSL1.1.0-Build.patch/
> >
> > If anyone uses this, a quick test would be appreciated.
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/security/dsniff/Makefile,v
> retrieving revision 1.63
> diff -u -p -r1.63 Makefile
> --- Makefile 12 Jul 2019 20:49:01 - 1.63
> +++ Makefile 25 Nov 2021 22:35:42 -
> @@ -3,7 +3,7 @@
> COMMENT= sniffing tools for penetration testing
>
> DISTNAME=dsniff-2.3
> -REVISION=16
> +REVISION=17
> CATEGORIES= security
>
> MASTER_SITES=http://monkey.org/~dugsong/dsniff/
> Index: patches/patch-arp_c
> ===
> RCS file: patches/patch-arp_c
> diff -N patches/patch-arp_c
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-arp_c 25 Nov 2021 22:34:41 -
> @@ -0,0 +1,13 @@
> +$OpenBSD$
> +
> +Index: arp.c
> +--- arp.c.orig
> arp.c
> +@@ -32,6 +32,7 @@
> + #include
> + #include
> + #include
> ++#include
> + #include
> +
> + #ifdef BSD
> Index: patches/patch-buf_c
> ===
> RCS file: patches/patch-buf_c
> diff -N patches/patch-buf_c
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-buf_c 25 Nov 2021 22:28:38 -
> @@ -0,0 +1,13 @@
> +$OpenBSD$
> +
> +Index: buf.c
> +--- buf.c.orig
> buf.c
> +@@ -12,6 +12,7 @@
> + #include
> + #include
> + #include
> ++#include
> + #include
> + #include
> + #include
> Index: patches/patch-ssh_c
> ===
> RCS file: patches/patch-ssh_c
> diff -N patches/patch-ssh_c
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-ssh_c 26 Nov 2021 07:04:59 -
> @@ -0,0 +1,161 @@
> +$OpenBSD$
> +
> +Based on
> https://sources.debian.org/patches/dsniff/2.4b1+debian-30/24_Fix-OpenSSL1.1.0-Build.patch/
> +
> +Index: ssh.c
> +--- ssh.c.orig
> ssh.c
> +@@ -13,6 +13,8 @@
> + #include
> + #include
> + #include
> ++#include
> ++#include
> + #include
> + #include
> +
> +@@ -86,7 +88,7 @@ static u_int crc32_tab[] = {
> + static u_char pkt[4 + 8 + SSH_MAX_PKTLEN];
> +
> + static void
> +-put_bn(BIGNUM *bn, u_char **pp)
> ++put_bn(const BIGNUM *bn, u_char **pp)
> + {
> + short i;
> +
> +@@ -116,7 +118,7 @@ get_bn(BIGNUM *bn, u_char **pp, int *lenp)
> + }
> +
> + static u_char *
> +-ssh_session_id(u_char *cookie, BIGNUM *hostkey_n, BIGNUM *servkey_n)
> ++ssh_session_id(u_char *cookie, const BIGNUM *hostkey_n, const BIGNUM
> *servkey_n)
> + {
> + static u_char sessid[16];
> + u_int i, j;
> +@@ -231,7 +233,10 @@ SSH_accept(SSH *ssh)
> + u_char *p, cipher, cookie[8], msg[1024];
> + u_int32_t num;
> + int i;
> +-
> ++
> ++const BIGNUM *servkey_e, *servkey_n;
> ++const BIGNUM *hostkey_e, *hostkey_n;
> ++
> + /* Generate anti-spoofing cookie. */
> + RAND_bytes(cookie, sizeof(cookie));
> +
> +@@ -240,11 +245,13 @@ SSH_accept(SSH *ssh)
> + *p++ = SSH_SMSG_PUBLIC_KEY; /* type */
> + memcpy(p, cookie, 8); p += 8; /* cookie */
> + num = 768; PUTLONG(num, p); /* servkey bits */
> +-put_bn(ssh->ctx->servkey->e, ); /* servkey exponent */
> +-put_bn(ssh->ctx->servkey->n, ); /* servkey modulus */
> ++RSA_get0_key(ssh->ctx->servkey, _n, _e, NULL);
> ++put_bn(servkey_e, ); /* servkey exponent */
> ++put_bn(servkey_n, ); /* servkey modulus */
> + num = 1024; PUTLONG(num, p);/* hostkey bits */
> +-put_bn(ssh->ctx->hostkey->e, ); /* hostkey exponent */
> +-put_bn(ssh->ctx->hostkey->n, ); /* hostkey modulus */
> ++RSA_get0_key(ssh->ctx->hostkey, _n, _e, NULL);
> ++put_bn(hostkey_e, ); /* hostkey exponent */
> ++put_bn(hostkey_n, ); /* hostkey modulus */
> + num = 0; PUTLONG(num, p); /* protocol flags */
> + num = ssh->ctx->encmask; PUTLONG(num, p); /* ciphers */
> + num = ssh->ctx->authmask; PUTLONG(num, p); /* authmask */
> +@@ -295,7 +302,7 @@ SSH_accept(SSH *ssh)
> + SKIP(p, i, 4);
> +
> + /* Decrypt session key. */
> +-if (BN_cmp(ssh->ctx->servkey->n, ssh->ctx->hostkey->n) > 0) {
> ++if (BN_cmp(servkey_n, hostkey_n) > 0) {
> + rsa_private_decrypt(enckey, enckey, ssh->ctx->servkey);
> +
Re: devel/llvm13 port ?
On Fri, Dec 03, 2021 at 12:22:06PM +0100, Sebastien Marie wrote:
> Hi,
>
> While there is on-going work to get llvm13 in base, I started to look
> to make a devel/llvm13 port, independant from devel/llvm (which is
> mirroring version in base), in order to be able to continue working on
> recent compilers which require recent llvm version.
>
> For what I am aware:
> - lang/rust : the next version (in 6 weeks) require at least llvm12 (and I
> don't
> even build it for now due to this missing dependency)
> - lang/zig : the next version (before end of month) require llvm13
>
> And I want to avoid building embedded llvm13 in both ports.
>
> The attached port is based on mortimer@ work instead of plain llvm
> version. It permits to avoid patching llvm and reuse the (good) work
> already done instead of duplicate it.
>
> To avoid conflict with devel/llvm, I installed devel/llvm13 inside
> ${LOCALBASE}/llvm13 . It should make it undetectable by others ports,
> and shouldn't influence them.
>
> I intent to not link it in the build (devel/Makefile) and let's ports
> using it in BUILD_DEPENDS to trigger the build of the port. It should
> avoid building it on archs where no others ports are using it (Am I
> right ?)
>
> The devel/llvm13 port is simple and focus on providing required parts
> for rust or zig: llvm libraries, clang binary and libraries, lld
> binary and libraries. It doesn't include lldb or python module for
> example.
>
> Once devel/llvm will reach llvm-13 version, this port could be pushed
> to Attic. It should permit in mid-term to continue to have lang/rust
> or lang/zig working without pushing too much pressure on
> llvm13-in-base work.
>
> MAINTAINER variable is undefined for now, but I would be fine to take
> the maintainership of it (as I am the main customer for it with rust
> or zig).
>
Just some comments.
The attached tarball is still WIP (my previous mail was wrong to asked
for "ok"). But I am mostly interested in feedback on the direction for
now.
I have an updated repository at https://github.com/semarie/llvmNN-ports
It is working for amd64 (I am able to build rust and zig with it).
>From the initial tarball, I needed to change GetLibraryName.cmake to
properly see "-lz" (and not "-lz.so.6.0"). Rust build is using
llvm-config output, and failed here.
I started to look at sparc64: it will an interesting arch, as c++
ports are using estdc++ by default. For now I don't copied the related
code from devel/llvm to devel/llvm13 (to make clang-13 to use estdc++
instead of libc++ for generated code), as I am unsure it would be
useful for building programs (but building libraries would be
problematic as mixing estdc++ and libc++ code will not work). For now,
I am experimenting.
Thanks.
--
Sebastien Marie
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: t...@cvs.openbsd.org2021/12/04 02:10:30 Modified files: www/ruby-puma : Makefile Added files: www/ruby-puma/patches: patch-ext_puma_http11_mini_ssl_c Log message: www/ruby-puma: prepare for upcoming libcrypto bump and use the OpenSSL 1.1 code path to handle DH.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: t...@cvs.openbsd.org2021/12/04 02:09:37 ports/www/ruby-puma/patches Update of /cvs/ports/www/ruby-puma/patches In directory cvs.openbsd.org:/tmp/cvs-serv65016/patches Log Message: Directory /cvs/ports/www/ruby-puma/patches added to the repository
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2021/12/04 01:52:01 Modified files: x11/gnome/yelp-xsl: Makefile distinfo Log message: Update to yelp-xsl-41.1.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2021/12/04 01:50:51 Modified files: textproc/enchant2: Makefile distinfo Log message: Update to enchant2-2.3.2.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2021/12/04 01:44:57 Modified files: misc/hwdata: Makefile distinfo Log message: Update to hwdata-0.354.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2021/12/04 01:14:02 Modified files: print/cups : Makefile distinfo print/cups/patches: patch-Makedefs_in patch-backend_ipp_c patch-config-scripts_cups-common_m4 patch-config-scripts_cups-sharedlibs_m4 patch-cups_Makefile patch-cups_getifaddrs-internal_h patch-scheduler_auth_c patch-scheduler_ipp_c print/cups/pkg : PLIST-libs PLIST-main Removed files: print/cups/patches: patch-config-scripts_cups-compiler_m4 Log message: Update to cups-2.4.0.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2021/12/04 01:13:42 Modified files: lang/vala : Makefile distinfo Log message: Update to vala-0.54.4.
