Re: UPDATE: MPlayer 20221213
ping.
On 12/13/2022 10:05 PM, Brad Smith wrote:
Here is an update to MPlayer 20221213.
It rolls in a few bug fixes.
Index: Makefile
===
RCS file: /home/cvs/ports/x11/mplayer/Makefile,v
retrieving revision 1.322
diff -u -p -u -p -r1.322 Makefile
--- Makefile4 Dec 2022 20:12:36 - 1.322
+++ Makefile14 Dec 2022 02:07:45 -
@@ -1,9 +1,8 @@
COMMENT= movie player supporting many formats
-V= 20211106
+V= 20221213
FFMPEG_V= 4.4.3
DISTNAME= mplayer-${V}
-REVISION= 3
CATEGORIES= x11 multimedia
MASTER_SITES= https://comstyle.com/source/
EXTRACT_SUFX= .tar.xz
Index: distinfo
===
RCS file: /home/cvs/ports/x11/mplayer/distinfo,v
retrieving revision 1.54
diff -u -p -u -p -r1.54 distinfo
--- distinfo7 Dec 2021 20:03:57 - 1.54
+++ distinfo14 Dec 2022 02:07:49 -
@@ -1,2 +1,2 @@
-SHA256 (mplayer-20211106.tar.xz) = abnH7MqAyIClXGKO+xmvhnOqYozshtmDz9teTWGWJjM=
-SIZE (mplayer-20211106.tar.xz) = 5178076
+SHA256 (mplayer-20221213.tar.xz) = k32WJPsww3H0qD3ZWu7BYD+bztGnWdcjNLscTJCviPg=
+SIZE (mplayer-20221213.tar.xz) = 5173100
Index: patches/patch-configure
===
RCS file: /home/cvs/ports/x11/mplayer/patches/patch-configure,v
retrieving revision 1.95
diff -u -p -u -p -r1.95 patch-configure
--- patches/patch-configure 11 Mar 2022 20:16:48 - 1.95
+++ patches/patch-configure 14 Dec 2022 02:08:12 -
@@ -15,7 +15,7 @@ Index: configure
# Use this before starting a check
echocheck() {
echo " Checking for $@ " >> "$TMPLOG"
-@@ -1529,39 +1536,39 @@ echo configuration: $configuration > "$TMPLOG"
+@@ -1530,39 +1537,39 @@ echo configuration: $configuration > "$TMPLOG"
echo >> "$TMPLOG"
@@ -87,7 +87,7 @@ Index: configure
list_subparts() {
test ! -e ffmpeg/libav${3} && return 1
pattern="s/^[^#]*${1}.*([^ ,]*, *\([^ ,)]*\).*/\1_${2}/p"
-@@ -1991,7 +1998,10 @@ fi
+@@ -1995,7 +2002,10 @@ fi
if arm ; then
cc_check && host_arch=aarch64 || host_arch=arm
fi
@@ -98,7 +98,7 @@ Index: configure
echo "Detected operating system: $system_name"
echo "Detected host architecture: $host_arch"
-@@ -2534,7 +2544,7 @@ case "$host_arch" in
+@@ -2540,7 +2550,7 @@ case "$host_arch" in
arch='sparc'
iproc='sparc'
if test "$host_arch" = "sparc64" ; then
@@ -107,7 +107,7 @@ Index: configure
proc='ultrasparc'
def_fast_64bit='#define HAVE_FAST_64BIT 1'
elif sunos ; then
-@@ -2835,7 +2845,14 @@ EOF
+@@ -2841,7 +2851,14 @@ EOF
arch='arc'
iproc='arc'
;;
@@ -122,7 +122,7 @@ Index: configure
*)
echo "The architecture of your CPU ($host_arch) is not supported by this
configure script"
echo "It seems nobody has ported MPlayer to your OS or CPU type yet."
-@@ -2909,7 +2926,7 @@ cat > $TMPC << EOF
+@@ -2915,7 +2932,7 @@ cat > $TMPC << EOF
int ff_extern;
EOF
cc_check -c || die "Symbol mangling check failed."
@@ -131,7 +131,7 @@ Index: configure
extern_prefix=${sym%%ff_extern*}
def_extern_asm="#define EXTERN_ASM $extern_prefix"
def_extern_prefix="#define EXTERN_PREFIX \"$extern_prefix\""
-@@ -2974,7 +2991,7 @@ else
+@@ -2980,7 +2997,7 @@ else
fi
CFLAGS="-D_ISOC99_SOURCE -I. -Iffmpeg $CFLAGS"
@@ -140,7 +140,7 @@ Index: configure
# On glibc, add some more CPPFLAGS for enabling required functionality.
cpp_condition_check features.h "defined __GLIBC__" &&
-@@ -3055,7 +3072,7 @@ elif test $relocatable = "yes" ; then
+@@ -3061,7 +3078,7 @@ elif test $relocatable = "yes" ; then
fi
echores $relocatable
@@ -177,7 +177,7 @@ Index: configure
_cdparanoia=yes && extra_cflags="$extra_cflags $inc_tmp" && break
done
fi
-@@ -8488,6 +8509,7 @@ extra_ldflags="$extra_ldflags $libm"
+@@ -8445,6 +8466,7 @@ extra_ldflags="$extra_ldflags $libm"
# XML documentation tests
echocheck "XML catalogs"
for try_catalog in \
@@ -185,7 +185,7 @@ Index: configure
/etc/sgml/catalog \
/usr/share/xml/docbook/*/catalog.xml \
/opt/local/share/xml/docbook-xml/*/catalog.xml \
-@@ -8515,6 +8537,7 @@ fi
+@@ -8472,6 +8494,7 @@ fi
echocheck "XML chunked stylesheet"
for try_chunk_xsl in \
@@ -193,7 +193,7 @@ Index: configure
/usr/share/xml/docbook/*/html/chunk.xsl \
/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/html/chunk.xsl \
/usr/share/sgml/docbook/yelp/docbook/html/chunk.xsl \
-@@ -8540,6 +8563,7 @@ fi
+@@ -8497,6 +8520,7 @@ fi
echocheck "XML monolithic stylesheet"
for try_docbook_xsl in \
@@ -201,7 +201,7 @@ Index: configure
/usr/share/xml/docbook/*/html/docbook.xsl \
/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/html/docbook.xsl \
/usr/share/sgml/docbook/yelp/docbook/html/docbook.xsl \
-@@ -8593,6 +8617,7 @@ EOF
[update] audio/py-audio 0.2.11 -> 0.2.12
Update to 0.2.12. Includes various small fixes including updates for
compatibility with Python 3.10+
Tests for only test consumer, audio/py-speechrecognition, pass the
same before and after.
ok?
--Kurt
Index: Makefile
===
RCS file: /cvs/ports/audio/py-audio/Makefile,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile
--- Makefile22 Dec 2022 00:54:32 - 1.17
+++ Makefile22 Dec 2022 01:09:15 -
@@ -1,10 +1,9 @@
COMMENT = Python bindings for PortAudio
-MODPY_EGG_VERSION =0.2.11
+MODPY_EGG_VERSION =0.2.12
DISTNAME = PyAudio-${MODPY_EGG_VERSION}
PKGNAME = py-audio-${MODPY_EGG_VERSION}
CATEGORIES = audio devel
-REVISION = 3
HOMEPAGE = http://people.csail.mit.edu/hubert/pyaudio/
Index: distinfo
===
RCS file: /cvs/ports/audio/py-audio/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo7 Aug 2021 15:41:23 - 1.3
+++ distinfo22 Dec 2022 01:09:15 -
@@ -1,2 +1,2 @@
-SHA256 (PyAudio-0.2.11.tar.gz) = k7/eMOC2TmOkby/XfoXEH9URgqSjQT2e36+f+qJu+3Q=
-SIZE (PyAudio-0.2.11.tar.gz) = 37428
+SHA256 (PyAudio-0.2.12.tar.gz) = Vd3123K8U3u6X128o6ufAiLuW4Qr2oOXjqsLe49g+54=
+SIZE (PyAudio-0.2.12.tar.gz) = 42944
Index: patches/patch-setup_py
===
RCS file: /cvs/ports/audio/py-audio/patches/patch-setup_py,v
retrieving revision 1.4
diff -u -p -r1.4 patch-setup_py
--- patches/patch-setup_py 11 Mar 2022 18:20:27 - 1.4
+++ patches/patch-setup_py 22 Dec 2022 01:09:15 -
@@ -1,12 +1,12 @@
Index: setup.py
--- setup.py.orig
+++ setup.py
-@@ -56,7 +56,7 @@ portaudio_path = os.environ.get("PORTAUDIO_PATH", "./p
- mac_sysroot_path = os.environ.get("SYSROOT_PATH", None)
+@@ -49,7 +49,7 @@ WIN_VCPKG_PATH = os.environ.get("VCPKG_PATH", None)
- pyaudio_module_sources = ['src/_portaudiomodule.c']
--include_dirs = []
-+include_dirs = [os.path.join(os.environ.get('LOCALBASE'), 'include'),]
- external_libraries = []
- extra_compile_args = []
- extra_link_args = []
+ def setup_extension():
+ pyaudio_module_sources = ['src/_portaudiomodule.c']
+-include_dirs = []
++include_dirs = [os.path.join(os.environ.get('LOCALBASE'), 'include'),]
+ external_libraries = ["portaudio"]
+ external_libraries_path = []
+ extra_compile_args = []
Index: pkg/PLIST
===
RCS file: /cvs/ports/audio/py-audio/pkg/PLIST,v
retrieving revision 1.7
diff -u -p -r1.7 PLIST
--- pkg/PLIST 9 Sep 2022 19:12:13 - 1.7
+++ pkg/PLIST 22 Dec 2022 01:09:15 -
@@ -1,5 +1,6 @@
@pkgpath audio/py-audio
lib/python${MODPY_VERSION}/site-packages/PyAudio-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/PyAudio-${MODPY_EGG_VERSION}.dist-info/LICENSE.txt
lib/python${MODPY_VERSION}/site-packages/PyAudio-${MODPY_EGG_VERSION}.dist-info/METADATA
lib/python${MODPY_VERSION}/site-packages/PyAudio-${MODPY_EGG_VERSION}.dist-info/RECORD
lib/python${MODPY_VERSION}/site-packages/PyAudio-${MODPY_EGG_VERSION}.dist-info/WHEEL
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2022/12/21 17:54:32 Modified files: audio/py-audio : Makefile Log message: Make py-audio tests actually run with "make test"
[update] archiver/py-zopfli 0.2.1 -> 0.2.2
Update to 0.2.2
Added pyproject.toml to source distribution
Published precompiled wheels for Python 3.11
print/py-fonttools tests don't work, but the only other consumer,
print/weasyprint passes all tests with this new version.
ok?
--Kurt
Index: Makefile
===
RCS file: /cvs/ports/archivers/py-zopfli/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- Makefile13 Nov 2022 15:27:35 - 1.2
+++ Makefile22 Dec 2022 00:34:41 -
@@ -1,10 +1,9 @@
COMMENT = cPython bindings for the zopfli compression library
-MODPY_EGG_VERSION =0.2.1
+MODPY_EGG_VERSION =0.2.2
DISTNAME = zopfli-${MODPY_EGG_VERSION}
PKGNAME = py-zopfli-${MODPY_EGG_VERSION}
EXTRACT_SUFX = .zip
-REVISION = 0
CATEGORIES = archivers
Index: distinfo
===
RCS file: /cvs/ports/archivers/py-zopfli/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo13 Oct 2022 15:37:00 - 1.1.1.1
+++ distinfo22 Dec 2022 00:34:41 -
@@ -1,2 +1,2 @@
-SHA256 (zopfli-0.2.1.zip) = 5SY9KAbiwcyyP1KylyojXTHULyLz+jAyzJre1R6b8sY=
-SIZE (zopfli-0.2.1.zip) = 205086
+SHA256 (zopfli-0.2.2.zip) = LUnbdUDZmRl2r0ZOvBue0SmIwE2QaRvLUdxKNzqeKvw=
+SIZE (zopfli-0.2.2.zip) = 205320
Re: NEW: net/snowflake_client
On 22/12/21 07:04PM, Caspar Schutijser wrote: > I tested it with Tor Browser and it seems to work. Do we want this in > ports? And do we want a separate port like this or do we want to > tweak and move net/snowflake_proxy to use MULTI_PACKAGES? I think it's better to use MULTI_PACKAGES because they are all built from a common codebase and having a single port of snowflake can make it easier for future updates.
[UPDATE]: security/kc
Hi!
This updates kc to 2.5.0.
Please read the Changelog.md file to see what has changed and why you might not
be able to open your older database.
I removed an unmaintained script (and the README on it), switched to GH_*
variables (easier this way), removed pcre dependency (and thus support), and
removed @ask-update.
Daniel
diff --git a/security/kc/Makefile b/security/kc/Makefile
index 71ee5b3a0ae..b8d2523c90a 100644
--- a/security/kc/Makefile
+++ b/security/kc/Makefile
@@ -1,10 +1,8 @@
COMMENT = console based password storing application
-V =2.4.2
-DISTNAME = kc-$V
-EXTRACT_SUFX = .tar.bz2
-MASTER_SITES = https://github.com/levaidaniel/kc/releases/download/${V}/
-REVISION = 0
+GH_ACCOUNT = levaidaniel
+GH_PROJECT = kc
+GH_TAGNAME = 2.5.0
CATEGORIES = security
@@ -15,19 +13,16 @@ MAINTAINER =LEVAI Daniel
# BSD
PERMIT_PACKAGE = Yes
-WANTLIB += c crypto curses edit pcre scrypt util xml2
+WANTLIB += c crypto curses edit scrypt util xml2
LIB_DEPENDS = textproc/libxml \
- devel/pcre \
security/libscrypt
-MAKE_ENV +=HAVE_PCRE=yes OS_OPENBSD=yes HAVE_LIBSCRYPT=yes
+MAKE_ENV +=OS_OPENBSD=yes HAVE_LIBSCRYPT=yes
post-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/kc
- ${INSTALL} ${WRKBUILD}/pwsafe_to_kc.pl ${PREFIX}/share/kc/
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/kc
- ${INSTALL} ${WRKBUILD}/Changelog ${PREFIX}/share/doc/kc/
+ ${INSTALL} ${WRKBUILD}/Changelog.md ${PREFIX}/share/doc/kc/
.include
diff --git a/security/kc/distinfo b/security/kc/distinfo
index 5a85a457900..70dbd7a942e 100644
--- a/security/kc/distinfo
+++ b/security/kc/distinfo
@@ -1,2 +1,2 @@
-SHA256 (kc-2.4.2.tar.bz2) = PpFoQR8OHwOQE8OwsSXolGt7D+fpLRVvBpyMu0ovimE=
-SIZE (kc-2.4.2.tar.bz2) = 65011
+SHA256 (kc-2.5.0.tar.gz) = e2qyCIwulrcTVvVUz9XSZNE7NouPtnGXLPAxDZRvv64=
+SIZE (kc-2.5.0.tar.gz) = 99969
diff --git a/security/kc/pkg/MESSAGE b/security/kc/pkg/MESSAGE
new file mode 100644
index 000..345fc451266
--- /dev/null
+++ b/security/kc/pkg/MESSAGE
@@ -0,0 +1 @@
+Please read ${PREFIX}/share/doc/kc/Changelog.md to see why you might not be
able to open your database anymore.
diff --git a/security/kc/pkg/PLIST b/security/kc/pkg/PLIST
index 94a73f3dc5a..95289a05e28 100644
--- a/security/kc/pkg/PLIST
+++ b/security/kc/pkg/PLIST
@@ -1,8 +1,4 @@
-@ask-update kc-<2.4 Make sure all your existing kc databases are safely
*dumped* ('dump' command) then read the Changelog in ${PREFIX}/share/doc/kc
after installation
@bin bin/kc
@man man/man1/kc.1
share/doc/kc/
-share/doc/kc/Changelog
-share/doc/pkg-readmes/${PKGSTEM}
-share/kc/
-share/kc/pwsafe_to_kc.pl
+share/doc/kc/Changelog.md
diff --git a/security/kc/pkg/README b/security/kc/pkg/README
deleted file mode 100644
index 46825795305..000
--- a/security/kc/pkg/README
+++ /dev/null
@@ -1,8 +0,0 @@
-+---
-| Running ${PKGSTEM} on OpenBSD
-+---
-
-kc comes with a tiny and simple utility which can convert an exported
-pwsafe database to a kc compatible XML database (that can be imported to
-it later). It is installed under ${PREFIX}/share/kc/. Note that this
-script requires Perl modules provided by the p5-HTML-Parser package.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: t...@cvs.openbsd.org2022/12/21 14:06:58 Modified files: security/rust-openssl-tests: Makefile distinfo Log message: Update to rust-openssl-tests 20221221
Re: Python access to Berkeley DB
On Tue, 20 Dec 2022 12:18:59 - (UTC)
Stuart Henderson wrote:
> ["Followup-To:" header set to gmane.os.openbsd.misc.]
> On 2022-12-19, Stuart Cassoff <3...@bell.net> wrote:
> > -- Original Message --
> > From: stu.li...@spacehopper.org
> > To: ports@openbsd.org
> > Cc: m...@openbsd.org
> > Sent: Monday, December 19, 2022 7:53 AM
> > Subject: Re: Python access to Berkeley DB
> >
> > [ moving to ports@, hopefully reply-to will be set correctly
> > if
> > I got the gmane/nntp bits right :) ]
> >
> > You might possibly be able to kludge around it with some LD_PRELOAD,
> > though tkinter is now built against Tcl 8.6 and the db-tcl package is
> > built against Tcl 8.5 and I don't know if extensions are compatible
> > cross-version.
> >
> >
> > Extensions built against 8.5 should load into 8.6 no problem.
>
> Thanks. I wasn't sure and the tclsh import didn't work for either 8.5 or 8.6
> for me.
>
>
Thanks for LD_PRELOAD, about which I knew nothing.
The kludge got rid of all but one undefined symbols:
Script started on Tue Dec 20 09:20:33 2022
d630amd64$ ls /usr/local/lib/db4
libdb.a libdb_cxx.a libdb_tcl.a pkgIndex.tcl
libdb.lalibdb_cxx.lalibdb_tcl.la
libdb.so.5.0libdb_cxx.so.6.0libdb_tcl.so.6.0
d630amd64$ export LD_PRELOAD=/usr/local/lib/db4/libdb_tcl.so.6.0
d630amd64$ python3.9
Python 3.9.15 (main, Oct 21 2022, 14:01:40)
[Clang 13.0.0 ] on openbsd7
Type "help", "copyright", "credits" or "license" for more information.
>>> import tkinter
>>> tcl = tkinter.Tk(useTk=False)
>>> tcl.tk.call("lappend", "auto_path", "/usr/local/lib/db4")
(, '/usr/local/lib/tcl',
'/usr/local/lib/db4')
>>> tcl.tk.call("package", "require", "Db_tcl")
python3.9:/usr/local/lib/db4/libdb_tcl.so.6.0: undefined symbol
'Tcl_PkgProvideEx'
ld.so: python3.9: lazy binding failed!
Killed
d630amd64$ exit
Script done on Tue Dec 20 09:24:01 2022
so I tried building from ports, building Python against Tcl/Tk 8.5 because I
could see what to change in Makefile.inc with some confidence I was guessing
right (8.6 > 8.5 about line 100). Same result, first with package command:
Script started on Tue Dec 20 20:25:17 2022
rack$ export LD_PRELOAD=/usr/local/lib/db4/libdb_tcl.so.6.0
rack$ python3.9
Python 3.9.14 (main, Dec 20 2022, 16:12:25)
[Clang 13.0.0 ] on openbsd7
Type "help", "copyright", "credits" or "license" for more information.
>>> import tkinter
>>> tkinter.TclVersion
8.5
>>> tcl = tkinter.Tk(useTk=False)
>>> tcl.tk.call("lappend", "auto_path", "/usr/local/lib/db4")
(, '/usr/local/lib/tcl',
'/usr/local/lib/db4')
>>> tcl.tk.call("package", "require", "Db_tcl")
python3.9:/usr/local/lib/db4/libdb_tcl.so.6.0: undefined symbol
'Tcl_PkgProvideEx'
ld.so: python3.9: lazy binding failed!
Killed
rack$ tclsh8.5
% lappend auto_path /usr/local/lib/db4
/usr/local/lib/tcl/tcl8.5 /usr/local/lib/tcl /usr/local/lib/db4
% package require Db_tcl
4.6
% exit
rack$ exit
Script done on Tue Dec 20 20:33:19 2022
And with the load command:
Script started on Wed Dec 21 20:25:22 2022
rack$ tclsh8.5
% load /usr/local/lib/db4/libdb_tcl.so.6.0
% berkdb version -string
Berkeley DB 4.6.21: (September 27, 2007)
% exit
rack$ export LD_PRELOAD=/usr/local/lib/db4/libdb_tcl.so.6.0
rack$ python3.9
Python 3.9.14 (main, Dec 20 2022, 16:12:25)
[Clang 13.0.0 ] on openbsd7
Type "help", "copyright", "credits" or "license" for more information.
>>> import tkinter
>>> tkinter.TclVersion
8.5
>>> tcl = tkinter.Tk(useTk=False)
>>> tcl.tk.call("load", "/usr/local/lib/db4/libdb_tcl.so.6.0")
python3.9:/usr/local/lib/db4/libdb_tcl.so.6.0: undefined symbol
'Tcl_PkgProvideEx'
ld.so: python3.9: lazy binding failed!
Killed
rack$ exit
Script done on Wed Dec 21 20:30:35 2022
Give up on kludge I think.
Roger
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2022/12/21 11:34:29 Modified files: devel/ruby-rbtree: Makefile distinfo Log message: == Changes === 0.4.6 * Make it work with clang 15. ok jeremy@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2022/12/21 11:33:55 Modified files: security/ruby-rotp: Makefile distinfo Log message: 6.2.2 Removed rjust from generate_otp in favor of more time constant version ok jeremy@
[maintainer update] devel/ruby-rbtree 0.4.5 -> 0.4.6
== Changes === 0.4.6 * Make it work with clang 15. Essentially a no-op for us currently until we get clang 15. No PLIST changes. ok? --Kurt Index: Makefile === RCS file: /cvs/ports/devel/ruby-rbtree/Makefile,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 Makefile --- Makefile22 Jun 2022 01:35:38 - 1.1.1.1 +++ Makefile21 Dec 2022 18:01:11 - @@ -1,6 +1,6 @@ COMMENT = sorted associative collection -DISTNAME = rbtree-0.4.5 +DISTNAME = rbtree-0.4.6 CATEGORIES = devel Index: distinfo === RCS file: /cvs/ports/devel/ruby-rbtree/distinfo,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 distinfo --- distinfo22 Jun 2022 01:35:38 - 1.1.1.1 +++ distinfo21 Dec 2022 18:01:11 - @@ -1,2 +1,2 @@ -SHA256 (rbtree-0.4.5.gem) = wRUkQfQFX5Qih7Ra/SgGzXVZN/R+ZDwc9oebKL99ifg= -SIZE (rbtree-0.4.5.gem) = 30208 +SHA256 (rbtree-0.4.6.gem) = FO6kRpsk/SRyVC5fPrEF1jRMjM828LVtVf3P604PEPw= +SIZE (rbtree-0.4.6.gem) = 30720
NEW: net/snowflake_client
Attached is a port for snowflake_client, counterpart of snowflake_proxy. If you look closely you see that I basically copied net/snowflake_proxy, removed the post-extract target and renamed some "proxy" to "client" here and there. This is version 2.4.1 (I have a diff for updating snowflake_proxy to 2.4.1 as well but I need to test it properly first.) I tested it with Tor Browser and it seems to work. Do we want this in ports? And do we want a separate port like this or do we want to tweak and move net/snowflake_proxy to use MULTI_PACKAGES? Caspar snowflake_client.tgz Description: application/tar-gz
[maintainer update] security/ruby-rotp 6.2.1 -> 6.2.2
6.2.2 Removed rjust from generate_otp in favor of more time constant version No PLIST updates. Minor update. ok? --Kurt Index: Makefile === RCS file: /cvs/ports/security/ruby-rotp/Makefile,v retrieving revision 1.2 diff -u -p -r1.2 Makefile --- Makefile19 Nov 2022 00:58:42 - 1.2 +++ Makefile21 Dec 2022 17:49:21 - @@ -1,7 +1,7 @@ COMMENT = Ruby library for generating and verifying one time passwords -DISTNAME = rotp-6.2.1 +DISTNAME = rotp-6.2.2 CATEGORIES = security Index: distinfo === RCS file: /cvs/ports/security/ruby-rotp/distinfo,v retrieving revision 1.2 diff -u -p -r1.2 distinfo --- distinfo19 Nov 2022 00:58:42 - 1.2 +++ distinfo21 Dec 2022 17:49:21 - @@ -1,2 +1,2 @@ -SHA256 (rotp-6.2.1.gem) = 5+JbM2DmwDlyg+GsYyFpD6TGOmcJVimqeOwka8Mz0YE= -SIZE (rotp-6.2.1.gem) = 20480 +SHA256 (rotp-6.2.2.gem) = L97BSX6AafByl5cLbYPF6Bg+fbMGFciiblYdXxD7tYI= +SIZE (rotp-6.2.2.gem) = 20480
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2022/12/21 10:38:44 Modified files: sysutils/rclone: Makefile distinfo Log message: Update to rclone-1.61.0 Changes: https://rclone.org/changelog/#v1-61-0-2022-12-20
Re: Tor Browser: why is there no built-in bridges?
On Wed, Dec 21, 2022 at 06:11:43AM +, Yifei Zhan wrote:
> On 22/12/16 06:22PM, Caspar Schutijser wrote:
> > Dear users in this thread, if possible, can you give this a spin?
> >
> > With some help and feedback from the Tor Browser developers I
> > came up with the following diff. I verified that I can use
> > the meek-azure and obfs4 Pluggable Transports. With a
> > local (uncommitted) snowflake_client port Snowflake also worked but
> > I'll get back to that some other time.
> >
>
> This works exactly as it should :)
> I tested meek/obfs/snowflake and all three worked without issue.
>
> It seems like TBB changed the way bridges integrate since I last attempt to
> get
> this working on OpenBSD, so my old patchset is no longer applicable, I'm
> happy
> to help testing tho.
Okay, great to hear! Thanks for testing.
Here is a diff for -current that I do intend to commit.
Comments or OKs?
Caspar
Index: meta/tor-browser/Makefile
===
RCS file: /cvs/ports/meta/tor-browser/Makefile,v
retrieving revision 1.65
diff -u -p -r1.65 Makefile
--- meta/tor-browser/Makefile 18 Dec 2022 15:55:09 - 1.65
+++ meta/tor-browser/Makefile 21 Dec 2022 17:18:07 -
@@ -4,6 +4,7 @@ MAINTAINER= Caspar Schutijser =12.0.1 \
www/tor-browser/noscript>=11.4.13 \
Index: meta/tor-browser/pkg/README
===
RCS file: /cvs/ports/meta/tor-browser/pkg/README,v
retrieving revision 1.9
diff -u -p -r1.9 README
--- meta/tor-browser/pkg/README 9 Mar 2022 20:48:33 - 1.9
+++ meta/tor-browser/pkg/README 21 Dec 2022 17:18:07 -
@@ -33,10 +33,8 @@ editing your torrc yourself. Make sure
before doing so if you use this method; if Tor Browser is running it
might overwrite your torrc.
-NOTE: The OpenBSD Tor Browser ports do not yet include Pluggable
-Transports (PT). This means that not all features are yet available,
-such as using obfsproxy to get to Tor. A future update will include
-ports for PT components. Pluggable Transports have a web page
+NOTE: on OpenBSD, the only Pluggable Transports that are available
+for now are meek-azure and obfs4. Pluggable Transports have a web page
worth reading:
https://2019.www.torproject.org/docs/pluggable-transports.html.en
Index: www/tor-browser/browser/Makefile
===
RCS file: /cvs/ports/www/tor-browser/browser/Makefile,v
retrieving revision 1.99
diff -u -p -r1.99 Makefile
--- www/tor-browser/browser/Makefile18 Dec 2022 15:55:09 - 1.99
+++ www/tor-browser/browser/Makefile21 Dec 2022 17:18:07 -
@@ -13,10 +13,12 @@ PATCHORIG = .pat.orig
PKGNAME = ${TB_PREFIX}-browser-${TB_VERSION:S/a/alpha/}
DISTNAME = src-firefox-tor-browser-102.6.0esr-12.0-1-build2
+REVISION = 0
FIX_EXTRACT_PERMISSIONS= Yes
DISTFILES += ${DISTNAME}.tar.xz \
- tor-browser-linux64-${TB_VERSION}_ALL.tar.xz
+ tor-browser-linux64-${TB_VERSION}_ALL.tar.xz \
+ tor-expert-bundle-${TB_VERSION}-linux-x86_64.tar.gz
SO_VERSION = 8.0
MOZILLA_LIBS = xul clearkey lgpllibs mozavcodec mozavutil mozgtk
@@ -74,7 +76,8 @@ MAKE_ENV += BUILD_OPT=1 \
NSS_ENABLE_ECC=1 \
XCFLAGS="-I${LOCALBASE}/include ${CFLAGS}"
-RUN_DEPENDS += net/tor>=0.4.7.12
+RUN_DEPENDS += net/obfs4proxy>=0.0.14 \
+ net/tor>=0.4.7.12
CONFIGURE_ARGS += --enable-release #1386371
CONFIGURE_ARGS += --enable-sandbox
@@ -103,7 +106,16 @@ post-patch:
# Not using a patch for this; patch context would contain UTF-8
sed -i 's/#ifdef XP_LINUX/#if defined(XP_LINUX) ||
defined(XP_OPENBSD)/' \
${WRKSRC}/browser/app/profile/000-tor-browser.js
- ln -s ${WRKSRC}/mozconfig-linux-x86_64 ${WRKSRC}/.mozconfig
+ ln -fs ${WRKSRC}/mozconfig-linux-x86_64 ${WRKSRC}/.mozconfig
+
+ # add bridges that we support
+.for pt in meek-azure obfs4
+ I=1; \
+ cat ${WRKDIR}/tor/pluggable_transports/bridges_list.${pt}.txt | while
read -r line ; do \
+ echo "pref(\"extensions.torlauncher.default_bridge.${pt}.$$I\",
\"$$line\");" >>${WRKSRC}/browser/app/profile/000-tor-browser.js; \
+ I=$$((I + 1)); \
+ done
+.endfor
${SUBST_CMD} ${WRKSRC}/xpcom/build/BinaryPath.h
Index: www/tor-browser/browser/distinfo
===
RCS file: /cvs/ports/www/tor-browser/browser/distinfo,v
retrieving revision 1.60
diff -u -p -r1.60 distinfo
--- www/tor-browser/browser/distinfo18 Dec 2022 15:55:09 - 1.60
+++ www/tor-browser/browser/distinfo21 Dec 2022 17:18:07 -
@@ -1,4 +1,6 @@
SHA256
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2022/12/21 09:38:52 Modified files: print/transfig : Makefile Log message: New transfig makes base-gcc unhappy Switching to ports-gcc fixes build on sparc64
[update] net/mautrix-whatsapp 0.8.0
Hello,
Here is a diff for net/mautrix-whatsapp to version 0.8.0.
I have been running it on -stable for about a week without any issue.
Best RegardsIndex: Makefile
===
RCS file: /cvs/ports/net/mautrix-whatsapp/Makefile,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile
--- Makefile8 Nov 2022 11:16:56 - 1.15
+++ Makefile21 Dec 2022 15:33:42 -
@@ -1,10 +1,9 @@
COMMENT = matrix-WhatsApp puppeting bridge
-MODGO_VERSION =v0.6.1
+MODGO_VERSION =v0.8.0
MODGO_MODNAME =maunium.net/go/mautrix-whatsapp
DISTNAME = mautrix-whatsapp-${MODGO_VERSION}
-REVISION = 0
EPOCH =0
Index: distinfo
===
RCS file: /cvs/ports/net/mautrix-whatsapp/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- distinfo18 Aug 2022 12:55:44 - 1.9
+++ distinfo21 Dec 2022 15:33:42 -
@@ -6,6 +6,8 @@ SHA256 (go_modules/github.com/beorn7/per
SHA256 (go_modules/github.com/beorn7/perks/@v/v1.0.1.zip) =
Jb2eLZSsp3Dm28H1NyX4T2r0Qy9jHTXdLEb5bvBRLxo=
SHA256 (go_modules/github.com/cespare/xxhash/v2/@v/v2.1.2.mod) =
oJD46q9ZzCrfFjKZ6+/nl+Hco/at0sjoimo7kLpTiwI=
SHA256 (go_modules/github.com/cespare/xxhash/v2/@v/v2.1.2.zip) =
rGQayDMN9h9nfIdEj8Z5xHiGCH0pM6HkMVVvQjeC6jg=
+SHA256 (go_modules/github.com/chai2010/webp/@v/v1.1.1.mod) =
DtF6lVkzB/2IPo9YOshHZQQev0uAfLJMJX4UyW8PCgg=
+SHA256 (go_modules/github.com/chai2010/webp/@v/v1.1.1.zip) =
9C/haXAH6hIVWl0TQtYXh+HzTKOWGS5JldxPKzUFUqw=
SHA256
(go_modules/github.com/coreos/go-systemd/v22/@v/v22.3.3-0.20220203105225-a9a7ef127534.mod)
= 3pM5X+kwhvgFU4INFASJ4x6Tv+BFfhtN48dyVW1TSEA=
SHA256
(go_modules/github.com/coreos/go-systemd/v22/@v/v22.3.3-0.20220203105225-a9a7ef127534.zip)
= JJhDlzxgvruu4vhFLW8hLGfgZc1/wgoep9/8Hjhf7Y0=
SHA256 (go_modules/github.com/davecgh/go-spew/@v/v1.1.1.mod) =
vLKTkyUSN7eaF7bBm/KRNPQ+j0OMMZiYj81GGhzfBcw=
@@ -17,6 +19,7 @@ SHA256 (go_modules/github.com/go-logfmt/
SHA256 (go_modules/github.com/godbus/dbus/v5/@v/v5.0.4.mod) =
h0Pqcv7SHMFDxKBnQI4h93h2EOZi/b6NWUMxLqiuiBY=
SHA256 (go_modules/github.com/godbus/dbus/v5/@v/v5.0.4.zip) =
I6I/CL6kjm5JpGpAFbZK27FpLcbd8Ng8LwwgJ8uOMcg=
SHA256 (go_modules/github.com/golang/protobuf/@v/v1.2.0.mod) =
wKIDG/J3CHdJ2MzEMkSfaxN1eH6shkHdL5MAdCMar7Q=
+SHA256 (go_modules/github.com/golang/protobuf/@v/v1.3.5.mod) =
s6wk4gSR2Eb+rulQiL3gkmzl4kU4UCUPUkdEFuZhKUQ=
SHA256 (go_modules/github.com/golang/protobuf/@v/v1.5.0.mod) =
c4y7HelrZ6YjisO4CBzYsb+w2uvPbJu+jL221zuuzRk=
SHA256 (go_modules/github.com/golang/protobuf/@v/v1.5.2.mod) =
fI52EFJ6/Xckx+i36EPxMrDbYejJ3UncWJ1DDokpvMQ=
SHA256 (go_modules/github.com/golang/protobuf/@v/v1.5.2.zip) =
XRyBe+vBICqztCpBjlhOAAjoAnuvISzmnCrj6ee4xks=
@@ -33,15 +36,14 @@ SHA256 (go_modules/github.com/json-itera
SHA256 (go_modules/github.com/json-iterator/go/@v/v1.1.12.zip) =
0AHqVwga/Q43hGfI9Km2pRJZmWu4u3Y/eBB+rxL5lQE=
SHA256 (go_modules/github.com/julienschmidt/httprouter/@v/v1.3.0.mod) =
an1sxZcYSgyz/a/is1XYRMeHmjdRt/gd7I/wIWzHu30=
SHA256 (go_modules/github.com/julienschmidt/httprouter/@v/v1.3.0.zip) =
5FfczXAV80BmTjuM/UGZdHE4LaL0p0PuVb5Tmrxsofk=
-SHA256 (go_modules/github.com/lib/pq/@v/v1.10.6.mod) =
lMFIhoiyuYIqluE3XjIAKmUswa7nFSD2v6h77I63nAY=
-SHA256 (go_modules/github.com/lib/pq/@v/v1.10.6.zip) =
ckfcQoS7Vy3Yuzkyqxv4o96VOIKt4YwxokCDivjHPuk=
+SHA256 (go_modules/github.com/lib/pq/@v/v1.10.7.mod) =
lMFIhoiyuYIqluE3XjIAKmUswa7nFSD2v6h77I63nAY=
+SHA256 (go_modules/github.com/lib/pq/@v/v1.10.7.zip) =
XTOfQpbc9lC0zsa1jkSYj4u/ekyku5//bgQhRk79dhI=
SHA256 (go_modules/github.com/mattn/go-colorable/@v/v0.1.12.mod) =
MBtO/MadpAuRzMjSzFjohZXorYcSrKAUA/EAhtlrGBM=
SHA256 (go_modules/github.com/mattn/go-colorable/@v/v0.1.12.zip) =
xGN0mUCaQIH7vX6gZAqgrzDA4Gpwqhsgd4CwJRZQ2M0=
SHA256 (go_modules/github.com/mattn/go-isatty/@v/v0.0.14.mod) =
6SmRM81yQ+wmZ6oloEstrGAJI0rkwc2k7bRXSZcNrp8=
SHA256 (go_modules/github.com/mattn/go-isatty/@v/v0.0.14.zip) =
a48BdljZAN6HP8VnI3VI7yBUCCrtZGaWVeUb7u/ug8c=
-SHA256 (go_modules/github.com/mattn/go-sqlite3/@v/v1.14.14.mod) =
odA8NpvbveDb1GzwuPAn+2XkVFxrp4juFC6DeZhF+9w=
-SHA256 (go_modules/github.com/mattn/go-sqlite3/@v/v1.14.15.mod) =
tmtIYA14NsYZ0AJP4f+zWZYQ2ffWahLVx+mCjk4YBHM=
-SHA256 (go_modules/github.com/mattn/go-sqlite3/@v/v1.14.15.zip) =
ARTS30Od3rA+70mkvyzI+2lmXA12SURjyvp9GJoW4Pk=
+SHA256 (go_modules/github.com/mattn/go-sqlite3/@v/v1.14.16.mod) =
tmtIYA14NsYZ0AJP4f+zWZYQ2ffWahLVx+mCjk4YBHM=
+SHA256 (go_modules/github.com/mattn/go-sqlite3/@v/v1.14.16.zip) =
wBboqi53eyFvKDXxx4jC9kZr0GyVVADtIUSnc3rIL3M=
SHA256
(go_modules/github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.mod) =
XJwAhrmy623J8nuh0zsopmRj/jDC+Hb/BbfISOd56nc=
SHA256
(go_modules/github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.zip) =
5k3FgCP0uMRHLQWkTycZuE1sLMNkzGgoIMn3KyM8nNw=
SHA256
Re: [maintainer update] difftastic 0.39
On Tue, 20 Dec 2022 20:39:36 +0100, Volker Schlecht wrote: > * Updates difftastic > * Reverts an upstream fix to tree_magic_mini, since > the upstream solution is pulled from a git repo during build time OK, build and works fine on amd64 Laurent
[maintainer update] editors/helix version 22.12
Update for helix-editor version 22.12
- Blog post about release 22.12 Highlights
https://helix-editor.com/news/release-22-12-highlights/
- Changelog
https://github.com/helix-editor/helix/blob/master/CHANGELOG.md#2212-2022-12-06
Build, tests and works fine on amd64
Laurent
Index: Makefile
===
RCS file: /cvs/ports/editors/helix/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- Makefile 11 Nov 2022 15:54:50 - 1.1.1.1
+++ Makefile 21 Dec 2022 13:43:37 -
@@ -1,6 +1,6 @@
COMMENT = modal text editor
-VER = 22.08.1
+VER = 22.12
DISTNAME = helix-${VER}
CATEGORIES = editors
@@ -12,7 +12,7 @@ MAINTAINER = Laurent Cheylus https://github.com/helix-editor/helix/releases/download/${VER}/
@@ -32,7 +32,7 @@ pre-extract:
@mkdir -p ${WRKDIST}
post-patch:
- grep -F -Rl '%%DATADIR%%' ${WRKSRC} | xargs sed -i \
+ grep -F -Rls '%%DATADIR%%' ${WRKSRC} | xargs sed -i \
's,%%DATADIR%%,${PREFIX}/share/helix,'
do-install:
@@ -50,8 +50,7 @@ do-install:
find ${WRKSRC}/runtime/grammars/ -type f -name '*.so' -exec \
cp -a {} ${PREFIX}/share/helix/runtime/grammars \;
- ${INSTALL_DATA} ${WRKSRC}/runtime/tutor.txt \
- ${PREFIX}/share/helix/runtime
+ ${INSTALL_DATA} ${WRKSRC}/runtime/tutor ${PREFIX}/share/helix/runtime
${INSTALL_DATA} ${WRKSRC}/languages.toml ${PREFIX}/share/helix
.include "crates.inc"
Index: crates.inc
===
RCS file: /cvs/ports/editors/helix/crates.inc,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 crates.inc
--- crates.inc 11 Nov 2022 15:54:50 - 1.1.1.1
+++ crates.inc 21 Dec 2022 13:43:37 -
@@ -1,25 +1,45 @@
-MODCARGO_CRATES += aho-corasick 0.7.18 # Unlicense/MIT
+MODCARGO_CRATES += adler 1.0.2 # 0BSD OR MIT OR Apache-2.0
+MODCARGO_CRATES += ahash 0.7.6 # MIT OR Apache-2.0
+MODCARGO_CRATES += ahash 0.8.2 # MIT OR Apache-2.0
+MODCARGO_CRATES += aho-corasick 0.7.20 # Unlicense OR MIT
MODCARGO_CRATES += android_system_properties 0.1.5 # MIT/Apache-2.0
-MODCARGO_CRATES += anyhow 1.0.63 # MIT OR Apache-2.0
+MODCARGO_CRATES += anyhow 1.0.66 # MIT OR Apache-2.0
MODCARGO_CRATES += arc-swap 1.5.1 # Apache-2.0/MIT
+MODCARGO_CRATES += atoi 1.0.0 # MIT
MODCARGO_CRATES += autocfg 1.1.0 # Apache-2.0 OR MIT
MODCARGO_CRATES += bitflags 1.3.2 # MIT/Apache-2.0
MODCARGO_CRATES += bstr 0.2.17 # MIT OR Apache-2.0
-MODCARGO_CRATES += bumpalo 3.11.0 # MIT/Apache-2.0
+MODCARGO_CRATES += bstr 1.0.1 # MIT OR Apache-2.0
+MODCARGO_CRATES += btoi 0.4.2 # MIT OR Apache-2.0
+MODCARGO_CRATES += bumpalo 3.11.1 # MIT/Apache-2.0
+MODCARGO_CRATES += byte-unit 4.0.17 # MIT
MODCARGO_CRATES += bytecount 0.6.3 # Apache-2.0/MIT
-MODCARGO_CRATES += bytes 1.2.1 # MIT
+MODCARGO_CRATES += bytes 1.3.0 # MIT
+MODCARGO_CRATES += bytesize 1.1.0 # Apache-2.0
MODCARGO_CRATES += cassowary 0.3.0 # MIT / Apache-2.0
-MODCARGO_CRATES += cc 1.0.73 # MIT/Apache-2.0
+MODCARGO_CRATES += castaway 0.2.2 # MIT
+MODCARGO_CRATES += cc 1.0.77 # MIT OR Apache-2.0
MODCARGO_CRATES += cfg-if 1.0.0 # MIT/Apache-2.0
MODCARGO_CRATES += chardetng 0.1.17 # Apache-2.0 OR MIT
-MODCARGO_CRATES += chrono 0.4.22 # MIT/Apache-2.0
+MODCARGO_CRATES += chrono 0.4.23 # MIT/Apache-2.0
MODCARGO_CRATES += clipboard-win 4.4.2 # BSL-1.0
+MODCARGO_CRATES += clru 0.5.0 # MIT
+MODCARGO_CRATES += codespan-reporting 0.11.1 # Apache-2.0
+MODCARGO_CRATES += compact_str 0.6.1 # MIT
MODCARGO_CRATES += content_inspector 0.2.4 # MIT/Apache-2.0
MODCARGO_CRATES += core-foundation-sys 0.8.3 # MIT / Apache-2.0
-MODCARGO_CRATES += crossbeam-utils 0.8.11 # MIT OR Apache-2.0
+MODCARGO_CRATES += crc32fast 1.3.2 # MIT OR Apache-2.0
+MODCARGO_CRATES += crossbeam-utils 0.8.14 # MIT OR Apache-2.0
MODCARGO_CRATES += crossterm 0.25.0 # MIT
MODCARGO_CRATES += crossterm_winapi 0.9.0 # MIT
+MODCARGO_CRATES += cxx 1.0.82 # MIT OR Apache-2.0
+MODCARGO_CRATES += cxx-build 1.0.82 # MIT OR Apache-2.0
+MODCARGO_CRATES += cxxbridge-flags 1.0.82 # MIT OR Apache-2.0
+MODCARGO_CRATES += cxxbridge-macro 1.0.82 # MIT OR Apache-2.0
+MODCARGO_CRATES += dashmap 5.4.0 # MIT
+MODCARGO_CRATES += dirs 4.0.0 # MIT OR Apache-2.0
MODCARGO_CRATES += dirs-next 2.0.0 # MIT OR Apache-2.0
+MODCARGO_CRATES += dirs-sys 0.3.7 # MIT OR Apache-2.0
MODCARGO_CRATES += dirs-sys-next 0.1.2 # MIT OR Apache-2.0
MODCARGO_CRATES += either 1.8.0 # MIT/Apache-2.0
MODCARGO_CRATES += encoding_rs 0.8.31 # (Apache-2.0 OR MIT) AND BSD-3-Clause
@@ -28,119 +48,188 @@ MODCARGO_CRATES += error-code 2.3.1 # BS
MODCARGO_CRATES += etcetera 0.4.0 # MIT OR Apache-2.0
MODCARGO_CRATES += fastrand 1.8.0 # Apache-2.0 OR MIT
MODCARGO_CRATES += fern 0.6.1 # MIT
+MODCARGO_CRATES += filetime 0.2.18 # MIT/Apache-2.0
+MODCARGO_CRATES += flate2 1.0.25 # MIT OR Apache-2.0
MODCARGO_CRATES += fnv 1.0.7 # Apache-2.0 / MIT
-MODCARGO_CRATES += form_urlencoded 1.0.1 # MIT/Apache-2.0
-MODCARGO_CRATES += futures-core 0.3.24 # MIT OR Apache-2.0
-MODCARGO_CRATES += futures-executor
Re: NEW: net/endlessh
On Tue, Dec 20, 2022 at 07:04:19PM +0100, Pascal Stumpf wrote:
> On Sun, 18 Dec 2022 15:11:22 +0100, Michael wrote:
> > On Sun, Dec 18, 2022 at 11:55:12AM +, Stuart Henderson wrote:
> > > On 2022/12/17 22:36, Michael wrote:
> > > > On Sat, Dec 17, 2022 at 11:06:32AM +0100, Omar Polo wrote:
> > > > > On 2022/12/17 10:41:26 +0100, Pascal Stumpf wrote:
> > > > > > On Sat, 17 Dec 2022 10:18:15 +0100, Pascal Stumpf wrote:
> > > > > > > A few tweaks:
> > > > > > >
> > > > > > > * set MAKE_FLAGS so that the build respects CFLAGS
> > > > > > > * NO_TESTS = Yes
> > > > > > > * add README and endless.rc to the port itself, reformat, turn on
> > > > > > > -s per
> > > > > > > default (syslog logging)
> > > > > > > * add dedicated _endlessh user
> > > > > > > * install a default config file into examples and @sample it
> > > > > >
> > > > > > * correct Nm in endlessh.1
> > > > >
> > > > > there's an extra patch-Makefile.orig in the tarball and
> > > > > pkg/endlessh.rc is executable when it doesn't need to.
> > > > >
> > > > > ok for me with that fixed.
> > > >
> > > > Thanks to Pascal and you for the tweaks.
> > > >
> > > > I have tested the latest revision; works as expected and the changes
> > > > seem fine to me. I took the liberty of fixing the last problems Omar
> > > > mentioned in the attached port.
> > > >
> > > > >
> > > > >
> > > > > in pkg/README I'd say to symlink /etc/rc.d/endlessh to endlessh6
> > > > > instead of copying it, less to worry when updating.
> > > > >
> > > > > If I'm reading it correctly, it can't directly bind to 22 because it
> > > > > doesn't start as root, it' would be nice to include an excerpt of the
> > > > > pf configuration to redirect the port 22 to .
> > > > >
> > > > > I'd use a patch instead of perl -pi in post-install to tweak the
> > > > > configuration, it's more verbose but it's also more resiliant to
> > > > > upstream changes to the file.
> > > > >
> > > > > Including the diff for user.list in case it comes in handy to who
> > > > > would like to test it.
> > > > >
> > > > > Index: user.list
> > > > > ===
> > > > > RCS file: /home/cvs/ports/infrastructure/db/user.list,v
> > > > > retrieving revision 1.413
> > > > > diff -u -p -r1.413 user.list
> > > > > --- user.list 14 Dec 2022 12:09:05 - 1.413
> > > > > +++ user.list 17 Dec 2022 09:50:27 -
> > > > > @@ -395,3 +395,4 @@ id user group port
> > > > > 884 _iblock _iblock net/iblock
> > > > > 885 _mycorrhiza _mycorrhiza www/mycorrhiza
> > > > > 886 _eduvpn _eduvpn net/eduvpn
> > > > > +887 _endlessh_endlessh net/endlessh
> > > > >
> > >
> > > There is no 1.1 release yet, so better name it 1.1pre20210430 (date of
> > > commit).
> > >
> > > From readme:
> > >
> > > : If you want to cover both IPv4 and IPv6 you'll need to run *two*
> > > instances of
> > > : endlessh.
> > > :
> > > : - copy the endlessh rc script to ${RCDIR}/endlessh6
> > > : - copy the config file to ${SYSCONFDIR}/endlessh/config6
> > > : - use BindFamily 6 in config6
> > > : - in rc.conf.local force endlessh6 to load config6 like so:
> > > :
> > > : endlessh6_flags=-s -f /etc/endlessh/config6
> > > : endlessh_flags=-s
> > >
> > > No need to tell the user to do this, just provide an endlessh6 rc script
> > > with the required daemon_flags. I don't think you need a second config
> > > file, just use -6.
> > >
> > > : Covering more than 128 connections
> > > : ==
> > > :
> > > : The defaults in OpenBSD only allow for 128 open file descriptors per
> > > process,
> > > : so regardless of the MaxClients setting in ${SYSCONFDIR}/endlessh/config
> > > : you'll end up with something like 124 clients at the most.
> > > : You can increase these limits in ${SYSCONFDIR}/login.conf for endlessh
> > > (and
> > > : endlessh6) like so:
> > > :
> > > : endlessh:\
> > > : :openfiles=1024:\
> > > : :tc=daemon:
> > > : endlessh6:\
> > > : :openfiles=1024:\
> > > : :tc=daemon:
> > >
> > > Provide pkg/endlessh.login and endless6.login files instead. 1024x2 is
> > > a bit high for the default kern.maxfiles, I would suggest not more than
> > > 512 for the installed file, users can change it if they need more.
> > >
> > > Then because it is just using standard OS mechanisms there is no more
> > > need for pkg/README.
> > >
> >
> > Thanks for the feedback.
> >
> > Attached port should contain all the suggestions above.
> > Also the pledge() comment was changed to "uses pledge() and unveil()"
> >
> > portcheck now complains about the two extra *.login files but looking at
> > other ports that have those this seems normal:
> >
> > # /usr/ports/infrastructure/bin/portcheck
> > extra file: pkg/endlessh.login
> > extra file: pkg/endlessh6.login
> > net/endlessh
> >
> >
> > (this time actually reaching the
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2022/12/21 06:57:03 Modified files: x11/icewm : Makefile distinfo x11/icewm/patches: patch-man_icewm-preferences_pod patch-src_default_h patch-src_icesh_cc Log message: update to icewm-3.3.0
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2022/12/21 06:50:00 Modified files: databases/recoll: Makefile distinfo databases/recoll/pkg: PLIST-main Log message: update to recoll-1.33.4
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2022/12/21 06:49:48 Modified files: www/hiawatha : Makefile distinfo www/hiawatha/patches: patch-CMakeLists_txt patch-man_hiawatha_1_in patch-src_serverconfig_c www/hiawatha/pkg: DESCR Log message: update to hiawatha-11.2; it now uses a bundled newer version of mbedtls. the license status hasn't changed (hiawatha is GPLv2 only, mbedtls is Apache v2; these are incompatible so we can't distribute binaries). point out upstream's "Due to lack of interest in this project, I no longer actively support and promote Hiawatha" message in DESCR.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2022/12/21 06:21:01 Modified files: www/composer : Makefile distinfo Log message: update to composer-2.5.0
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2022/12/21 05:54:57 Modified files: databases/citus: Makefile distinfo Log message: update to citus-11.1.5
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2022/12/21 05:54:55 Modified files: databases/py-sqlalchemy: Makefile distinfo Log message: update to py3-sqlalchemy-1.4.45
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2022/12/21 05:54:53 Modified files: devel/py-tox : Makefile distinfo devel/py-tox/pkg: PLIST Log message: update to py3-tox-4.0.16
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2022/12/21 05:54:54 Modified files: databases/py-peewee: Makefile distinfo Log message: update to py3-peewee-3.15.4
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2022/12/21 05:54:50 Modified files: devel/py-toolz : Makefile distinfo Log message: update to py3-toolz-0.12.0
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2022/12/21 05:54:56 Modified files: databases/py-odbc: Makefile distinfo databases/py-odbc/patches: patch-setup_py Log message: update to py3-odbc-4.0.35
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: p...@cvs.openbsd.org2022/12/21 04:48:48 Modified files: productivity/py-tasklib: Makefile distinfo productivity/py-tasklib/pkg: PLIST Log message: update productivity/py-tasklib to 2.5.1 comments by sthen ok kmos
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: t...@cvs.openbsd.org2022/12/21 02:59:35 Modified files: lang/python: Makefile.inc Log message: python: remove workaround for python 3.11 to unbreak build
Re: maintainer update productivity/py-tasklib to 2.5.1
Not new, but there's a missing ${MODPY_FLAVOR} in TEST_DEPENDS.
--
Sent from a phone, apologies for poor formatting.
On 21 December 2022 03:11:31 Kurt Mosiejczuk wrote:
On Tue, Dec 20, 2022 at 06:10:43PM +0100, Paco Esteban wrote:
Hi ports@,
This is an update of productivity/py-tasklib to its latest version 2.5.1
All tests pass and works for me on amd64.
Ok to commit ?
ok kmos
--Kurt
diff /usr/ports
commit - 098e393787f2c24397af66355476160b7673e97b
path + /usr/ports
blob - a6a8866ecab7723498f5ab419d2c681a409beaa3
file + productivity/py-tasklib/Makefile
--- productivity/py-tasklib/Makefile
+++ productivity/py-tasklib/Makefile
@@ -1,14 +1,13 @@
COMMENT = Python library to interact with Task Warrior
-MODPY_EGG_VERSION =2.4.3
+MODPY_EGG_VERSION =2.5.1
DISTNAME = tasklib-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
-REVISION = 1
CATEGORIES = productivity
-HOMEPAGE = https://github.com/robgolding/tasklib
+HOMEPAGE = https://github.com/GothenburgBitFactory/tasklib
MAINTAINER = Paco Esteban
# BSD
blob - ac29bd251679fc2218968436532c735ee7365ff5
file + productivity/py-tasklib/distinfo
--- productivity/py-tasklib/distinfo
+++ productivity/py-tasklib/distinfo
@@ -1,2 +1,2 @@
-SHA256 (tasklib-2.4.3.tar.gz) = tSO8Eok9JsgXOmuNhLFiWcmpxayq+JMrwBgRf5B7O8U=
-SIZE (tasklib-2.4.3.tar.gz) = 23781
+SHA256 (tasklib-2.5.1.tar.gz) = XM1zG1JjbdEEV6i42FjLDQJv+qsePnUbr3kb+APjfXs=
+SIZE (tasklib-2.5.1.tar.gz) = 23805
blob - 9d5575292954e3af0001a420fb1a0daf5e0aafd1
file + productivity/py-tasklib/pkg/PLIST
--- productivity/py-tasklib/pkg/PLIST
+++ productivity/py-tasklib/pkg/PLIST
@@ -1,5 +1,6 @@
lib/python${MODPY_VERSION}/site-packages/tasklib/
lib/python${MODPY_VERSION}/site-packages/tasklib-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/tasklib-${MODPY_EGG_VERSION}.dist-info/AUTHORS
lib/python${MODPY_VERSION}/site-packages/tasklib-${MODPY_EGG_VERSION}.dist-info/LICENSE
lib/python${MODPY_VERSION}/site-packages/tasklib-${MODPY_EGG_VERSION}.dist-info/METADATA
lib/python${MODPY_VERSION}/site-packages/tasklib-${MODPY_EGG_VERSION}.dist-info/RECORD
--
Paco Esteban.
0x5818130B8A6DBC03
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2022/12/21 02:15:26 Modified files: x11/xfce4/xfce4-mixer: Makefile distinfo x11/xfce4/xfce4-mixer/pkg: PLIST Log message: Update to latest commit, bump our own pre version to current Xfce Just translation updates and a memleak fix. With this I can test pending fixes more easily by applying them to our port and update rather than building xfce4-mixer out-of-tree and start things manually. OK landry
Re: x11/xfce4/xfce4-mixer: update to latest commit
12/21/22 12:27, Landry Breuil пишет: > Le Tue, Dec 20, 2022 at 08:46:56PM +, Klemens Nanni a écrit : >> I'm hunting a bug but there are updates ahead, so let's pull them first. >> >> Not sure what the version should be... latest Xfce with our preN suffix? >> That's why I did here. >> >> Current 4.15 doesn't seem special: upstream last tagged for 4.11 and the >> before Xfce 4.18 we had 4.16 in ports, so it's not the previous version, >> either. > > I chose 4.15 because it was the current version of other components when > mixer was revived by @ali in the multiple-backends branch, after having > been abandoned before 4.12 since gst1 had no mixer support (hence 4.11 > being the last tag). > > at that time i did the sndio work > (https://gitlab.xfce.org/apps/xfce4-mixer/-/merge_requests/2) and got it > merged by ali, his branch was (i think) merged to master then he > disappeared again so no proper release has been done. > > so maybe 4.18.0pre0 makes sense in that regard. Sounds like it, thanks for providing details. I think it'd be confusing to bump to older Xfce versions and/or staying at 4.11 since afterall development contains, "just" without tags. Should upstream ever tag again, they'd hopefully do so against the latest Xfce version at that point, which is 4.18 now. >> >> Upstream mostly updated translations, but there's also a memleak fix and >> some autoconf sndio bits, although those should be relevant for us. > > we should be fine since /usr/lib/pkgconfig/sndio.pc says we have 1.9.0. Exactly. > The existing previous sndio detection i did worked for us, but looking > at > https://gitlab.xfce.org/apps/xfce4-mixer/-/commit/42b6ee12cddcf0f61e100397260865ca76e257fc > it should still work. havent tested yet but if it works for you we > should be fine :) Yup, no regression with this update. I'll commit shortly, then.
Re: x11/xfce4/xfce4-mixer: update to latest commit
Le Tue, Dec 20, 2022 at 08:46:56PM +, Klemens Nanni a écrit : > I'm hunting a bug but there are updates ahead, so let's pull them first. > > Not sure what the version should be... latest Xfce with our preN suffix? > That's why I did here. > > Current 4.15 doesn't seem special: upstream last tagged for 4.11 and the > before Xfce 4.18 we had 4.16 in ports, so it's not the previous version, > either. I chose 4.15 because it was the current version of other components when mixer was revived by @ali in the multiple-backends branch, after having been abandoned before 4.12 since gst1 had no mixer support (hence 4.11 being the last tag). at that time i did the sndio work (https://gitlab.xfce.org/apps/xfce4-mixer/-/merge_requests/2) and got it merged by ali, his branch was (i think) merged to master then he disappeared again so no proper release has been done. so maybe 4.18.0pre0 makes sense in that regard. > > Upstream mostly updated translations, but there's also a memleak fix and > some autoconf sndio bits, although those should be relevant for us. we should be fine since /usr/lib/pkgconfig/sndio.pc says we have 1.9.0. The existing previous sndio detection i did worked for us, but looking at https://gitlab.xfce.org/apps/xfce4-mixer/-/commit/42b6ee12cddcf0f61e100397260865ca76e257fc it should still work. havent tested yet but if it works for you we should be fine :)
