Re: batch update for fcitx and related pkgs
On Fri, Apr 14, 2023 at 01:13:59AM +, Yifei Zhan wrote: > > > Bringing the fcitx family and opencc up to date, mostly routine translation > updates and bugfixes, no major change. > > Tested on amd64 with gedit/kate/xterm, no issue so far. Any testing, > especially > in the area of the relatively untested hangul/m17n/kkc package is welcomed :) > > (also cc lux who might be interested) Thank you for your diff! A WANTLIB seem to be missing for fcitx 5.0.23: $ make port-lib-depends-check fcitx-5.0.23(inputmethods/fcitx): Missing: z.7 (/usr/local/lib/fcitx5/libemoji.so) (system lib) WANTLIB += z The rest of diffs looks ok. I specifically tested fcitx-m17n with konsole, typed 'Han4yu3 Pin1yin1' to get 'Hànyǔ Pīnyīn'. If there is no objection, I'd like to commit it in a couple of days, thanks. > converters/opencc 1.1.3 -> 1.1.6 > - Language mapping updates > - Bumped major > > inputmethods/xcb-imdkit 1.0.3 -> 1.0.5 > - Bumped major > > inputmethods/fcitx-chinese-addons 5.0.12 -> 5.0.17 > - Language model update > > inputmethods/libime 1.0.11 -> 1.0.17 > inputmethods/fcitx-lua 5.0.5 -> 5.0.10 > inputmethods/fcitx 5.0.15 -> 5.0.23 > inputmethods/fcitx-config-qt 5.0.12 -> 5.0.17 > inputmethods/fcitx-table-extra 5.0.9 -> 5.0.13 > inputmethods/fcitx-qt 5.0.9 -> 5.0.17 > inputmethods/fcitx-gtk 5.0.13 -> 5.0.23 > inputmethods/fcitx-anthy 5.0.10 -> 5.0.14 > inputmethods/fcitx-unikey 5.0.9 -> 5.0.13 > inputmethods/fcitx-hangul 5.0.8 -> 5.0.11 > inputmethods/fcitx-m17n 5.0.8 -> 5.0.11 > inputmethods/fcitx-chewing 5.0.10 -> 5.0.14 > inputmethods/fcitx-kkc 5.0.8 -> 5.0.12 > - Mostly Translations/Icons updates and/or minor bugfixes > > > diff --git a/converters/opencc/Makefile b/converters/opencc/Makefile > index cbae9dbd7..2a4e9768e 100644 > --- a/converters/opencc/Makefile > +++ b/converters/opencc/Makefile > @@ -1,14 +1,13 @@ > COMMENT =convert between traditional and simplified Chinese > > -V = 1.1.3 > +V = 1.1.6 > DISTNAME = opencc-$V > -REVISION = 0 > > GH_ACCOUNT = BYVoid > GH_PROJECT = OpenCC > GH_TAGNAME = ver.$V > > -SHARED_LIBS += opencc0.0 # 1.0 > +SHARED_LIBS += opencc1.0 # 2.0 > > CATEGORIES = converters textproc > > diff --git a/converters/opencc/distinfo b/converters/opencc/distinfo > index f95f2d103..67305bef1 100644 > --- a/converters/opencc/distinfo > +++ b/converters/opencc/distinfo > @@ -1,2 +1,2 @@ > -SHA256 (opencc-1.1.3.tar.gz) = mamviDswTxHzsPbfMNn7QWHxW4SIA/n/nGWpbVnOh38= > -SIZE (opencc-1.1.3.tar.gz) = 2805430 > +SHA256 (opencc-1.1.6.tar.gz) = Fpv/QHH/6BTcFt99GA/2YQ20GPSBbpwM4Cz4dL3wWN8= > +SIZE (opencc-1.1.6.tar.gz) = 3325614 > diff --git a/inputmethods/fcitx-anthy/Makefile > b/inputmethods/fcitx-anthy/Makefile > index 09ddbebc0..9fa6d09c2 100644 > --- a/inputmethods/fcitx-anthy/Makefile > +++ b/inputmethods/fcitx-anthy/Makefile > @@ -1,8 +1,7 @@ > COMMENT =anthy wrapper for fcitx5 > > -V = 5.0.10 > +V = 5.0.14 > PKGNAME =fcitx-anthy-$V > -REVISION = 0 > > GH_ACCOUNT =fcitx > GH_PROJECT =fcitx5-anthy > diff --git a/inputmethods/fcitx-anthy/distinfo > b/inputmethods/fcitx-anthy/distinfo > index 99d49f898..0a6d87d8a 100644 > --- a/inputmethods/fcitx-anthy/distinfo > +++ b/inputmethods/fcitx-anthy/distinfo > @@ -1,2 +1,2 @@ > -SHA256 (fcitx5-anthy-5.0.10.tar.gz) = > CnZnkwwvwu+pkQYNco+QAkeRhe4Ya5HHdFMjEx9lz1g= > -SIZE (fcitx5-anthy-5.0.10.tar.gz) = 99003 > +SHA256 (fcitx5-anthy-5.0.14.tar.gz) = > rOCKrrZFLkxDbW7vq0SHdUMIaLcm6U2nauLC+16w0yQ= > +SIZE (fcitx5-anthy-5.0.14.tar.gz) = 104560 > diff --git a/inputmethods/fcitx-anthy/pkg/PLIST > b/inputmethods/fcitx-anthy/pkg/PLIST > index e7b8d9b9b..2990771f8 100644 > --- a/inputmethods/fcitx-anthy/pkg/PLIST > +++ b/inputmethods/fcitx-anthy/pkg/PLIST > @@ -1,7 +1,4 @@ > -lib/fcitx5/ > @so lib/fcitx5/anthy.so > -share/fcitx5/ > -share/fcitx5/addon/ > share/fcitx5/addon/anthy.conf > share/fcitx5/anthy/ > share/fcitx5/anthy/101kana.sty > @@ -22,18 +19,16 @@ share/fcitx5/anthy/vje-delta.sty > share/fcitx5/anthy/wnn.sty > share/fcitx5/inputmethod/ > share/fcitx5/inputmethod/anthy.conf > -share/icons/ > -share/icons/hicolor/ > -share/icons/hicolor/22x22/ > -share/icons/hicolor/22x22/status/ > +share/icons/hicolor/16x16/apps/fcitx-anthy.png > +share/icons/hicolor/16x16/apps/org.fcitx.Fcitx5.fcitx-anthy.png > +share/icons/hicolor/22x22/apps/fcitx-anthy.png > +share/icons/hicolor/22x22/apps/org.fcitx.Fcitx5.fcitx-anthy.png > share/icons/hicolor/22x22/status/fcitx-anthy-symbol.png > share/icons/hicolor/22x22/status/org.fcitx.Fcitx5.fcitx-anthy-symbol.png > -share/icons/hicolor/48x48/ > -share/icons/hicolor/48x48/status/ > -share/icons/hicolor/48x48/status/fcitx-anthy.png > -share/icons/hicolor/48x48/status/org.fcitx.Fcitx5.fcitx-anthy.png > -share/icons/hicolor/scalable/ > -share/icons/hicolor/scalable/status/ > +share/icons/hicolor/24x24/apps/fcitx-a
Re: UPDATE: ffmpegthumbnailer 2.2.2
Le Sun, Apr 16, 2023 at 10:26:34PM -0400, Brad Smith a écrit : > Here is an update to FFmpegthumbnailer to 2.2.2 + a few bug fixes, but more > importantly > updating for FFmpeg 4 API. > > It has been almost 3 years since 2.2.2 was released and development is quite > slow. It has > been just a handful of small bug fixes since and some FFmpeg API adjustments. > So I have > used the last commit. Fwiw, x11/xfce4/tumbler builds fine with that, and that's the only known consumer i see of ffmpegthumbnailer. Victor, any comments ? Landry
Re: unbreak/update databases/influxdb
Le Sun, Apr 16, 2023 at 10:38:05PM +0100, Chris Narkiewicz a écrit : > I'm impacted by this issue as well and looking for alternative to > InfluxDB. Well, instead of looking for an alternative and paying the cost of migrating, maybe you could test the fix and confirm that it also solves the issue for you ? :) i've uploaded the package i'm now using on my 7.3/amd64 host to https://packages.rhaalovely.net/wip/amd64/influxdb-1.8.10p1.tgz, replace the existing one (or reinstall it) with -r -Dunsigned -Dinstalled and see if it helps.. if so it'll get fixed one way or another in -stable and you'll get a working package at some point. That's exactly the reason why stuff is sent to ports@ for feedback ;) > VictoriaMetrics seems to be a suitable candidate, but it's written > in go as well. > > Does this issue with syscalls impacts all applications written > in golang? They all do some home made syscalls stuff bypassing libc. Some golang stuff do syscalls the right way, some dont, from my understanding depending on the version of x/sys it uses..looking at https://github.com/VictoriaMetrics/VictoriaMetrics/blob/v1.85.0/go.mod#L36 i'm afraid the 1.85.0 version of victoriametrics shipped with 7.3 might have an 'old' x/sys dependency, but one would have to try to figure it out :) Landry
Re: [maintainer update] x11/pekwm-0.3.0
On Sun, Apr 16 2023, Omar Polo wrote:
> On 2023/04/16 09:48:25 +0300, Timo Myyrä wrote:
>> Hi,
>>
>> Here's an update for the pekwm. Briefly tested on amd64.
>
> with this update it uses pangocairo if found at build time. Don't
> have as strong opinion on whether it should be enabled, but being it a
> major improvement of this 0.3.0 I propend to leave it enabled and add
> pangocairo as LDEP.
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/x11/pekwm/Makefile,v
> retrieving revision 1.40
> diff -u -p -r1.40 Makefile
> --- Makefile 11 Mar 2022 20:16:55 - 1.40
> +++ Makefile 16 Apr 2023 07:11:05 -
> @@ -1,7 +1,7 @@
> COMMENT= aewm++ based pretty themable window manager
>
> DISTNAME=pekwm-${V}
> -V= 0.2.1
> +V= 0.3.0
> CATEGORIES= x11
>
> HOMEPAGE=https://www.pekwm.se/
> @@ -12,13 +12,16 @@ MAINTAINER= Timo Myyra PERMIT_PACKAGE= Yes
>
> # uses pledge()
> -WANTLIB += ICE SM X11 Xext Xft Xinerama Xpm Xrandr c freetype jpeg m png
> -WANTLIB += ${COMPILER_LIBCXX}
> +WANTLIB += ${COMPILER_LIBCXX} ICE SM X11 Xext Xft Xinerama Xpm
> +WANTLIB += Xrandr c cairo fontconfig freetype glib-2.0 gobject-2.0
> +WANTLIB += harfbuzz intl jpeg m pango-1.0 pangocairo-1.0 pangoft2-1.0
> +WANTLIB += pangoxft-1.0 png
>
> COMPILER = base-clang ports-gcc base-gcc
>
> MASTER_SITES=
> https://github.com/pekdon/pekwm/releases/download/release-${V}/
> -LIB_DEPENDS= graphics/jpeg \
> +LIB_DEPENDS= devel/pango \
> + graphics/jpeg \
> graphics/png
>
> MODULES= devel/cmake
> Index: distinfo
> ===
> RCS file: /cvs/ports/x11/pekwm/distinfo,v
> retrieving revision 1.14
> diff -u -p -r1.14 distinfo
> --- distinfo 10 Dec 2021 13:35:58 - 1.14
> +++ distinfo 16 Apr 2023 07:11:05 -
> @@ -1,2 +1,2 @@
> -SHA256 (pekwm-0.2.1.tar.gz) = AV5uud/8gW+i1Km4yzRaUolPTcpaAdBhLzAkLbh+DlA=
> -SIZE (pekwm-0.2.1.tar.gz) = 943072
> +SHA256 (pekwm-0.3.0.tar.gz) = l+D101bki5Sj1mLzrwovtp7xvA84LqTF2LufTs5IFiQ=
> +SIZE (pekwm-0.3.0.tar.gz) = 1210295
> Index: patches/patch-CMakeLists_txt
> ===
> RCS file: /cvs/ports/x11/pekwm/patches/patch-CMakeLists_txt,v
> retrieving revision 1.3
> diff -u -p -r1.3 patch-CMakeLists_txt
> --- patches/patch-CMakeLists_txt 11 Mar 2022 20:16:55 - 1.3
> +++ patches/patch-CMakeLists_txt 16 Apr 2023 07:11:05 -
> @@ -1,7 +1,7 @@
> Index: CMakeLists.txt
> --- CMakeLists.txt.orig
> +++ CMakeLists.txt
> -@@ -67,6 +67,7 @@ int main() { std::stof(\"42.0\"); }
> +@@ -81,6 +81,7 @@ int main() { std::stof(\"42.0\"); }
> set(CMAKE_CXX_FLAGS ${orig_CMAKE_CXX_FLAGS})
>
> # Look for platform specific methods
> Index: patches/patch-src_CfgParserSource_cc
> ===
> RCS file: patches/patch-src_CfgParserSource_cc
> diff -N patches/patch-src_CfgParserSource_cc
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-src_CfgParserSource_cc 16 Apr 2023 07:11:05 -
> @@ -0,0 +1,14 @@
> +backport commit fix dd7b96cdcc6e0430b8f737a6fc5287f476476a85
> +
> +Index: src/CfgParserSource.cc
> +--- src/CfgParserSource.cc.orig
> src/CfgParserSource.cc
> +@@ -144,7 +144,7 @@ CfgParserSourceCommand::open(void)
> + std::string path(Util::getEnv("PATH"));
> + path = _command_path + ":" + path;
> + env.override("PATH", path);
> +-execle(PEKWM_SH, PEKWM_SH, "-c", _name.c_str(), nullptr,
> ++execle(PEKWM_SH, PEKWM_SH, "-c", _name.c_str(), NULL,
> +env.getCEnv());
> +
> + ::close (STDOUT_FILENO);
> Index: patches/patch-src_Util_cc
> ===
> RCS file: patches/patch-src_Util_cc
> diff -N patches/patch-src_Util_cc
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-src_Util_cc 16 Apr 2023 07:11:05 -
> @@ -0,0 +1,14 @@
> +backport commit fix dd7b96cdcc6e0430b8f737a6fc5287f476476a85
> +
> +Index: src/Util.cc
> +--- src/Util.cc.orig
> src/Util.cc
> +@@ -191,7 +191,7 @@ namespace Util {
> + case 0:
> + setsid();
> + execlp(PEKWM_SH, PEKWM_SH, "-c", command.c_str(),
> +- static_cast(0));
> ++ NULL);
> + P_ERR("execlp failed: " << strerror(errno));
> + exit(1);
> + case -1:
> Index: patches/patch-src_pekwm_cc
> ===
> RCS file: patches/patch-src_pekwm_cc
> diff -N patches/patch-src_pekwm_cc
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-src_pekwm_cc16 Apr 2023 07:11:05 -
> @@ -0,0 +1,14 @@
> +backport commit fix dd7b96cdcc6e0430b8f737a6fc5287f
Re: [security-update] editors/emacs.28.2
On Sun, 2023-04-16 at 23:58 +0200, Jeremie Courreges-Anglas wrote: > The .desktop patch is so ugly. Yes, I can only think of it as ASCII art..
UPDATE: ffmpegthumbnailer 2.2.2
Here is an update to FFmpegthumbnailer to 2.2.2 + a few bug fixes, but more
importantly
updating for FFmpeg 4 API.
It has been almost 3 years since 2.2.2 was released and development is quite
slow. It has
been just a handful of small bug fixes since and some FFmpeg API adjustments.
So I have
used the last commit.
FFmpegThumbnailer 2.2.2
- Removed unstable continuous thumbnail creation
FFmpegThumbnailer 2.2.1
- CMake improvements: required CMake version is now 3.5 or newer
- Fix anamorphic height (thanks to cmrd-senya)
- Fix libffmpegthumbnailer.pc to work with multilib systems (thanks to orbea)
- Fix rotation of 180?? rotated videos (thanks to munzli)
- Fix prefer_embedded_metadata in c api (thanks to aedis)
- Fix crash when setting a log callback using the c api
- Check for https as well when skipping stat call (thanks to HearstCorp)
- Support specifying the size as string using the c api
- Support raw rgb data as image type
- Print warnings on stderr instead of stdout
- Support for continuous thumbnail creation
Index: Makefile
===
RCS file: /home/cvs/ports/graphics/ffmpegthumbnailer/Makefile,v
retrieving revision 1.36
diff -u -p -u -p -r1.36 Makefile
--- Makefile11 Mar 2022 19:22:18 - 1.36
+++ Makefile17 Apr 2023 02:07:48 -
@@ -2,15 +2,15 @@ COMMENT= lightweight video thumbnailer f
CATEGORIES=graphics multimedia
+DISTNAME= ffmpegthumbnailer-2.2.2
+REVISION= 0
GH_ACCOUNT=dirkvdb
GH_PROJECT=ffmpegthumbnailer
-GH_TAGNAME=2.2.0
+GH_COMMIT= c2fba253f3751f9bb825defec66109e5d33c74d6
-SHARED_LIBS= ffmpegthumbnailer 5.0
+SHARED_LIBS= ffmpegthumbnailer 6.0
HOMEPAGE= https://github.com/dirkvdb/ffmpegthumbnailer
MAINTAINER=Victor Kukshiev
-MASTER_SITES=
https://github.com/dirkvdb/ffmpegthumbnailer/releases/download/${GH_TAGNAME}/
-EXTRACT_SUFX= .tar.bz2
# GPLv2+
PERMIT_PACKAGE=Yes
Index: distinfo
===
RCS file: /home/cvs/ports/graphics/ffmpegthumbnailer/distinfo,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 distinfo
--- distinfo15 Dec 2017 21:11:42 - 1.8
+++ distinfo17 Apr 2023 01:27:24 -
@@ -1,2 +1,2 @@
-SHA256 (ffmpegthumbnailer-2.2.0.tar.bz2) =
5cMSmdBkloGYzTePdIjlLNXnOPrJmO6ngLx31/MiOMI=
-SIZE (ffmpegthumbnailer-2.2.0.tar.bz2) = 1223895
+SHA256 (ffmpegthumbnailer-2.2.2-c2fba253.tar.gz) =
jtpkocpAgJhWZHBB58VVblsqA/7EPggSzt+KjpXtfTc=
+SIZE (ffmpegthumbnailer-2.2.2-c2fba253.tar.gz) = 1291683
Index: patches/patch-CMakeLists_txt
===
RCS file: patches/patch-CMakeLists_txt
diff -N patches/patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt11 Mar 2022 19:22:18 - 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,13 +0,0 @@
- upstream pulll request: https://github.com/dirkvdb/ffmpegthumbnailer/pull/163
-Index: CMakeLists.txt
CMakeLists.txt.orig
-+++ CMakeLists.txt
-@@ -178,7 +178,7 @@ IF (ENABLE_SHARED)
- ADD_LIBRARY(libffmpegthumbnailer SHARED ${LIB_SRC_LIST})
- TARGET_LINK_LIBRARIES(libffmpegthumbnailer ${FFMPEGTHUMBNAILER_LIBRARIES})
- SET_TARGET_PROPERTIES(libffmpegthumbnailer PROPERTIES
--PREFIX ""
-+OUTPUT_NAME ffmpegthumbnailer
- VERSION
${FFMPEGTHUMBNAILER_SOVERSION_CURRENT}.${FFMPEGTHUMBNAILER_SOVERSION_REVISION}.${FFMPEGTHUMBNAILER_SOVERSION_AGE}
- SOVERSION ${FFMPEGTHUMBNAILER_SOVERSION_CURRENT}
- PUBLIC_HEADER "${LIB_HDRS}"
Upgrade x11/xmobar-{0.43->0.46}
A fairly simple upgrade, I'm running it now.
OK?
>From a1df423d7323c48f142c6ddc9d722a43678884a4 Mon Sep 17 00:00:00 2001
From: Greg Steuck
Date: Sun, 16 Apr 2023 00:14:09 -0700
Subject: [PATCH] Upgrade x11/xmobar-{0.43->0.46}
---
x11/xmobar/Makefile | 145
x11/xmobar/distinfo | 350 ++
..._xmobar_config => patch-etc_xmobar_config} | 18 +-
x11/xmobar/patches/patch-xmobar_cabal | 4 +-
4 files changed, 278 insertions(+), 239 deletions(-)
rename x11/xmobar/patches/{patch-examples_xmobar_config =>
patch-etc_xmobar_config} (73%)
diff --git a/x11/xmobar/Makefile b/x11/xmobar/Makefile
index 15500bfbc32..cb673556a9a 100644
--- a/x11/xmobar/Makefile
+++ b/x11/xmobar/Makefile
@@ -2,7 +2,7 @@ COMMENT = minimalistic text based status bar
REVISION = 0
MODCABAL_STEM =xmobar
-MODCABAL_VERSION = 0.43
+MODCABAL_VERSION = 0.46
CATEGORIES = x11
HOMEPAGE = https://xmobar.org
@@ -21,117 +21,130 @@ MODCABAL_FLAGS = with_xft with_mpd with_mpris
with_inotify
# % cabal v2-configure --flags="with_xft with_mpd with_mpris with_inotify"
# % cabal-bundler --openbsd xmobar -p ./dist-newstyle/cache/plan.json
MODCABAL_MANIFEST = \
- OneTuple0.3.1 2 \
+ OneTuple0.4.1.1 0 \
QuickCheck 2.14.2 0 \
StateVar1.2.2 0 \
- X11 1.10.2 0 \
+ X11 1.10.3 0 \
X11-xft 0.3.4 0 \
- adjunctions 4.4.1 0 \
- aeson 2.0.3.0 0 \
+ adjunctions 4.4.2 1 \
+ aeson 2.1.2.1 3 \
+ alex3.2.7.3 0 \
appar 0.1.8 0 \
asn1-encoding 0.9.6 2 \
asn1-parse 0.9.5 0 \
asn1-types 0.3.4 0 \
- assoc 1.0.2 2 \
- async 2.2.4 1 \
- attoparsec 0.14.4 1 \
- base-compat 0.12.1 0 \
- base-compat-batteries 0.12.1 2 \
- base-orphans0.8.6 0 \
+ assoc 1.1 0 \
+ async 2.2.4 3 \
+ attoparsec 0.14.4 3 \
+ base-compat 0.13.0 0 \
+ base-compat-batteries 0.13.0 0 \
+ base-orphans0.9.0 0 \
base64-bytestring 1.2.1.0 0 \
- basement0.0.14 0 \
- bifunctors 5.5.12 0 \
+ basement0.0.15 0 \
+ bifunctors 5.6.1 0 \
+ bitvec 1.1.4.0 0 \
blaze-builder 0.4.2.2 1 \
blaze-html 0.9.1.2 2 \
- blaze-markup0.8.2.8 2 \
+ blaze-markup0.8.2.8 4 \
byteorder 1.0.4 0 \
- cabal-doctest 1.0.9 1 \
+ cabal-doctest 1.0.9 3 \
+ cairo 0.13.8.20 \
call-stack 0.4.0 0 \
case-insensitive1.2.1.0 0 \
- cereal 0.5.8.2 1 \
+ cereal 0.5.8.3 0 \
+ colour 2.3.6 0 \
comonad 5.0.8 1 \
- conduit 1.3.4.2 0 \
+ conduit 1.3.4.3 1 \
conduit-extra 1.3.6 0 \
connection 0.3.1 1 \
contravariant 1.5.5 0 \
- cookie 0.4.5 0 \
+ cookie 0.4.6 0 \
cryptonite 0.300 \
+ data-array-byte 0.1.0.1 1 \
data-default-class 0.1.2.0 0 \
- data-fix0.3.2 2 \
- dbus1.2.24 0 \
+ data-fix0.3.2 4 \
+ dbus1.2.28 0 \
distributive0.6.2.1 1 \
dlist 1.0 0 \
extensible-exceptions 0.1.1.4 0 \
- free5.1.8 0 \
- hashable1.4.0.2 0 \
+ foldable1-classes-compat0.1 2 \
+ free5.2 1 \
+ generically 0.1.1 1 \
+ glib0.13.8.20 \
+ gtk2hs-buildtools 0.13.8.30 \
+ happy 1.20.1.10 \
+ hashable1.4.2.0 1 \
+ hashtables 1.3.1 0 \
hinotify0.4.1 0 \
hourglass 0.2.12 0 \
- hsc2hs 0.68.8 0 \
- http-client 0.7.11 1 \
+ hsc2hs 0.68.9 0 \
+ http-client 0.7.13.11 \
http-client-tls 0.3.6.1 0 \
http-conduit2.3.8 0 \
http-types 0.12.3 0 \
- indexed-traversable 0.1.2 1 \
- indexed-traversable-instances 0.1.1 0 \
- integer-logarithms 1.0.3.1 2 \
- invariant 0.5.6 0 \
+ indexed-traversable 0.1.2.1 0 \
+ indexed-traversable-instances 0.1.1.
Re: [security-update] editors/emacs.28.2
On Sun, Apr 16 2023, lux wrote: > Hi, these patches fix CVE-2023-28617, CVE-2023-27985 and CVE-2023- > 27986. > > The release of Emacs 28.3 has hit some snags[1], and I don't think it > will be released anytime soon (will not even release), so I'll submit > the security patch first. > > - [1] > https://lists.gnu.org/archive/html/emacs-devel/2023-04/msg00262.html Thanks for this. The .desktop patch is so ugly. One would think that emacs would have grown a way to cleanly pass a command-line argument to a lisp function... -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: unbreak/update databases/influxdb
I'm impacted by this issue as well and looking for alternative to
InfluxDB.
VictoriaMetrics seems to be a suitable candidate, but it's written
in go as well.
Does this issue with syscalls impacts all applications written
in golang? They all do some home made syscalls stuff bypassing libc.
Cheers,
Chris
On Sun, 2023-04-16 at 19:11 +0200, Landry Breuil wrote:
> Hi,
>
> spent some days fixin' influxdb which currently badly crashes at
> startup
> on 7.3 with SIGSYS, due to go and syscalls *sigh*.
>
> diffs attached:
> - influxdb-1.8.10-stable.diff is for 7.3 and 'only' updates x/sys to
> 0.5.0, i've it running fine on my 7.3/amd64 vm receiving metrics
> from all the
> telegraf instances running on various boxes. That's the 'minimal'
> fix.
>
> - influxdb-1.11.0.diff updates it to the latest version of the 1.11.0
> branch, backporting the x/sys update to 0.5.0 extracted from
> https://github.com/influxdata/influxdb/commit/906c090a48c807bc1799f62c849ce30793566e76
> - note that this port is now using go *and* rust, so i've kept the
> build system
> in control of go, just letting it run the cargo build commands to
> build the
> 'libflux' bits from
> https://github.com/influxdata/flux/tree/master/libflux -
> feedback welcome on the porting bits, some might be horrible (note
> the
> overloading of a 'pkg-config.sh' script..among others)
>
> - and while here i've ported the latest version of the 2 branch,
> 2.7.0, also
> using go and rust. v2 is a bit different, doesnt ship a default
> config file
> nor the 'influx' cli, requires authentification, doesnt have the udp
> listener
> that collectd/prometheus/graphite could use to directly send metrics
> to
> influxdb, those have to go through telegraf now (!?). see
> https://docs.influxdata.com/influxdb/v2.7/upgrade/v1-to-v2/automatic-upgrade/#supported-protocols
> for details, but i'd be wary of force-updating everyone using
> influxdb v1 to
> v2. Maybe it'd make sense to have both ports coexist ? feedback from
> actual
> influxdb users welcome.
>
> to be able to set EXTRACT_ONLY in the last two ports, i have this
> local patch:
>
> Index: go.port.mk
> ===
> RCS file: /cvs/ports/lang/go/go.port.mk,v
> retrieving revision 1.55
> diff -u -r1.55 go.port.mk
> --- go.port.mk 28 Feb 2023 15:44:54 - 1.55
> +++ go.port.mk 16 Apr 2023 16:58:39 -
> @@ -76,7 +76,7 @@
> ALL_TARGET ?= ${MODGO_MODNAME}
> MODGO_FLAGS += -modcacherw -trimpath
> DISTFILES +=
> ${DISTNAME_ESC}{${MODGO_VERSION}}${EXTRACT_SUFX}
> -EXTRACT_ONLY = ${DISTNAME_ESC}${EXTRACT_SUFX}
> +EXTRACT_ONLY ?= ${DISTNAME_ESC}${EXTRACT_SUFX}
> MASTER_SITES ?=
> ${MASTER_SITE_ATHENS}${MODGO_MODNAME_ESC}/@v/
> . for _modpath _modver in ${MODGO_MODULES}
> DISTFILES +=
> ${MODGO_DIST_SUBDIR}/{}${_modpath}/@v/${_modver}.zip:${MODGO_MASTER_S
> ITESN}
>
> this will run through a bulk. jsing@ is okay with it, still being
> discussed
> wether it should be += or ?=.
>
> oks and feedback on all this welcome. Phew.
--
+44 7502 415 180 (Phone, Signal, WhatsApp)
@ezaquarii:etacassiopeiae.net (Matrix)
Re: neovim and treesitter updates
On Sat, Apr 15, 2023 at 08:33:56PM +0100, Edd Barrett wrote:
> Diffs attached.
Sorry, I kludged the neovim diff.
Since this version of neovim uses a non-release version of luv, we don't get
the bundled luacompat53 from the luv tarball and we have to fetch it ourself.
Note that there is no build step for luacompat53. The luv build just plucks
files from the luacompat53 sources...
Updated neovim diff below. The treesitter diff from my last mail is still good.
Index: Makefile
===
RCS file: /cvs/ports/editors/neovim/Makefile,v
retrieving revision 1.33
diff -u -p -r1.33 Makefile
--- Makefile20 Feb 2023 21:53:19 - 1.33
+++ Makefile16 Apr 2023 20:32:20 -
@@ -13,21 +13,24 @@ COMMENT = continuation and extension of
GH_ACCOUNT = neovim
GH_PROJECT = neovim
-GH_TAGNAME = v0.8.3
+GH_TAGNAME = v0.9.0
CATEGORIES = editors devel
HOMEPAGE = https://neovim.io
MAINTAINER = Edd Barrett
# The versions listed here must match those in cmake.deps/CMakeLists.txt.
-LUV_VER = 1.44.2-1
-LUAJIT_VER = 633f265f67f322cbe2c5fd11d3e46d968ac220f7
+LUV_VER = 093a977b82077591baefe1e880d37dfa2730bd54
+LUAJIT_VER = 505e2c03de35e2718eef0d2d3660712e06dadf1f
+LUACOMPAT_VER =v0.9
-MASTER_SITES0 =
https://github.com/luvit/luv/releases/download/${LUV_VER}/
+MASTER_SITES0 =https://github.com/luvit/luv/archive/
MASTER_SITES1 = https://github.com/LuaJIT/LuaJIT/archive/
+MASTER_SITES2 = https://github.com/keplerproject/lua-compat-5.3/archive/
DISTFILES =${DISTNAME}${EXTRACT_SUFX} \
- luv-${LUV_VER}${EXTRACT_SUFX}:0 \
- luajit-{}${LUAJIT_VER}${EXTRACT_SUFX}:1
+ luv-{}${LUV_VER}${EXTRACT_SUFX}:0 \
+ luajit-{}${LUAJIT_VER}${EXTRACT_SUFX}:1 \
+ lua-compat-5.3-{}${LUACOMPAT_VER}${EXTRACT_SUFX}:2
# Neovim: Apache 2.0 + Vim License
# LuaJIT: MIT + public domain
@@ -65,7 +68,7 @@ LIB_DEPENDS = devel/gettext,-runtime \
devel/libvterm \
devel/msgpack \
devel/unibilium \
- textproc/tree-sitter
+ textproc/tree-sitter>=0.20.8
RUN_DEPENDS += devel/libmpack/lua \
devel/libmpack/main \
@@ -87,6 +90,7 @@ CONFIGURE_ARGS += -DPREFER_LUA=ON \
-DLUA_INCLUDE_DIR=${MODLUA_INCL_DIR} \
-DLUA_LIBRARIES=${MODLUA_LIB}
.endif
+MAKE_ENV = CCACHE_DISABLE=true
# Tests need gmake
USE_GMAKE = Yes
@@ -104,6 +108,8 @@ post-extract:
mkdir ${STATIC_DEPS_WRKSRC}
mv ${WRKDIR}/LuaJIT-${LUAJIT_VER} ${STATIC_DEPS_WRKSRC}/luajit
mv ${WRKDIR}/luv-${LUV_VER} ${STATIC_DEPS_WRKSRC}/luv
+ mv ${WRKDIR}/lua-compat-5.3-${LUACOMPAT_VER:C/^v//} \
+ ${STATIC_DEPS_WRKSRC}/lua-compat-5.3
# Build LuaJIT (if required) and libluv as static libraries.
#
@@ -161,6 +167,8 @@ pre-configure:
-DLUA_BUILD_TYPE=System \
-DLUA_INCLUDE_DIR=${MODLUA_INCL_DIR} \
-DLUA_LIBRARIES=${MODLUA_LIBDIR} \
+ -DWITH_SHARED_LIBUV=ON \
+ -DLUA_COMPAT53_DIR=${STATIC_DEPS_WRKSRC}/lua-compat-5.3 \
-DWITH_LUA_ENGINE=Lua \
${STATIC_DEPS_WRKSRC}/luv
cd ${STATIC_DEPS_WRKBUILD}/luv && \
@@ -182,7 +190,7 @@ pre-configure:
do-test:
true
${SETENV} LC_CTYPE=en_US.UTF-8 \
- ${MAKE_PROGRAM} -C ${WRKSRC}/src/nvim/testdir \
+ ${MAKE_PROGRAM} -C ${WRKSRC}/test/old/testdir \
HOME=${WRKBUILD} NVIM_PRG=${WRKBUILD}/bin/nvim ${MAKE_FLAGS}
.include
Index: distinfo
===
RCS file: /cvs/ports/editors/neovim/distinfo,v
retrieving revision 1.18
diff -u -p -r1.18 distinfo
--- distinfo20 Feb 2023 21:53:19 - 1.18
+++ distinfo16 Apr 2023 20:12:41 -
@@ -1,6 +1,8 @@
-SHA256 (luajit-633f265f67f322cbe2c5fd11d3e46d968ac220f7.tar.gz) =
JoHwpvYkpkqN+3Clo3fUlNrziWBELFR9nEaGdMGvo8I=
-SHA256 (luv-1.44.2-1.tar.gz) = PrXHvET2H7xBSOow4yIdQQJj4P+ihWcoUfwZ3r+eXDA=
-SHA256 (neovim-0.8.3.tar.gz) = rfRf8WDh2J9Rm2EUcy66A0ha5Gm+snkZsPek9rRCM8E=
-SIZE (luajit-633f265f67f322cbe2c5fd11d3e46d968ac220f7.tar.gz) = 1074237
-SIZE (luv-1.44.2-1.tar.gz) = 1465728
-SIZE (neovim-0.8.3.tar.gz) = 11406282
+SHA256 (lua-compat-5.3-v0.9.tar.gz) =
rQVUDS2WpIclu3mh3vNc9mUqTi7CY3biYXyM4rqm9BY=
+SHA256 (luajit-505e2c03de35e2718eef0d2d3660712e06dadf1f.tar.gz) =
Z8iDmbkBoi6aI29Ld+b+Oa8A9rcUTOndb1EUHZIfEHY=
+SHA256 (luv-093a977b82077591baefe1e880d37dfa2730bd54.tar.gz) =
Iis4tkJfCSYhjhTn2oFIH93m+WYMH+rCWlPm+1LohuY=
+SHA256 (neovim-0.9.0.tar.gz) = OdeRB8VNLzurytLNFXw5kkHAT2516YwY6K+vK7XoKTc=
+SIZE (lua-compat-5.3-v0.9.tar.gz) = 53599
+SIZE (luajit-505e2c03de35e2718eef0d2d3660712e06dadf1f.tar.gz) = 1075264
+SIZE (luv-093a977b82077591baefe1e88
UPDATE www/nginx-1.24.0
Diff below updates nginx to 1.24.0, which is the latest stable release.
Overview on changes can be found at http://nginx.org/en/CHANGES-1.24.
Switched pcre to pcre2 now to naxsi HEAD supports this. Updated
headers-more-nginx-module to a newer version because nginx >1.23.0
changed handling of multiple headers. Added 2 patches for
lua-nginx-module because of the header change.
Lightly run test, with a simple config, on am64.
Comments/OK?
diff --git Makefile Makefile
index cc6eed8f6ff..fb79699f981 100644
--- Makefile
+++ Makefile
@@ -15,7 +15,7 @@ COMMENT-passenger=nginx passenger (ruby/python/nodejs)
integration module
COMMENT-rtmp= nginx module for RTMP streaming
COMMENT-securelink=nginx HMAC secure link module
-VERSION= 1.22.0
+VERSION= 1.24.0
DISTNAME= nginx-${VERSION}
CATEGORIES=www
@@ -36,8 +36,6 @@ PKGNAME-passenger=nginx-passenger-${VERSION}
PKGNAME-rtmp= nginx-rtmp-${VERSION}
PKGNAME-securelink=nginx-securelink-${VERSION}
-REVISION-main= 0
-
ONLY_FOR_ARCHS-passenger= aarch64 amd64 arm i386
MASTER_SITES= https://nginx.org/download/
@@ -48,9 +46,9 @@ MASTER_SITES1=
https://raw.githubusercontent.com/rnagy/nginx_chroot_patch/master
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
_GH_MODS= \
- openresty headers-more-nginx-module v0.33 \
+ openresty headers-more-nginx-module v0.34 \
openresty lua-nginx-modulev0.10.11 \
- nbs-system naxsi 1.3 \
+ nbs-system naxsi
d714f1636ea49a9a9f4f06dba14aee003e970834 \
kvspb nginx-auth-ldap
83c059b73566c2ee9cbda920d91b66657cf120b7 \
arutnginx-rtmp-module v${VERSION-rtmp} \
simpl ngx_devel_kit v0.3.0 \
@@ -81,7 +79,7 @@ COMPILER =base-clang ports-gcc base-gcc
.include
-WANTLIB-main= c z pcre ssl crypto
+WANTLIB-main= c crypto pcre2-8 ssl z
WANTLIB-mailproxy=
WANTLIB-stream=
WANTLIB-image_filter= gd
@@ -96,7 +94,7 @@ WANTLIB-perl= c m perl
WANTLIB-passenger= m pthread ${COMPILER_LIBCXX}
WANTLIB-securelink=crypto
-LIB_DEPENDS-main= devel/pcre
+LIB_DEPENDS-main= devel/pcre2
LIB_DEPENDS-xslt= textproc/libxml \
textproc/libxslt
LIB_DEPENDS-image_filter=graphics/gd
@@ -182,7 +180,6 @@ CONFIGURE_ARGS+=--prefix=${NGINX_DIR} \
--with-stream=dynamic \
--with-stream_ssl_module \
--with-stream_ssl_preread_module \
- --without-pcre2 \
--add-dynamic-module=${WRKSRC}/naxsi/naxsi_src/ \
--add-dynamic-module=${WRKSRC}/ngx_devel_kit \
--add-dynamic-module=${WRKSRC}/headers-more-nginx-module \
diff --git distinfo distinfo
index 92e4cc852ed..f508a39a69d 100644
--- distinfo
+++ distinfo
@@ -1,18 +1,18 @@
-SHA256 (headers-more-nginx-module-v0.33.tar.gz) =
o9y6sRepwQO8HqUgD8AKe30q+X/3/VJfFvisJjLjD78=
+SHA256 (headers-more-nginx-module-v0.34.tar.gz) =
DA0s7SzolbP0XrKyMM2QUIqyp3MpnxU94UpD5EwSCbM=
SHA256 (lua-nginx-module-v0.10.11.tar.gz) =
wPuR/P0cbn3sNMpkgm74H/66/e9hdNJURnY284BWZiY=
-SHA256 (naxsi-1.3.tar.gz) = Q5yGdzctJZe0Ngu8wQvIZJDeH8dWlbGTrV3xVKIU1ig=
+SHA256 (naxsi-d714f1636ea49a9a9f4f06dba14aee003e970834.tar.gz) =
2+IXdBFFfxy6mO5Gc84xh2mUrQa9zl7MDuZjhO8OQg4=
SHA256 (nginx-1.20.1-chroot.patch) =
SS1TB0j8N4/dn5pUTGT6WvkN3aAUuKz5+R0Nt+MG0gk=
-SHA256 (nginx-1.22.0.tar.gz) = sz1Wmm8RoBQzpXzhfoOTXpU61Nx3zdTUD4lsiKwm61M=
+SHA256 (nginx-1.24.0.tar.gz) = d6JUFje5KmIePudndsi3tAz21wfmm6U6lAKD4w/y9V0=
SHA256 (nginx-auth-ldap-83c059b73566c2ee9cbda920d91b66657cf120b7.tar.gz) =
aQxOW9sq4ZsP7nXNNW0YATRo20cmFrYJeloLvjRshGQ=
SHA256 (nginx-rtmp-module-v1.2.1.tar.gz) =
h6pZdACwtaBSdO4tI9jLgiThJoYiegq+MdeDs6ZF6jc=
SHA256 (ngx_devel_kit-v0.3.0.tar.gz) =
iOBamainQZBm9a51lm+x78QJutRSLRSYbaB0VUrmFhk=
SHA256 (ngx_http_geoip2_module-3.3.tar.gz) =
QTeEOMgz4xOhiGnQxKcnBLSDXDCsr3/WgBOrZzL/eKc=
SHA256
(ngx_http_hmac_secure_link_module-48c4625fbbf51ed5a95bfec23fa444f6c3702e50.tar.gz)
= ZXpA2rODS1enIREzlD1OqWwpWcv3NOUXH4eUOgOAmqg=
-SIZE (headers-more-nginx-module-v0.33.tar.gz) = 28130
+SIZE (headers-more-nginx-module-v0.34.tar.gz) = 28827
SIZE (lua-nginx-module-v0.10.11.tar.gz) = 616653
-SIZE (naxsi-1.3.tar.gz) = 235626
+SIZE (naxsi-d714f1636ea49a9a9f4f06dba14aee003e970834.tar.gz) = 237272
SIZE (nginx-1.20.1-chroot.patch) = 8783
-SIZE (nginx-1.22.0.tar.gz) = 1073322
+SIZE (nginx-1.24.0.tar.gz) = 1112471
SIZE (nginx-auth-ldap-83c059b73566c2ee9cbda920d91b66657cf120b7.tar.gz) = 18542
SIZE (nginx-rtmp-module-v1.2.1.tar.gz) = 519919
SIZE (ngx_devel_kit-v0.3.0.tar.gz) = 66455
diff --git patches/patch-lua-nginx-module_src_ngx_http_lua_headers_in_c
patches/patch-lua-nginx-module_src_ngx_http_lua_headers
Re: [new] sysutils/awscliv2, devel/py-awscrt
On 2023/04/16 10:20, Joel Knight wrote: > On Sat, Apr 15, 2023 at 6:47 AM Stuart Henderson wrote: > > > > On 2023/04/15 13:45, Antoine Jacoutot wrote: > > > > > > Hi. > > > > > > A few things: > > Thanks, both, for the review. New tarball attached. > > py-awscrt: > > - Put a comment on USE_NOEXECONLY > - Switched MODPY_SETUPTOOLS -> MODPY_PYBUILD > - Added FLAVOR* > - Updated plist > - Removed ONLY_FOR_ARCHS > - Two new patch files included which allow building on arm64 > > awscliv2: > > - Bumped py-prompt_toolkit max version in RUN_DEPENDS > - Removed the patch-pyproject_toml patch file altogether since the > prompt-toolkit version bump upstream is now satisfied by the version > in ports > - Switched from DISTNAME to PKGNAME (default DISTNAME is sane) > - Set PKGNAME base to ‘awscli’ (I like this and agree with the 'better > discoverability' comment) > - Added @comment is-branch > - Got rid of $V > - Did not do the FLAVOR* changes > - Removed ONLY_FOR_ARCHS > > > > - if llvm is installed, the wrong ar is used by py-awscrt > > > -- CMAKE_AR found: /usr/local/bin/llvm-ar > > > > This is because it's not using standard ports build arguments for > > cmake as would be used by the cmake module (there are a bunch of > > CONFIGURE_ARGS lines to override various detected paths and other > > settings). > > > > The cc command lines are hidden in the output but I bet they are not > > using proper CFLAGS etc too. > > > > Not sure the best way to deal with this, but ideally it would use > > things from cmake.port.mk directly somehow rather than having to > > replicate and sync when things change.. > > When building s2n, one of the vendored deps in awscrt, cmake finds > /usr/local/bin/llvm-ar. I don’t know why it's preferring that over > what's in base. What are the implications of that? It is finding that because it's not using the CONFIGURE_ARGS that are normally passed from cmake.port.mk to cmake. The implications are that 1) it will randomly fail in bulk builds and 2) there are probably some other things which are setup by cmake.port.mk which are also missing.
Re: help creating new port: x11/xfce4/xfce4-docklike
Le 16/04/2023 à 18:21, Landry Breuil a écrit : Le Fri, Apr 14, 2023 at 09:49:38AM +0200, Joel Carnat a écrit : Only the Exec part: # diff /usr/local/share/applications/firefox.desktop ~/.local/share/applications/firefox.desktop 153c153 < Exec=firefox %u --- Exec=firefox-default %u 200c200 < Exec=firefox -new-window --- Exec=firefox-default -new-window 219c219 < Exec=firefox -private-window --- Exec=firefox-default -private-window Sorry, but i dont think that makes sense. Unless there's a 'firefox-default' script/wrapper in your $PATH, i doubt that can work. or the /usr/local/share/applications/firefox.desktop file takes precedence because ~/.local/share/applications/firefox.desktop has an invalid entry for Exec Well, I have no clue why it works. It just does (here) :D I can even open ~/.local/share/applications/firefox.desktop, replace "Exec=firefox-default %u" with "Exec=firefox %u", save the file, and the icon changes on docklike. Reversing the change makes the icon appear on docklike. (oh, and diff -u is always more readable ;) sorry for that. you'd have told me firefox --class=firefox to override the default 'wm class' set to 'firefox-default', i'd have understood.. Anyway, for firefox, to my understanding this comes from https://bugzilla.mozilla.org/show_bug.cgi?id=1530052. To be investigated. I copied /usr/local/share/applications/xfce4-terminal.desktop into ~/.local/share/applications/xterm.desktop, remove a bunch of translations I don't use and modify the Exec part: # cat ~/.local/share/applications/xterm.desktop ok but that's a different issue, there's no 'default' desktop file for xterm. not xfce4-docklike problems :) Yes, you're right. I was surprised because xfce/tasklist did apply an icon to xterm even without a desktop file. But I found tasklist would use the info from the XTerm*iconHint xresource, whereas docklike didn't. That's why I thought it was docklike's fault.
Re: help creating new port: x11/xfce4/xfce4-docklike
Le 16/04/2023 à 18:16, Landry Breuil a écrit : Le Fri, Apr 14, 2023 at 10:01:43AM +0200, Joel Carnat a écrit : Le 14/04/2023 à 09:06, Landry Breuil a écrit : Le Thu, Apr 13, 2023 at 06:30:15PM +0200, Joel Carnat a écrit : Le 20/02/2023 à 10:19, Joel Carnat a écrit : Hi, nice, two comments: - no need for CONFIGURE_STYLE, its set by x11/xfce4/Makefile.inc I added it to solve an issue where "make build" would not work without it: ===> Building for xfce4-docklike-0.4.1 gmake: Makefile: No such file or directory gmake: *** No rule to make target 'Makefile'. Stop. *** Error 2 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2960 '/usr/ports/pobj/xfce4-docklike-0.4.1/.build_done': @cd /usr/ports/pobj/xfce...) *** Error 2 in /usr/ports/mystuff/x11/xfce4/xfce4-docklike (/usr/ports/infrastructure/mk/bsd.port.mk:2600 'build': @lock=xfce4-docklike-0.4) I saw that x11/xfce4/xfce4-whiskermenu had it set (to some other parameter) and other ports used "gnu" as an value. So I tried and it compiled this way. But maybe it's not the right way to solve this particular issue. I think your issue (and the fact that distinfo didnt have the xfce4/ prefix for the distfile path) stems from your creation of a port in mystuff/x11/xfce4 without having copied x11/xfce4/Makefile.inc to mystuff/x11/xfce4 - thus CONFIGURE_STYLE & DIST_SUBDIR werent set by the missing Makefile.inc Yes, this has solved the error. Thanks. Here's the updated tarball in case you want it. Joel C. xfce4-docklike.tar.gz Description: application/gzip
Re: help creating new port: x11/xfce4/xfce4-docklike
Le Fri, Apr 14, 2023 at 09:49:38AM +0200, Joel Carnat a écrit : > > Only the Exec part: > # diff /usr/local/share/applications/firefox.desktop > ~/.local/share/applications/firefox.desktop > 153c153 > < Exec=firefox %u > --- > > Exec=firefox-default %u > 200c200 > < Exec=firefox -new-window > --- > > Exec=firefox-default -new-window > 219c219 > < Exec=firefox -private-window > --- > > Exec=firefox-default -private-window Sorry, but i dont think that makes sense. Unless there's a 'firefox-default' script/wrapper in your $PATH, i doubt that can work. or the /usr/local/share/applications/firefox.desktop file takes precedence because ~/.local/share/applications/firefox.desktop has an invalid entry for Exec (oh, and diff -u is always more readable ;) you'd have told me firefox --class=firefox to override the default 'wm class' set to 'firefox-default', i'd have understood.. Anyway, for firefox, to my understanding this comes from https://bugzilla.mozilla.org/show_bug.cgi?id=1530052. To be investigated. > I copied /usr/local/share/applications/xfce4-terminal.desktop into > ~/.local/share/applications/xterm.desktop, remove a bunch of translations I > don't use and modify the Exec part: > # cat ~/.local/share/applications/xterm.desktop ok but that's a different issue, there's no 'default' desktop file for xterm. not xfce4-docklike problems :)
Re: [new] sysutils/awscliv2, devel/py-awscrt
On Sat, Apr 15, 2023 at 6:47 AM Stuart Henderson wrote: > > On 2023/04/15 13:45, Antoine Jacoutot wrote: > > > > Hi. > > > > A few things: Thanks, both, for the review. New tarball attached. py-awscrt: - Put a comment on USE_NOEXECONLY - Switched MODPY_SETUPTOOLS -> MODPY_PYBUILD - Added FLAVOR* - Updated plist - Removed ONLY_FOR_ARCHS - Two new patch files included which allow building on arm64 awscliv2: - Bumped py-prompt_toolkit max version in RUN_DEPENDS - Removed the patch-pyproject_toml patch file altogether since the prompt-toolkit version bump upstream is now satisfied by the version in ports - Switched from DISTNAME to PKGNAME (default DISTNAME is sane) - Set PKGNAME base to ‘awscli’ (I like this and agree with the 'better discoverability' comment) - Added @comment is-branch - Got rid of $V - Did not do the FLAVOR* changes - Removed ONLY_FOR_ARCHS > > - if llvm is installed, the wrong ar is used by py-awscrt > > -- CMAKE_AR found: /usr/local/bin/llvm-ar > > This is because it's not using standard ports build arguments for > cmake as would be used by the cmake module (there are a bunch of > CONFIGURE_ARGS lines to override various detected paths and other > settings). > > The cc command lines are hidden in the output but I bet they are not > using proper CFLAGS etc too. > > Not sure the best way to deal with this, but ideally it would use > things from cmake.port.mk directly somehow rather than having to > replicate and sync when things change.. When building s2n, one of the vendored deps in awscrt, cmake finds /usr/local/bin/llvm-ar. I don’t know why it's preferring that over what's in base. What are the implications of that? .joel awscliv2-73-20230415.tar.gz Description: GNU Zip compressed data
Re: help creating new port: x11/xfce4/xfce4-docklike
Le Fri, Apr 14, 2023 at 10:01:43AM +0200, Joel Carnat a écrit : > Le 14/04/2023 à 09:06, Landry Breuil a écrit : > > Le Thu, Apr 13, 2023 at 06:30:15PM +0200, Joel Carnat a écrit : > > > Le 20/02/2023 à 10:19, Joel Carnat a écrit : > > > > Hi, > > > > > > nice, two comments: > > - no need for CONFIGURE_STYLE, its set by x11/xfce4/Makefile.inc > > I added it to solve an issue where "make build" would not work without it: > ===> Building for xfce4-docklike-0.4.1 > gmake: Makefile: No such file or directory > gmake: *** No rule to make target 'Makefile'. Stop. > *** Error 2 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2960 > '/usr/ports/pobj/xfce4-docklike-0.4.1/.build_done': @cd > /usr/ports/pobj/xfce...) > *** Error 2 in /usr/ports/mystuff/x11/xfce4/xfce4-docklike > (/usr/ports/infrastructure/mk/bsd.port.mk:2600 'build': > @lock=xfce4-docklike-0.4) > > I saw that x11/xfce4/xfce4-whiskermenu had it set (to some other parameter) > and other ports used "gnu" as an value. So I tried and it compiled this way. > > But maybe it's not the right way to solve this particular issue. I think your issue (and the fact that distinfo didnt have the xfce4/ prefix for the distfile path) stems from your creation of a port in mystuff/x11/xfce4 without having copied x11/xfce4/Makefile.inc to mystuff/x11/xfce4 - thus CONFIGURE_STYLE & DIST_SUBDIR werent set by the missing Makefile.inc Landry
Re: 7.3: speetest doesn't work
Martin Schröder wrote: > Am So., 16. Apr. 2023 um 15:49 Uhr schrieb Stuart Henderson > : > > At this point I think you might be better served by dumping the > > package list, uninstalling them all, and reinstalling with 022 umask. > > > > Borrowing the old instructions from the 5.5 time_t flag day release > > notes, this also keeps the "auto installed" / "manually installed" > > markers (so that pkg_delete -a still behaves how you want): > > > > pkg_info -mq >/root/pkg_list_manual > > pkg_info -q >/root/pkg_list_full > > pkg_delete -X /var/db/pkg/*-firmware-[0-9]* > > pkg_add -z -l /root/pkg_list_manual > > pkg_add -za -l /root/pkg_list_full OK, that's ridiculous. This got to be a bug. I cannot see any situation where you want packages to be installed in that way. What is the justification?
Re: 7.3: speetest doesn't work
Am So., 16. Apr. 2023 um 15:49 Uhr schrieb Stuart Henderson : > At this point I think you might be better served by dumping the > package list, uninstalling them all, and reinstalling with 022 umask. > > Borrowing the old instructions from the 5.5 time_t flag day release > notes, this also keeps the "auto installed" / "manually installed" > markers (so that pkg_delete -a still behaves how you want): > > pkg_info -mq >/root/pkg_list_manual > pkg_info -q >/root/pkg_list_full > pkg_delete -X /var/db/pkg/*-firmware-[0-9]* > pkg_add -z -l /root/pkg_list_manual > pkg_add -za -l /root/pkg_list_full Thanks, that helped. Best Martin
Re: 7.3: speetest doesn't work
On 2023/04/16 15:42, Martin Schröder wrote: > Am So., 16. Apr. 2023 um 15:38 Uhr schrieb Stuart Henderson > : > > So let's also add "newly created directories" to the list of things > > where umask messes up pkg_add ;) In this case, it will be > > /usr/local/lib/python3.10/encodings/ > > Probably more. In the end I did > sudo chmod -R go+rX /usr/local/lib/python3.10/ > as >sudo chmod -R go+rX /usr/local/lib/python3.10/encodings/ > > wasn't enough. :-( > > Best > Martin > At this point I think you might be better served by dumping the package list, uninstalling them all, and reinstalling with 022 umask. Borrowing the old instructions from the 5.5 time_t flag day release notes, this also keeps the "auto installed" / "manually installed" markers (so that pkg_delete -a still behaves how you want): pkg_info -mq >/root/pkg_list_manual pkg_info -q >/root/pkg_list_full pkg_delete -X /var/db/pkg/*-firmware-[0-9]* pkg_add -z -l /root/pkg_list_manual pkg_add -za -l /root/pkg_list_full
[security-update] editors/emacs.28.2
Hi, these patches fix CVE-2023-28617, CVE-2023-27985 and CVE-2023- 27986. The release of Emacs 28.3 has hit some snags[1], and I don't think it will be released anytime soon (will not even release), so I'll submit the security patch first. - [1] https://lists.gnu.org/archive/html/emacs-devel/2023-04/msg00262.html <>
Re: mutt: Press any key to continue...
Am So., 16. Apr. 2023 um 15:42 Uhr schrieb Stuart Henderson : > Try "mutt -d6" and check the .muttdebug0 file at the point where it > asks you to press a key, that may give a clue what's up. In the end I deleted the port and added it again (with umask 022) and selected the mutt-2.2.9v3 flavour. That worked. Best Martin
Re: 7.3: speetest doesn't work
Am So., 16. Apr. 2023 um 15:38 Uhr schrieb Stuart Henderson : > So let's also add "newly created directories" to the list of things > where umask messes up pkg_add ;) In this case, it will be > /usr/local/lib/python3.10/encodings/ Probably more. In the end I did sudo chmod -R go+rX /usr/local/lib/python3.10/ as sudo chmod -R go+rX /usr/local/lib/python3.10/encodings/ wasn't enough. :-( Best Martin
Re: mutt: Press any key to continue...
On 2023/04/16 15:07, Martin Schröder wrote: > Hi, > after upgrading to 7.3, mutt wants any key before talking to me. > It didn't in 7.2. > > How to fix? > > Best > Martin > Try "mutt -d6" and check the .muttdebug0 file at the point where it asks you to press a key, that may give a clue what's up.
Re: 7.3: speetest doesn't work
On 2023/04/16 15:05, Martin Schröder wrote: > Am So., 16. Apr. 2023 um 14:56 Uhr schrieb lux : > > > > On Sun, 2023-04-16 at 14:41 +0200, Martin Schröder wrote: > > > > > > Fatal Python error: init_fs_encoding: failed to get the Python codec > > > of the filesystem encoding > > > Python runtime state: core initialized > > > ModuleNotFoundError: No module named 'encodings' > > > > > > > Is speedtest-cli installed via pkg_add? > > pkg_add > > > It looks like it was installed via pip or source package before the > > upgrade. > > > > I think you should reinstall speedtest-cli or re-build. > > > sudo pkg_delete speedtest-cli > speedtest-cli-2.1.4beta1: ok > Read shared items: ok > [20230416T15:04:12+0200(106/15)] ms@wyvern 1032:~ > > speedtest-cli --secure > -bash: /usr/local/bin/speedtest-cli: No such file or directory > [20230416T15:04:25+0200(106/15)] ms@wyvern 1033:~ > > sudo pkg_add speedtest-cli > quirks-6.121 signed on 2023-04-15T20:15:19Z > speedtest-cli-2.1.4beta1: ok > [20230416T15:04:36+0200(106/15)] ms@wyvern 1034:~ > > speedtest-cli --secure > Could not find platform independent libraries > Could not find platform dependent libraries > Consider setting $PYTHONHOME to [:] > Python path configuration: > PYTHONHOME = (not set) > PYTHONPATH = (not set) > program name = '/usr/local/bin/python3.10' > isolated = 0 > environment = 1 > user site = 1 > import site = 1 > sys._base_executable = '/usr/local/bin/python3.10' > sys.base_prefix = '/usr/local' > sys.base_exec_prefix = '/usr/local' > sys.platlibdir = 'lib' > sys.executable = '/usr/local/bin/python3.10' > sys.prefix = '/usr/local' > sys.exec_prefix = '/usr/local' > sys.path = [ > '/usr/local/lib/python310.zip', > '/usr/local/lib/python3.10', > '/usr/local/lib/lib-dynload', > ] > Fatal Python error: init_fs_encoding: failed to get the Python codec > of the filesystem encoding > Python runtime state: core initialized > ModuleNotFoundError: No module named 'encodings' > > Current thread 0x0194a7b6c660 (most recent call first): > So let's also add "newly created directories" to the list of things where umask messes up pkg_add ;) In this case, it will be /usr/local/lib/python3.10/encodings/
Re: pkg_add default umask [Re: 7.3: multitail can't read /etc/multitail.conf]
Am So., 16. Apr. 2023 um 15:32 Uhr schrieb Stuart Henderson : > You probably ran pkg_add with a restrictive umask set. Indeed. > umask 0077 That might explain the problems I have with man mut... Best Martin
Re: 7.3: outdated mandoc.db lacks mutt(1) entry, run makewhatis /usr/local/man
On 2023/04/16 15:10, Martin Schröder wrote: > Hi, > after upgrading to 7.3 man is somehow confused: > > > man mutt > man: /usr/local/man/mandoc.db: Permission denied > man: outdated mandoc.db lacks mutt(1) entry, run makewhatis /usr/local/m > > Neither >makewhatis /usr/local/man > nor >sudo makewhatis /usr/local/man > helps. :-( Ah yes, let's add to my previous mail: > You probably ran pkg_add with a restrictive umask set. > If you do that, permissions on @sample files and some others > (e.g. /var/db/pkg) follow what the umask is set to. ^^ and mandocdb files :)
pkg_add default umask [Re: 7.3: multitail can't read /etc/multitail.conf]
On 2023/04/16 15:19, Martin Schröder wrote:
> After upgrade to 7.3:
> --*- multitail 6.4.2 (C) 2003-2014 by folk...@vanheusden.com -*--
>
> The following problem occured:
> -
> do_load_config: error loading configfile '/etc/multitail.conf'
> If this is a bug, please report the following information:
> The last system call returned: 13 which means "Permission denied"
> [20230416T15:14:06+0200(106/15)] ms@wyvern 1002:~
> > l /etc/multitail.conf
> -rw--- 1 root wheel 45040 Apr 16 14:33 /etc/multitail.conf
>
> A
>sudo chmod a+r /etc/multitail.conf
> fixed the problem.
>
> Have I somehow misconfigured my system or is this a bug?
>
> Best
> Martin
>
You probably ran pkg_add with a restrictive umask set.
If you do that, permissions on @sample files and some others
(e.g. /var/db/pkg) follow what the umask is set to.
This comes up every now and again.
Personally I would be quite happy for pkg_add/pkg_delete to
force a standard umask, but I think there was some objection when
I floated the diff before.
Index: OpenBSD/PkgAdd.pm
===
RCS file: /cvs/src/usr.sbin/pkg_add/OpenBSD/PkgAdd.pm,v
retrieving revision 1.138
diff -u -p -r1.138 PkgAdd.pm
--- OpenBSD/PkgAdd.pm 29 Jul 2022 14:26:45 - 1.138
+++ OpenBSD/PkgAdd.pm 16 Apr 2023 13:31:30 -
@@ -1309,6 +1309,7 @@ sub main
{
my ($self, $state) = @_;
+ umask 0022;
$state->progress->set_header('');
$self->do_quirks($state);
Index: OpenBSD/PkgDelete.pm
===
RCS file: /cvs/src/usr.sbin/pkg_add/OpenBSD/PkgDelete.pm,v
retrieving revision 1.48
diff -u -p -r1.48 PkgDelete.pm
--- OpenBSD/PkgDelete.pm1 Feb 2022 16:54:09 - 1.48
+++ OpenBSD/PkgDelete.pm16 Apr 2023 13:31:30 -
@@ -383,6 +383,7 @@ sub main
{
my ($self, $state) = @_;
+ umask 0022;
if ($state->{exclude}) {
my $names = {};
for my $l (@{$state->{setlist}}) {
7.3: multitail can't read /etc/multitail.conf
After upgrade to 7.3: --*- multitail 6.4.2 (C) 2003-2014 by folk...@vanheusden.com -*-- The following problem occured: - do_load_config: error loading configfile '/etc/multitail.conf' If this is a bug, please report the following information: The last system call returned: 13 which means "Permission denied" [20230416T15:14:06+0200(106/15)] ms@wyvern 1002:~ > l /etc/multitail.conf -rw--- 1 root wheel 45040 Apr 16 14:33 /etc/multitail.conf A sudo chmod a+r /etc/multitail.conf fixed the problem. Have I somehow misconfigured my system or is this a bug? Best Martin
7.3: outdated mandoc.db lacks mutt(1) entry, run makewhatis /usr/local/man
Hi, after upgrading to 7.3 man is somehow confused: > man mutt man: /usr/local/man/mandoc.db: Permission denied man: outdated mandoc.db lacks mutt(1) entry, run makewhatis /usr/local/m Neither makewhatis /usr/local/man nor sudo makewhatis /usr/local/man helps. :-( How to fix? Thanks in advance Martin
mutt: Press any key to continue...
Hi, after upgrading to 7.3, mutt wants any key before talking to me. It didn't in 7.2. How to fix? Best Martin
Re: 7.3: speetest doesn't work
Am So., 16. Apr. 2023 um 14:56 Uhr schrieb lux : > > On Sun, 2023-04-16 at 14:41 +0200, Martin Schröder wrote: > > > > Fatal Python error: init_fs_encoding: failed to get the Python codec > > of the filesystem encoding > > Python runtime state: core initialized > > ModuleNotFoundError: No module named 'encodings' > > > > Is speedtest-cli installed via pkg_add? pkg_add > It looks like it was installed via pip or source package before the > upgrade. > > I think you should reinstall speedtest-cli or re-build. > sudo pkg_delete speedtest-cli speedtest-cli-2.1.4beta1: ok Read shared items: ok [20230416T15:04:12+0200(106/15)] ms@wyvern 1032:~ > speedtest-cli --secure -bash: /usr/local/bin/speedtest-cli: No such file or directory [20230416T15:04:25+0200(106/15)] ms@wyvern 1033:~ > sudo pkg_add speedtest-cli quirks-6.121 signed on 2023-04-15T20:15:19Z speedtest-cli-2.1.4beta1: ok [20230416T15:04:36+0200(106/15)] ms@wyvern 1034:~ > speedtest-cli --secure Could not find platform independent libraries Could not find platform dependent libraries Consider setting $PYTHONHOME to [:] Python path configuration: PYTHONHOME = (not set) PYTHONPATH = (not set) program name = '/usr/local/bin/python3.10' isolated = 0 environment = 1 user site = 1 import site = 1 sys._base_executable = '/usr/local/bin/python3.10' sys.base_prefix = '/usr/local' sys.base_exec_prefix = '/usr/local' sys.platlibdir = 'lib' sys.executable = '/usr/local/bin/python3.10' sys.prefix = '/usr/local' sys.exec_prefix = '/usr/local' sys.path = [ '/usr/local/lib/python310.zip', '/usr/local/lib/python3.10', '/usr/local/lib/lib-dynload', ] Fatal Python error: init_fs_encoding: failed to get the Python codec of the filesystem encoding Python runtime state: core initialized ModuleNotFoundError: No module named 'encodings' Current thread 0x0194a7b6c660 (most recent call first):
Re: [New] security/Nuclei 2.9.0
On Sat, 2023-04-15 at 21:02 +0200, Omar Polo wrote: > > Yep, it comes since some dependency of nuclei is calling syscall() > directly. Don't know how to tell which it is. However, that doesn't > imply that the port is broken, it's just a hint that it *might* be > so. > I haven't tested, beside a very brief test, so can't say for sure. > If > you've tested it throughfully then it's fine. > > (this error may even go away when upstream updates their deps.) > > Thank you. I'm test is ok. OK?
Re: [maintainer update] lang/abcl-1.9.1
On 2023/04/16 09:32:59 +0300, Timo Myyrä wrote: > Hi, > > Here's small bump to ABCL port. > Release details: > https://abcl-dev.blogspot.com/2023/02/abcl-191-never-use-dot-oh.html I've taken a shot at enabling the regress tests but it's not straightforward as it needs to download some deps from maven. Otherwise, quickly tested but seems to work just fine. Committed, thanks!
Re: [maintainer update] x11/pekwm-0.3.0
On 2023/04/16 09:48:25 +0300, Timo Myyrä wrote:
> Hi,
>
> Here's an update for the pekwm. Briefly tested on amd64.
with this update it uses pangocairo if found at build time. Don't
have as strong opinion on whether it should be enabled, but being it a
major improvement of this 0.3.0 I propend to leave it enabled and add
pangocairo as LDEP.
Index: Makefile
===
RCS file: /cvs/ports/x11/pekwm/Makefile,v
retrieving revision 1.40
diff -u -p -r1.40 Makefile
--- Makefile11 Mar 2022 20:16:55 - 1.40
+++ Makefile16 Apr 2023 07:11:05 -
@@ -1,7 +1,7 @@
COMMENT= aewm++ based pretty themable window manager
DISTNAME= pekwm-${V}
-V= 0.2.1
+V= 0.3.0
CATEGORIES=x11
HOMEPAGE= https://www.pekwm.se/
@@ -12,13 +12,16 @@ MAINTAINER= Timo Myyra https://github.com/pekdon/pekwm/releases/download/release-${V}/
-LIB_DEPENDS= graphics/jpeg \
+LIB_DEPENDS= devel/pango \
+ graphics/jpeg \
graphics/png
MODULES= devel/cmake
Index: distinfo
===
RCS file: /cvs/ports/x11/pekwm/distinfo,v
retrieving revision 1.14
diff -u -p -r1.14 distinfo
--- distinfo10 Dec 2021 13:35:58 - 1.14
+++ distinfo16 Apr 2023 07:11:05 -
@@ -1,2 +1,2 @@
-SHA256 (pekwm-0.2.1.tar.gz) = AV5uud/8gW+i1Km4yzRaUolPTcpaAdBhLzAkLbh+DlA=
-SIZE (pekwm-0.2.1.tar.gz) = 943072
+SHA256 (pekwm-0.3.0.tar.gz) = l+D101bki5Sj1mLzrwovtp7xvA84LqTF2LufTs5IFiQ=
+SIZE (pekwm-0.3.0.tar.gz) = 1210295
Index: patches/patch-CMakeLists_txt
===
RCS file: /cvs/ports/x11/pekwm/patches/patch-CMakeLists_txt,v
retrieving revision 1.3
diff -u -p -r1.3 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt11 Mar 2022 20:16:55 - 1.3
+++ patches/patch-CMakeLists_txt16 Apr 2023 07:11:05 -
@@ -1,7 +1,7 @@
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
-@@ -67,6 +67,7 @@ int main() { std::stof(\"42.0\"); }
+@@ -81,6 +81,7 @@ int main() { std::stof(\"42.0\"); }
set(CMAKE_CXX_FLAGS ${orig_CMAKE_CXX_FLAGS})
# Look for platform specific methods
Index: patches/patch-src_CfgParserSource_cc
===
RCS file: patches/patch-src_CfgParserSource_cc
diff -N patches/patch-src_CfgParserSource_cc
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_CfgParserSource_cc16 Apr 2023 07:11:05 -
@@ -0,0 +1,14 @@
+backport commit fix dd7b96cdcc6e0430b8f737a6fc5287f476476a85
+
+Index: src/CfgParserSource.cc
+--- src/CfgParserSource.cc.orig
src/CfgParserSource.cc
+@@ -144,7 +144,7 @@ CfgParserSourceCommand::open(void)
+ std::string path(Util::getEnv("PATH"));
+ path = _command_path + ":" + path;
+ env.override("PATH", path);
+- execle(PEKWM_SH, PEKWM_SH, "-c", _name.c_str(), nullptr,
++ execle(PEKWM_SH, PEKWM_SH, "-c", _name.c_str(), NULL,
+ env.getCEnv());
+
+ ::close (STDOUT_FILENO);
Index: patches/patch-src_Util_cc
===
RCS file: patches/patch-src_Util_cc
diff -N patches/patch-src_Util_cc
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_Util_cc 16 Apr 2023 07:11:05 -
@@ -0,0 +1,14 @@
+backport commit fix dd7b96cdcc6e0430b8f737a6fc5287f476476a85
+
+Index: src/Util.cc
+--- src/Util.cc.orig
src/Util.cc
+@@ -191,7 +191,7 @@ namespace Util {
+ case 0:
+ setsid();
+ execlp(PEKWM_SH, PEKWM_SH, "-c", command.c_str(),
+- static_cast(0));
++ NULL);
+ P_ERR("execlp failed: " << strerror(errno));
+ exit(1);
+ case -1:
Index: patches/patch-src_pekwm_cc
===
RCS file: patches/patch-src_pekwm_cc
diff -N patches/patch-src_pekwm_cc
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_pekwm_cc 16 Apr 2023 07:11:05 -
@@ -0,0 +1,14 @@
+backport commit fix dd7b96cdcc6e0430b8f737a6fc5287f476476a85
+
+Index: src/pekwm.cc
+--- src/pekwm.cc.orig
src/pekwm.cc
+@@ -100,7 +100,7 @@ handleOkResult(char *path, char **argv, int read_fd)
+ } else {
+ command = "exec " + command;
+ execl(PEKWM_SH, PEKWM_SH , "-c", command.c_str(),
+-static_cast(0));
++NULL);
+ }
+
+ std::cerr << "failed to run restart command: "
Index: patches/patch-src_pekwm_wm_cc
===
RCS file: /cvs/ports/x11/pekwm/patches/patch-src_pekwm_wm_cc,v
retrieving revision 1.2
diff -u -p -r1
