Re: UPDATE: libass 0.15.1
On Fri, Aug 27, 2021 at 02:12:43PM -0400, Brad Smith wrote:
> On Tue, Aug 24, 2021 at 09:33:43PM -0400, Brad Smith wrote:
> > Here is an update to libass 0.15.1.
> >
> > libass (0.15.1)
> > * Fix currently known 0.15.0 regressions:
> > * Fix crashing on some ASS files with embedded fonts
> > * Fix total font fallback failure with some fonts on Core Text
> > * Fix embedded and memory fonts not actually being used
> >unless ass_set_fonts was called after they have been added
> > * Fix events assuming the largest xbord-value of a preceding
> >event of the same frame during collision handling
> > * Fix \fscx0 and \fscy0 making more text disappear than they should
> > * Fix shift in vertical positioning of some right-to-left
> >events with \an4-6, \pos, \move or Scroll effects
> > * Fix imprecise output for \be with huge argument
> > * Fix the --enable-large-tiles configure switch doing nothing
> > * Fix output of ASM-enabled builds deviating from non-ASM builds
> > * Fix ASM-builds on Haiku and 32-bit *BSDs
> > * Overhaul x86 assembly for better performance
> >and to allow ASM-enabled PIC-builds on 32-bit
> > * Reduce temporary allocation in rendering
> > * DirectWrite: request fonts on demand for better performance and
> >improved compatibility with external on-demand font activation
> > * Log libass version numbers upon renderer startup
> > * Accept pointers to const as arguments to ass_add_font
> > * Improve VSFilter compatibility:
> > * Disregard zero area events in collision handling
> > * Do not apply \fsp to vector drawings
> > * Fix bug preventing cutting out glyphs from border & shadow
> > with abnormal \fad values (or causing aliasing artifacts
> > in some cases with normal values)
>
> Here is an updated diff with a fix rolled in to allow enabling the
> assembly support for amd64.
And fixing things for i386 too.
Index: Makefile
===
RCS file: /home/cvs/ports/multimedia/libass/Makefile,v
retrieving revision 1.25
diff -u -p -u -p -r1.25 Makefile
--- Makefile14 Dec 2020 15:56:36 - 1.25
+++ Makefile27 Aug 2021 23:13:57 -
@@ -2,7 +2,7 @@
COMMENT= portable ASS/SSA subtitle renderer
-VER= 0.15.0
+VER= 0.15.1
DISTNAME= libass-${VER}
CATEGORIES=multimedia devel
MASTER_SITES= https://github.com/libass/libass/releases/download/${VER}/
@@ -23,13 +23,20 @@ WANTLIB=${COMPILER_LIBCXX} expat fontco
COMPILER= base-clang ports-gcc
COMPILER_LANGS=c
+.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386"
+BUILD_DEPENDS+=devel/nasm
+.endif
+
LIB_DEPENDS= converters/libiconv \
devel/fribidi \
devel/harfbuzz
CONFIGURE_STYLE= gnu
-CONFIGURE_ARGS=--disable-asm
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+ LDFLAGS="-L${LOCALBASE}/lib" \
+ ASFLAGS="-DPIC=1 "
+
+post-patch:
+ chmod ${BINMODE} ${WRKSRC}/ltnasm.sh
.include
Index: distinfo
===
RCS file: /home/cvs/ports/multimedia/libass/distinfo,v
retrieving revision 1.17
diff -u -p -u -p -r1.17 distinfo
--- distinfo14 Dec 2020 15:56:36 - 1.17
+++ distinfo25 Aug 2021 01:14:14 -
@@ -1,2 +1,2 @@
-SHA256 (libass-0.15.0.tar.xz) = nwkjDJoKpo73qmqeKrcJypVwIPhC5SxbLlK4AafZ6DM=
-SIZE (libass-0.15.0.tar.xz) = 367848
+SHA256 (libass-0.15.1.tar.xz) = HN05ydAHsG5zfnc4AE1/OM+bHpKEPzcweyTn/2OrjlM=
+SIZE (libass-0.15.1.tar.xz) = 369884
Index: patches/patch-libass_Makefile_in
===
RCS file: patches/patch-libass_Makefile_in
diff -N patches/patch-libass_Makefile_in
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-libass_Makefile_in27 Aug 2021 23:14:14 -
@@ -0,0 +1,26 @@
+$OpenBSD$
+
+Use a libtool-wrapper script for NASM.
+
+Libtool thinks NASM acts just like the C-compiler, which isn't true
+for e.g. -f options. Previously we used -prefer-non-pic to avoid libtool
+passing any additional flags, which worked well on all tested platforms
+but as it turns out at least on OpenBSD this does not work.
+This now also means we'll automatically get the -DPIC flag as needed,
+which might perhaps also help some platforms we didn't test yet; before
+we fully relied on x86inc's automatic setting for PIC in assembly.
+
+https://github.com/libass/libass/issues/539
+
+Index: libass/Makefile.in
+--- libass/Makefile.in.orig
libass/Makefile.in
+@@ -844,7 +844,7 @@ uninstall-am: uninstall-dist_assheadersHEADERS \
+
+
+ .asm.lo:
+- $(nasm_verbose)$(LIBTOOL) $(AM_V_lt) --tag=CC --mode=compile $(AS)
$(ASFLAGS) -I$(srcdir)/ -o $@ $< -prefer-non-pic
++ $(nasm_verbose)$(LIBTOOL) $(AM_V_lt) --tag=CC --mode=compile
$(top_srcdir)/ltnasm.sh $(AS) $(ASFLAGS) -I$(srcdir)/ -o $@ $<
+
Re: net/tg: Mention fzf in MESSAGE, ship readme
On Fri, Aug 27, 2021 at 11:15:13PM +0100, Stuart Henderson wrote: > On 2021/08/27 22:06, Klemens Nanni wrote: > > On Fri, Aug 27, 2021 at 10:29:23PM +0100, Stuart Henderson wrote: > > > On 2021/08/27 21:03, Klemens Nanni wrote: > > > > readme.md contains a fair bit of details about tg's config.py which > > > > otherwise requries a browser to learn about. > > > > > > > > OK? > > > > > > Maybe just add fzf as a dep, except on sparc64 (where tg is built but > > > fzf isn't)? > > > > Can do that as well. tg isn't built on sparc64 either since it > > eventually depends on tdlib which is little-endian only. > $ ls -l */tg-* > -rw-r--r-- 1 root wheel 124549 Aug 13 08:36 aarch64/tg-0.17.0.tgz > -rw-r--r-- 1 root wheel 124546 Aug 26 16:06 amd64/tg-0.17.0.tgz > -rw-r--r-- 1 root wheel 124554 Aug 26 04:18 i386/tg-0.17.0.tgz > -rw-r--r-- 1 root wheel 124552 Aug 22 07:43 mips64/tg-0.17.0.tgz > -rw-r--r-- 1 root wheel 124552 Aug 21 13:41 sparc64/tg-0.17.0.tgz Ah, thought it wouldn't even package without fulfilled RUN_DEPENDS. Either way, you cannot install it on sparc64: kn$ doas pkg_add tg quirks-4.33 signed on 2021-08-21T19:40:54Z Can't find tdlib-1.7.5 Can't install py3-telegram-0.14.0: can't resolve tdlib-1.7.5 Can't install tg-0.17.0: can't resolve py3-telegram-0.14.0 Couldn't install py3-telegram-0.14.0 tdlib-1.7.5 tg-0.17.0
Re: net/tg: Mention fzf in MESSAGE, ship readme
On 2021/08/27 22:06, Klemens Nanni wrote: > On Fri, Aug 27, 2021 at 10:29:23PM +0100, Stuart Henderson wrote: > > On 2021/08/27 21:03, Klemens Nanni wrote: > > > readme.md contains a fair bit of details about tg's config.py which > > > otherwise requries a browser to learn about. > > > > > > OK? > > > > Maybe just add fzf as a dep, except on sparc64 (where tg is built but > > fzf isn't)? > > Can do that as well. tg isn't built on sparc64 either since it > eventually depends on tdlib which is little-endian only. $ ls -l */tg-* -rw-r--r-- 1 root wheel 124549 Aug 13 08:36 aarch64/tg-0.17.0.tgz -rw-r--r-- 1 root wheel 124546 Aug 26 16:06 amd64/tg-0.17.0.tgz -rw-r--r-- 1 root wheel 124554 Aug 26 04:18 i386/tg-0.17.0.tgz -rw-r--r-- 1 root wheel 124552 Aug 22 07:43 mips64/tg-0.17.0.tgz -rw-r--r-- 1 root wheel 124552 Aug 21 13:41 sparc64/tg-0.17.0.tgz
Re: UPDATE: libass 0.15.1
On Tue, Aug 24, 2021 at 09:33:43PM -0400, Brad Smith wrote:
> Here is an update to libass 0.15.1.
>
> libass (0.15.1)
> * Fix currently known 0.15.0 regressions:
> * Fix crashing on some ASS files with embedded fonts
> * Fix total font fallback failure with some fonts on Core Text
> * Fix embedded and memory fonts not actually being used
>unless ass_set_fonts was called after they have been added
> * Fix events assuming the largest xbord-value of a preceding
>event of the same frame during collision handling
> * Fix \fscx0 and \fscy0 making more text disappear than they should
> * Fix shift in vertical positioning of some right-to-left
>events with \an4-6, \pos, \move or Scroll effects
> * Fix imprecise output for \be with huge argument
> * Fix the --enable-large-tiles configure switch doing nothing
> * Fix output of ASM-enabled builds deviating from non-ASM builds
> * Fix ASM-builds on Haiku and 32-bit *BSDs
> * Overhaul x86 assembly for better performance
>and to allow ASM-enabled PIC-builds on 32-bit
> * Reduce temporary allocation in rendering
> * DirectWrite: request fonts on demand for better performance and
>improved compatibility with external on-demand font activation
> * Log libass version numbers upon renderer startup
> * Accept pointers to const as arguments to ass_add_font
> * Improve VSFilter compatibility:
> * Disregard zero area events in collision handling
> * Do not apply \fsp to vector drawings
> * Fix bug preventing cutting out glyphs from border & shadow
> with abnormal \fad values (or causing aliasing artifacts
> in some cases with normal values)
Here is an updated diff with a fix rolled in to allow enabling the
assembly support for amd64.
Index: Makefile
===
RCS file: /home/cvs/ports/multimedia/libass/Makefile,v
retrieving revision 1.25
diff -u -p -u -p -r1.25 Makefile
--- Makefile14 Dec 2020 15:56:36 - 1.25
+++ Makefile27 Aug 2021 17:34:29 -
@@ -2,7 +2,7 @@
COMMENT= portable ASS/SSA subtitle renderer
-VER= 0.15.0
+VER= 0.15.1
DISTNAME= libass-${VER}
CATEGORIES=multimedia devel
MASTER_SITES= https://github.com/libass/libass/releases/download/${VER}/
@@ -28,8 +28,14 @@ LIB_DEPENDS= converters/libiconv \
devel/harfbuzz
CONFIGURE_STYLE= gnu
-CONFIGURE_ARGS=--disable-asm
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
+
+.if ${MACHINE_ARCH} == "i386"
+CONFIGURE_ARGS=--disable-asm
+.endif
+
+post-patch:
+ chmod ${BINMODE} ${WRKSRC}/ltnasm.sh
.include
Index: distinfo
===
RCS file: /home/cvs/ports/multimedia/libass/distinfo,v
retrieving revision 1.17
diff -u -p -u -p -r1.17 distinfo
--- distinfo14 Dec 2020 15:56:36 - 1.17
+++ distinfo25 Aug 2021 01:14:14 -
@@ -1,2 +1,2 @@
-SHA256 (libass-0.15.0.tar.xz) = nwkjDJoKpo73qmqeKrcJypVwIPhC5SxbLlK4AafZ6DM=
-SIZE (libass-0.15.0.tar.xz) = 367848
+SHA256 (libass-0.15.1.tar.xz) = HN05ydAHsG5zfnc4AE1/OM+bHpKEPzcweyTn/2OrjlM=
+SIZE (libass-0.15.1.tar.xz) = 369884
Index: patches/patch-libass_Makefile_in
===
RCS file: patches/patch-libass_Makefile_in
diff -N patches/patch-libass_Makefile_in
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-libass_Makefile_in27 Aug 2021 17:35:43 -
@@ -0,0 +1,26 @@
+$OpenBSD$
+
+Use a libtool-wrapper script for NASM.
+
+Libtool thinks NASM acts just like the C-compiler, which isn't true
+for e.g. -f options. Previously we used -prefer-non-pic to avoid libtool
+passing any additional flags, which worked well on all tested platforms
+but as it turns out at least on OpenBSD this does not work.
+This now also means we'll automatically get the -DPIC flag as needed,
+which might perhaps also help some platforms we didn't test yet; before
+we fully relied on x86inc's automatic setting for PIC in assembly.
+
+https://github.com/libass/libass/issues/539
+
+Index: libass/Makefile.in
+--- libass/Makefile.in.orig
libass/Makefile.in
+@@ -844,7 +844,7 @@ uninstall-am: uninstall-dist_assheadersHEADERS \
+
+
+ .asm.lo:
+- $(nasm_verbose)$(LIBTOOL) $(AM_V_lt) --tag=CC --mode=compile $(AS)
$(ASFLAGS) -I$(srcdir)/ -o $@ $< -prefer-non-pic
++ $(nasm_verbose)$(LIBTOOL) $(AM_V_lt) --tag=CC --mode=compile
$(top_srcdir)/ltnasm.sh $(AS) $(ASFLAGS) -I$(srcdir)/ -o $@ $<
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
Index: patches/patch-ltnasm_sh
===
RCS file: patches/patch-ltnasm_sh
diff -N patches/patch-ltnasm_sh
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-ltnasm_sh 27 Aug 2021 17:35:43 -
@@ -0,0
Re: net/tg: Mention fzf in MESSAGE, ship readme
On Fri, Aug 27, 2021 at 10:29:23PM +0100, Stuart Henderson wrote:
> On 2021/08/27 21:03, Klemens Nanni wrote:
> > readme.md contains a fair bit of details about tg's config.py which
> > otherwise requries a browser to learn about.
> >
> > OK?
>
> Maybe just add fzf as a dep, except on sparc64 (where tg is built but
> fzf isn't)?
Can do that as well. tg isn't built on sparc64 either since it
eventually depends on tdlib which is little-endian only.
Index: Makefile
===
RCS file: /cvs/ports/net/tg/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- Makefile9 Jun 2021 10:44:05 - 1.1.1.1
+++ Makefile27 Aug 2021 22:04:40 -
@@ -3,6 +3,7 @@
COMMENT = ncurses Telegram client
MODPY_EGG_VERSION =0.17.0
+REVISION = 0
DISTNAME = tg-${MODPY_EGG_VERSION}
@@ -19,6 +20,13 @@ MODPY_PI = Yes
MODPY_SETUPTOOLS = Yes
NO_TEST = Yes
-RUN_DEPENDS = net/py-telegram${MODPY_FLAVOR}
+RUN_DEPENDS = net/py-telegram${MODPY_FLAVOR} \
+ sysutils/fzf
+
+DOCDIR = ${PREFIX}/share/doc/tg
+
+post-install:
+ ${INSTALL_DATA_DIR} ${DOCDIR}/
+ ${INSTALL_DATA} ${WRKSRC}/readme.md ${DOCDIR}/
.include
Index: pkg/PLIST
===
RCS file: /cvs/ports/net/tg/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 9 Jun 2021 10:44:05 - 1.1.1.1
+++ pkg/PLIST 27 Aug 2021 22:05:52 -
@@ -33,3 +33,5 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/tg/update_handlers.py
lib/python${MODPY_VERSION}/site-packages/tg/utils.py
lib/python${MODPY_VERSION}/site-packages/tg/views.py
+share/doc/tg/
+share/doc/tg/readme.md
Update: www/ruby-rack-test 0.6.3 -> 1.1.0
Update ruby-rack-test to 1.1.0 and take maintainer
ok?
--Kurt
Index: Makefile
===
RCS file: /cvs/ports/www/ruby-rack-test/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- Makefile12 Jul 2019 20:51:04 - 1.10
+++ Makefile27 Aug 2021 21:31:53 -
@@ -2,10 +2,12 @@
COMMENT= small, simple testing API for Rack apps
-DISTNAME= rack-test-0.6.3
+DISTNAME= rack-test-1.1.0
CATEGORIES=www
HOMEPAGE= https://github.com/brynary/rack-test
+
+MAINTAINER=Kurt Mosiejczuk
# MIT
PERMIT_PACKAGE=Yes
Index: distinfo
===
RCS file: /cvs/ports/www/ruby-rack-test/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo25 Jun 2015 18:54:51 - 1.4
+++ distinfo27 Aug 2021 21:31:53 -
@@ -1,2 +1,2 @@
-SHA256 (rack-test-0.6.3.gem) = /2CxIuKUDjLpSi5KYbzrjZyZqXwYF+zEflNVIrAs3UA=
-SIZE (rack-test-0.6.3.gem) = 23552
+SHA256 (rack-test-1.1.0.gem) = FUFh9A8WKxwAmmVbewxd46MQLMbX0ulLZOH0as6ACGY=
+SIZE (rack-test-1.1.0.gem) = 17920
Index: pkg/PLIST
===
RCS file: /cvs/ports/www/ruby-rack-test/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST 13 Dec 2011 17:59:33 - 1.3
+++ pkg/PLIST 27 Aug 2021 21:31:53 -
@@ -2,15 +2,9 @@
@pkgpath devel/ruby-rack-test
${GEM_LIB}/cache/${DISTNAME}.gem
${GEM_LIB}/gems/${DISTNAME}/
-${GEM_LIB}/gems/${DISTNAME}/.document
-${GEM_LIB}/gems/${DISTNAME}/.gitignore
-${GEM_LIB}/gems/${DISTNAME}/Gemfile
-${GEM_LIB}/gems/${DISTNAME}/Gemfile.lock
-${GEM_LIB}/gems/${DISTNAME}/History.txt
+${GEM_LIB}/gems/${DISTNAME}/History.md
${GEM_LIB}/gems/${DISTNAME}/MIT-LICENSE.txt
-${GEM_LIB}/gems/${DISTNAME}/README.rdoc
-${GEM_LIB}/gems/${DISTNAME}/Rakefile
-${GEM_LIB}/gems/${DISTNAME}/Thorfile
+${GEM_LIB}/gems/${DISTNAME}/README.md
${GEM_LIB}/gems/${DISTNAME}/lib/
${GEM_LIB}/gems/${DISTNAME}/lib/rack/
${GEM_LIB}/gems/${DISTNAME}/lib/rack/mock_session.rb
@@ -21,24 +15,5 @@ ${GEM_LIB}/gems/${DISTNAME}/lib/rack/tes
${GEM_LIB}/gems/${DISTNAME}/lib/rack/test/mock_digest_request.rb
${GEM_LIB}/gems/${DISTNAME}/lib/rack/test/uploaded_file.rb
${GEM_LIB}/gems/${DISTNAME}/lib/rack/test/utils.rb
-${GEM_LIB}/gems/${DISTNAME}/rack-test.gemspec
-${GEM_LIB}/gems/${DISTNAME}/spec/
-${GEM_LIB}/gems/${DISTNAME}/spec/fixtures/
-${GEM_LIB}/gems/${DISTNAME}/spec/fixtures/bar.txt
-${GEM_LIB}/gems/${DISTNAME}/spec/fixtures/config.ru
-${GEM_LIB}/gems/${DISTNAME}/spec/fixtures/fake_app.rb
-${GEM_LIB}/gems/${DISTNAME}/spec/fixtures/foo.txt
-${GEM_LIB}/gems/${DISTNAME}/spec/rack/
-${GEM_LIB}/gems/${DISTNAME}/spec/rack/test/
-${GEM_LIB}/gems/${DISTNAME}/spec/rack/test/cookie_spec.rb
-${GEM_LIB}/gems/${DISTNAME}/spec/rack/test/digest_auth_spec.rb
-${GEM_LIB}/gems/${DISTNAME}/spec/rack/test/multipart_spec.rb
-${GEM_LIB}/gems/${DISTNAME}/spec/rack/test/uploaded_file_spec.rb
-${GEM_LIB}/gems/${DISTNAME}/spec/rack/test/utils_spec.rb
-${GEM_LIB}/gems/${DISTNAME}/spec/rack/test_spec.rb
-${GEM_LIB}/gems/${DISTNAME}/spec/spec_helper.rb
-${GEM_LIB}/gems/${DISTNAME}/spec/support/
-${GEM_LIB}/gems/${DISTNAME}/spec/support/matchers/
-${GEM_LIB}/gems/${DISTNAME}/spec/support/matchers/body.rb
-${GEM_LIB}/gems/${DISTNAME}/spec/support/matchers/challenge.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/rack/test/version.rb
${GEM_LIB}/specifications/${DISTNAME}.gemspec
Re: net/tg: Mention fzf in MESSAGE, ship readme
On 2021/08/27 21:03, Klemens Nanni wrote:
> readme.md contains a fair bit of details about tg's config.py which
> otherwise requries a browser to learn about.
>
> OK?
Maybe just add fzf as a dep, except on sparc64 (where tg is built but
fzf isn't)?
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/net/tg/Makefile,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 Makefile
> --- Makefile 9 Jun 2021 10:44:05 - 1.1.1.1
> +++ Makefile 27 Aug 2021 20:57:01 -
> @@ -3,6 +3,7 @@
> COMMENT =ncurses Telegram client
>
> MODPY_EGG_VERSION = 0.17.0
> +REVISION = 0
>
> DISTNAME = tg-${MODPY_EGG_VERSION}
>
> @@ -20,5 +21,11 @@ MODPY_SETUPTOOLS = Yes
> NO_TEST =Yes
>
> RUN_DEPENDS =net/py-telegram${MODPY_FLAVOR}
> +
> +DOCDIR = ${PREFIX}/share/doc/tg
> +
> +post-install:
> + ${INSTALL_DATA_DIR} ${DOCDIR}/
> + ${INSTALL_DATA} ${WRKSRC}/readme.md ${DOCDIR}/
>
> .include
> Index: pkg/MESSAGE
> ===
> RCS file: pkg/MESSAGE
> diff -N pkg/MESSAGE
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ pkg/MESSAGE 27 Aug 2021 20:57:02 -
> @@ -0,0 +1,3 @@
> +fzf is required to create groups and secret chats
> +(used for single and multiple user selection):
> + # pkg_add fzf
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/net/tg/pkg/PLIST,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 PLIST
> --- pkg/PLIST 9 Jun 2021 10:44:05 - 1.1.1.1
> +++ pkg/PLIST 27 Aug 2021 20:58:16 -
> @@ -33,3 +33,5 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/tg/update_handlers.py
> lib/python${MODPY_VERSION}/site-packages/tg/utils.py
> lib/python${MODPY_VERSION}/site-packages/tg/views.py
> +share/doc/tg/
> +share/doc/tg/readme.md
>
Update: www/ruby-rack-protection 2.0.0 -> 2.1.0
This updates www/ruby-rack-protection to 2.1.0
There doesn't seem to be a lot of changes to it other than replacing
"origin_whitelist" with "permitted_origins".
https://github.com/sinatra/sinatra/blob/master/CHANGELOG.md
ok?
--Kurt
Index: Makefile
===
RCS file: /cvs/ports/www/ruby-rack-protection/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- Makefile12 Jul 2019 20:51:04 - 1.5
+++ Makefile27 Aug 2021 21:14:46 -
@@ -2,10 +2,12 @@
COMMENT = protects rack apps against typical web attacks
-DISTNAME = rack-protection-2.0.0
+DISTNAME = rack-protection-2.1.0
CATEGORIES = www
HOMEPAGE = https://github.com/rkh/rack-protection
+
+MAINTAINER = Kurt Mosiejczuk
# MIT
PERMIT_PACKAGE = Yes
Index: distinfo
===
RCS file: /cvs/ports/www/ruby-rack-protection/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo14 Nov 2017 17:08:13 - 1.2
+++ distinfo27 Aug 2021 21:14:46 -
@@ -1,2 +1,2 @@
-SHA256 (rack-protection-2.0.0.gem) =
VXTxDLP8/nNjifEhuGjNMyAgeu93ejSvuPLRImNoqhE=
-SIZE (rack-protection-2.0.0.gem) = 15872
+SHA256 (rack-protection-2.1.0.gem) =
H1I8FuWzLxOcj28eOz61Oqp6abx5ow8+gPipPIkkKpU=
+SIZE (rack-protection-2.1.0.gem) = 17408
Index: pkg/PLIST
===
RCS file: /cvs/ports/www/ruby-rack-protection/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- pkg/PLIST 14 Nov 2017 17:08:13 - 1.2
+++ pkg/PLIST 27 Aug 2021 21:14:46 -
@@ -21,6 +21,7 @@ ${GEM_LIB}/gems/${DISTNAME}/lib/rack/pro
${GEM_LIB}/gems/${DISTNAME}/lib/rack/protection/ip_spoofing.rb
${GEM_LIB}/gems/${DISTNAME}/lib/rack/protection/json_csrf.rb
${GEM_LIB}/gems/${DISTNAME}/lib/rack/protection/path_traversal.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/rack/protection/referrer_policy.rb
${GEM_LIB}/gems/${DISTNAME}/lib/rack/protection/remote_referrer.rb
${GEM_LIB}/gems/${DISTNAME}/lib/rack/protection/remote_token.rb
${GEM_LIB}/gems/${DISTNAME}/lib/rack/protection/session_hijacking.rb
Re: net/tg: Mention fzf in MESSAGE, ship readme
Klemens Nanni writes:
> readme.md contains a fair bit of details about tg's config.py which
> otherwise requries a browser to learn about.
>
> OK?
>
Neat, I didn't know about tg!
Doc was helpful for sure, OK abieber@
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/net/tg/Makefile,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 Makefile
> --- Makefile 9 Jun 2021 10:44:05 - 1.1.1.1
> +++ Makefile 27 Aug 2021 20:57:01 -
> @@ -3,6 +3,7 @@
> COMMENT =ncurses Telegram client
>
> MODPY_EGG_VERSION = 0.17.0
> +REVISION = 0
>
> DISTNAME = tg-${MODPY_EGG_VERSION}
>
> @@ -20,5 +21,11 @@ MODPY_SETUPTOOLS = Yes
> NO_TEST =Yes
>
> RUN_DEPENDS =net/py-telegram${MODPY_FLAVOR}
> +
> +DOCDIR = ${PREFIX}/share/doc/tg
> +
> +post-install:
> + ${INSTALL_DATA_DIR} ${DOCDIR}/
> + ${INSTALL_DATA} ${WRKSRC}/readme.md ${DOCDIR}/
>
> .include
> Index: pkg/MESSAGE
> ===
> RCS file: pkg/MESSAGE
> diff -N pkg/MESSAGE
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ pkg/MESSAGE 27 Aug 2021 20:57:02 -
> @@ -0,0 +1,3 @@
> +fzf is required to create groups and secret chats
> +(used for single and multiple user selection):
> + # pkg_add fzf
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/net/tg/pkg/PLIST,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 PLIST
> --- pkg/PLIST 9 Jun 2021 10:44:05 - 1.1.1.1
> +++ pkg/PLIST 27 Aug 2021 20:58:16 -
> @@ -33,3 +33,5 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/tg/update_handlers.py
> lib/python${MODPY_VERSION}/site-packages/tg/utils.py
> lib/python${MODPY_VERSION}/site-packages/tg/views.py
> +share/doc/tg/
> +share/doc/tg/readme.md
fix graphics/mapnik regression tests
Hi,
While looking at Omar's diff for SCons update I've found out
that regression tests won't run because they are linked
with libmapnik.so.3.1. The patch below links test with the actual
library.
OK?
Index: patches/patch-src_build_py
===
RCS file: /cvs/ports/graphics/mapnik/patches/patch-src_build_py,v
retrieving revision 1.7
diff -u -p -u -r1.7 patch-src_build_py
--- patches/patch-src_build_py 10 Jun 2021 19:16:17 - 1.7
+++ patches/patch-src_build_py 27 Aug 2021 21:01:45 -
@@ -21,7 +21,15 @@ Index: src/build.py
lib_env['LIBS'].append('z')
-@@ -140,7 +137,7 @@ else: # unix, non-macos
+@@ -133,14 +130,14 @@ if env['PLATFORM'] == 'Darwin':
+ else: # unix, non-macos
+ mapnik_libname = env.subst(env['MAPNIK_LIB_NAME'])
+ if env['ENABLE_SONAME']:
+-mapnik_libname = env.subst(env['MAPNIK_LIB_NAME']) + (".%d.%d" %
(int(ABI_VERSION[0]),int(ABI_VERSION[1])))
++mapnik_libname = env.subst(env['MAPNIK_LIB_NAME']) +
(".${LIBmapnik_VERSION}")
+ if env['PLATFORM'] == 'SunOS':
+ if env['CXX'].startswith('CC'):
+ mapnik_lib_link_flag += ' -R. -h %s' % mapnik_libname
else:
mapnik_lib_link_flag += ' -Wl,-h,%s' % mapnik_libname
else: # Linux and others
mapnik_regress.patch
Description: Binary data
net/tg: Mention fzf in MESSAGE, ship readme
readme.md contains a fair bit of details about tg's config.py which
otherwise requries a browser to learn about.
OK?
Index: Makefile
===
RCS file: /cvs/ports/net/tg/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- Makefile9 Jun 2021 10:44:05 - 1.1.1.1
+++ Makefile27 Aug 2021 20:57:01 -
@@ -3,6 +3,7 @@
COMMENT = ncurses Telegram client
MODPY_EGG_VERSION =0.17.0
+REVISION = 0
DISTNAME = tg-${MODPY_EGG_VERSION}
@@ -20,5 +21,11 @@ MODPY_SETUPTOOLS = Yes
NO_TEST = Yes
RUN_DEPENDS = net/py-telegram${MODPY_FLAVOR}
+
+DOCDIR = ${PREFIX}/share/doc/tg
+
+post-install:
+ ${INSTALL_DATA_DIR} ${DOCDIR}/
+ ${INSTALL_DATA} ${WRKSRC}/readme.md ${DOCDIR}/
.include
Index: pkg/MESSAGE
===
RCS file: pkg/MESSAGE
diff -N pkg/MESSAGE
--- /dev/null 1 Jan 1970 00:00:00 -
+++ pkg/MESSAGE 27 Aug 2021 20:57:02 -
@@ -0,0 +1,3 @@
+fzf is required to create groups and secret chats
+(used for single and multiple user selection):
+ # pkg_add fzf
Index: pkg/PLIST
===
RCS file: /cvs/ports/net/tg/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 9 Jun 2021 10:44:05 - 1.1.1.1
+++ pkg/PLIST 27 Aug 2021 20:58:16 -
@@ -33,3 +33,5 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/tg/update_handlers.py
lib/python${MODPY_VERSION}/site-packages/tg/utils.py
lib/python${MODPY_VERSION}/site-packages/tg/views.py
+share/doc/tg/
+share/doc/tg/readme.md
Re: Update: lang/mruby 3.0.0
On Fri, 27 Aug 2021 15:30:21 + (UTC)
Jeremy Evans wrote:
> This updates mruby to 3.0.0. Release notes available at:
>
> https://u22788749.ct.sendgrid.net/ls/click?upn=yGPgKxLt0dQzFpcLvHl2PPhK3N-2FLVZTiDzy5GreoSYyxB5XtNmZ56IyvgOD5F0fB7RrALRMkzE3dK2a5lyHxVdpPN1U10A7vZfmPwd9pln4-3DQhJj_7a8z5HXKglTa4iEppNBl7pmmyiLmNe-2BkBcvOJjbwgwSewIYonLntRuoN4GwM7WjPvc-2FXMqASZb04MiyaLnVHylaO4EcWA7oZInCQ-2FzqsvrtCeoCImCCHD2bnubMrEApg46D3lZhO9D1mhb4InQ8q86xmft7sRvJwRzF39EIjWDV-2F6BKUE45BZGD-2FmQ2U8It0D7-2FiFkQYgjxnaXjFc-2FgW-2FQ-3D-3D
>
> Tested on amd64. I'd like to commit it when I commit the default
> Ruby version change to 3.0.
mruby 3.0.0 looks good on macppc.
> There is a comment about keeping the version in sync with www/h2o,
> but otto@ (h2o maintainer) doesn't know why, and fcambus@ (who added the
> comment) hasn't responded yet. mruby is embedded, not linked, so I'm
> not sure why the mruby version should need to be in sync.
It isn't in sync: we have lang/mruby 2.0.1, but h2o has embedded mruby
1.3.0. These versions have incompatible bytecode, but this isn't a
problem, because h2o isn't using lang/mruby's mrbc. I would delete
the sync comment.
I can run "Math.sqrt(2)" and "Digest::MD5.hexdigest('abc')" in h2o.
If I use lang/mruby to "mrbc -o handle.mrb handle.rb", then
"load '/path/to/handle.mrb'" raises LoadError in h2o, but
"load '/path/to/handle.rb'" works.
--George
> Thanks,
> Jeremy
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/lang/mruby/Makefile,v
> retrieving revision 1.18
> diff -u -p -r1.18 Makefile
> --- Makefile 17 Nov 2020 03:19:37 - 1.18
> +++ Makefile 13 Aug 2021 15:32:19 -
> @@ -7,8 +7,7 @@ COMMENT = lightweight, embeddable imple
> # Keep in sync with the version bundled in www/h2o
> GH_ACCOUNT = mruby
> GH_PROJECT = mruby
> -GH_TAGNAME = 2.0.1
> -REVISION = 1
> +GH_TAGNAME = 3.0.0
>
> CATEGORIES = lang
> HOMEPAGE =
> https://u22788749.ct.sendgrid.net/ls/click?upn=yGPgKxLt0dQzFpcLvHl2PGAfC22xVKe29SU9ZLF5-2Bww-3DZfhT_7a8z5HXKglTa4iEppNBl7pmmyiLmNe-2BkBcvOJjbwgwSewIYonLntRuoN4GwM7WjPJgYFJlxQ1KStBVDKpdTGO07ypOQVRID4VYY02WGFzQbLba0Ct14l4m66LgRkscBO5xx6KC0I9-2BdNPdYvFMND9AcocfnclYMzpThcHTDdeXlelT7ZQMg5IoTtw4VM6lP3zZaBMzHk5LK-2FRUWmjm0f-2Bg-3D-3D
> @@ -29,7 +28,7 @@ NO_CONFIGURE = Yes
> SUBST_VARS = RUBY
>
> do-build:
> - cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${RUBY} ./minirake --verbose
> + cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${RAKE} --verbose
>
> do-install:
> ${INSTALL_PROGRAM} ${WRKSRC}/bin/* ${PREFIX}/bin/
> @@ -39,6 +38,6 @@ do-install:
> ${INSTALL_DATA} ${WRKSRC}/doc/guides/* ${PREFIX}/share/doc/mruby/
>
> do-test:
> - cd ${WRKSRC} && RUBY=${RUBY} ${RUBY} ./minirake test
> + cd ${WRKSRC} && RUBY=${RUBY} ${RAKE} test
>
> .include
> Index: distinfo
> ===
> RCS file: /cvs/ports/lang/mruby/distinfo,v
> retrieving revision 1.5
> diff -u -p -r1.5 distinfo
> --- distinfo 11 Nov 2019 11:42:36 - 1.5
> +++ distinfo 13 Aug 2021 15:32:19 -
> @@ -1,2 +1,2 @@
> -SHA256 (mruby-2.0.1.tar.gz) = /gxQoltNx2kv1/an38HVi6c/U/7dpXYoRbhTaSz6yBA=
> -SIZE (mruby-2.0.1.tar.gz) = 517932
> +SHA256 (mruby-3.0.0.tar.gz) = lbeYzdkx7ynTiOKwsmfLpNxGnociw31O+O5SSLyQdbA=
> +SIZE (mruby-3.0.0.tar.gz) = 701142
> Index: patches/patch-build_config_rb
> ===
> RCS file: patches/patch-build_config_rb
> diff -N patches/patch-build_config_rb
> --- patches/patch-build_config_rb 12 Nov 2019 09:25:28 - 1.4
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,25 +0,0 @@
> -$OpenBSD: patch-build_config_rb,v 1.4 2019/11/12 09:25:28 fcambus Exp $
> -
> -Avoid adding "-g3 -O0" to CFLAGS.
> -
> -Index: build_config.rb
> build_config.rb.orig
> -+++ build_config.rb
> -@@ -95,7 +95,7 @@ MRuby::Build.new('host-debug') do |conf|
> - toolchain :gcc
> - end
> -
> -- enable_debug
> -+ # enable_debug
> -
> - # include the default GEMs
> - conf.gembox 'default'
> -@@ -118,7 +118,7 @@ MRuby::Build.new('test') do |conf|
> - toolchain :gcc
> - end
> -
> -- enable_debug
> -+ # enable_debug
> - conf.enable_bintest
> - conf.enable_test
> -
> Index: patches/patch-lib_mruby_build_rb
> ===
> RCS file: /cvs/ports/lang/mruby/patches/patch-lib_mruby_build_rb,v
> retrieving revision 1.3
> diff -u -p -r1.3 patch-lib_mruby_build_rb
> --- patches/patch-lib_mruby_build_rb 11 Nov 2019 11:42:36 - 1.3
> +++ patches/patch-lib_mruby_build_rb 13 Aug 2021 15:32:19 -
> @@ -3,12 +3,12 @@ $OpenBSD: patch-lib_mruby_build_rb,v 1.3
> Index: lib/mruby/build.rb
> --- lib/mruby/build.rb.orig
> +++ lib/mruby/build.rb
> -@@ -317,7 +317,7 @@ EOS
> - puts ">>> Bintest #{name} <<<"
> -
Re: Update: lang/mruby 3.0.0
On 08/27 08:16, Stuart Henderson wrote:
> On 2021/08/27 15:30, Jeremy Evans wrote:
> > This updates mruby to 3.0.0. Release notes available at:
> >
> > https://u22788749.ct.sendgrid.net/ls/click?upn=yGPgKxLt0dQzFpcLvHl2PKt5t-2BXSL6jBeJFtWa8J6ek1Fkq4F7CLpJlx9PNUIUDAY4EV1DGrT6gryw339cicnQ2JYOiclBVEPMpFqHvt1WDBJEchEbPiyB5bUlBCSgza20Cgyp4MFH4fIVqtSEIxRQpcudsRU8AdToaPQ5kcikc-2Fx8AV6q-2FVFkzd1FPt640I1jj-2FAT7q-2BnJ5ZDomfO82BjzlELrshqntJDxb-2B2C16V8vFrL1jAaaIjKNuZIyFkBt4fejNaJon7B-2FafNaRpjwzK7q3DFSB5dc8kD5LwMMcqI7mgVwq0Wz02LEyJuqSNpXhq135PnLGViOATpG0koBF8kuT6G6gCGfdsNzmPd7Bs4deW5N9gq1eLERNIg-2BHzfxEbV91LApOhkB2yy5HJlmExtLdVU19Q745a9A5AHn0stQdj6TM9RijdfI4ltct-2FPHJ3dVJM0QnCzH4md49xM1YoeqD6voM4o2xf6SdFgJFPocPIEpmEZI0IIovUFAB1MCDvgaZqR1KG1UdqA-2FP3lCBKIE6eANT9fLya9IOrEdizc-3D3Vrg_7a8z5HXKglTa4iEppNBl7pmmyiLmNe-2BkBcvOJjbwgwQYaM-2FF409Z5JsGwn-2FV3RSMwvAwM3l64RnOkMfPlrf9RHVE7X13ddR9bPASGCK5BSPDMHh9ViO33cxfWkl3yTqLr-2FfGwZzU0ld1Y8x6nCgpaMea2ubh3TO2dy7-2B741O6w5u3DPHGN2h9Yj3O8tgACHCxnfZf0tT4vRps4uUvaq1qQ-3D-3D
> >
> > Tested on amd64. I'd like to commit it when I commit the default
> > Ruby version change to 3.0.
> >
> > There is a comment about keeping the version in sync with www/h2o,
> > but otto@ (h2o maintainer) doesn't know why, and fcambus@ (who added the
> > comment) hasn't responded yet. mruby is embedded, not linked, so I'm
> > not sure why the mruby version should need to be in sync.
>
> www/h2o,mruby build fails if the newer version is present at build time.
I tested building www/h2o,mruby with mruby-3.0.0 installed, and it
worked correctly. mruby does not expose a shared library (as it is
designed for embedding), and h2o embeds it's own copy of mruby, so
there should be no need for the versions to be in sync.
However, it looks like a build fix is needed for www/h2o,mruby if
the default Ruby version in ports is 3.0.0 (see below). No bump as
this is only a build issue and should not affect runtime. OKs to
commit this build fix? It should work fine even if the default Ruby
version is 2.7, it doesn't have to wait until the default version is
switched to 3.0.
Thanks,
Jeremy
Index: patches/patch-deps_mruby_Rakefile
===
RCS file: patches/patch-deps_mruby_Rakefile
diff -N patches/patch-deps_mruby_Rakefile
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-deps_mruby_Rakefile 27 Aug 2021 19:38:12 -
@@ -0,0 +1,68 @@
+$OpenBSD$
+
+Fix build with Ruby 3.0.
+
+Index: deps/mruby/Rakefile
+--- deps/mruby/Rakefile.orig
deps/mruby/Rakefile
+@@ -37,15 +37,15 @@ load "#{MRUBY_ROOT}/tasks/gitlab.rake"
+ task :default => :all
+
+ bin_path = ENV['INSTALL_DIR'] || "#{MRUBY_ROOT}/bin"
+-FileUtils.mkdir_p bin_path, { :verbose => $verbose }
++FileUtils.mkdir_p bin_path, :verbose => $verbose
+
+ depfiles = MRuby.targets['host'].bins.map do |bin|
+ install_path = MRuby.targets['host'].exefile("#{bin_path}/#{bin}")
+ source_path =
MRuby.targets['host'].exefile("#{MRuby.targets['host'].build_dir}/bin/#{bin}")
+
+ file install_path => source_path do |t|
+-FileUtils.rm_f t.name, { :verbose => $verbose }
+-FileUtils.cp t.prerequisites.first, t.name, { :verbose => $verbose }
++FileUtils.rm_f t.name, :verbose => $verbose
++FileUtils.cp t.prerequisites.first, t.name, :verbose => $verbose
+ end
+
+ install_path
+@@ -78,8 +78,8 @@ MRuby.each_target do |target|
+ install_path = MRuby.targets['host'].exefile("#{bin_path}/#{bin}")
+
+ file install_path => exec do |t|
+- FileUtils.rm_f t.name, { :verbose => $verbose }
+- FileUtils.cp t.prerequisites.first, t.name, { :verbose => $verbose }
++ FileUtils.rm_f t.name, :verbose => $verbose
++ FileUtils.cp t.prerequisites.first, t.name, :verbose => $verbose
+ end
+ depfiles += [ install_path ]
+ elsif target == MRuby.targets['host-debug']
+@@ -87,8 +87,8 @@ MRuby.each_target do |target|
+ install_path =
MRuby.targets['host-debug'].exefile("#{bin_path}/#{bin}")
+
+ file install_path => exec do |t|
+-FileUtils.rm_f t.name, { :verbose => $verbose }
+-FileUtils.cp t.prerequisites.first, t.name, { :verbose =>
$verbose }
++FileUtils.rm_f t.name, :verbose => $verbose
++FileUtils.cp t.prerequisites.first, t.name, :verbose => $verbose
+ end
+ depfiles += [ install_path ]
+ end
+@@ -127,16 +127,16 @@ end
+ desc "clean all built and in-repo installed artifacts"
+ task :clean do
+ MRuby.each_target do |t|
+-FileUtils.rm_rf t.build_dir, { :verbose => $verbose }
++FileUtils.rm_rf t.build_dir, :verbose => $verbose
+ end
+- FileUtils.rm_f depfiles, { :verbose => $verbose }
++ FileUtils.rm_f depfiles, :verbose => $verbose
+ puts "Cleaned up target build folder"
+ end
+
+ desc "clean everything!"
+ task :deep_clean => ["clean"] do
+ MRuby.each_target do |t|
+-FileUtils.rm_rf t.gem_clone_dir, {
Re: Update: lang/mruby 3.0.0
On 2021/08/27 15:30, Jeremy Evans wrote: > This updates mruby to 3.0.0. Release notes available at: > > https://u22788749.ct.sendgrid.net/ls/click?upn=yGPgKxLt0dQzFpcLvHl2PPhK3N-2FLVZTiDzy5GreoSYyxB5XtNmZ56IyvgOD5F0fB7RrALRMkzE3dK2a5lyHxVdpPN1U10A7vZfmPwd9pln4-3DQhJj_7a8z5HXKglTa4iEppNBl7pmmyiLmNe-2BkBcvOJjbwgwSewIYonLntRuoN4GwM7WjPvc-2FXMqASZb04MiyaLnVHylaO4EcWA7oZInCQ-2FzqsvrtCeoCImCCHD2bnubMrEApg46D3lZhO9D1mhb4InQ8q86xmft7sRvJwRzF39EIjWDV-2F6BKUE45BZGD-2FmQ2U8It0D7-2FiFkQYgjxnaXjFc-2FgW-2FQ-3D-3D > > Tested on amd64. I'd like to commit it when I commit the default > Ruby version change to 3.0. > > There is a comment about keeping the version in sync with www/h2o, > but otto@ (h2o maintainer) doesn't know why, and fcambus@ (who added the > comment) hasn't responded yet. mruby is embedded, not linked, so I'm > not sure why the mruby version should need to be in sync. www/h2o,mruby build fails if the newer version is present at build time.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: js...@cvs.openbsd.org 2021/08/27 12:33:27 Modified files: lang/go: Makefile distinfo lang/go/patches: patch-src_cmd_go_internal_load_pkg_go patch-src_cmd_internal_objabi_reloctype_go patch-src_cmd_internal_objabi_reloctype_string_go patch-src_cmd_internal_sys_supported_go patch-src_cmd_link_internal_mips64_asm_go patch-src_cmd_link_internal_mips64_obj_go patch-src_internal_testenv_testenv_go patch-src_runtime_asm_mips64x_s patch-src_runtime_defs_openbsd_go patch-src_runtime_defs_openbsd_mips64_go patch-src_runtime_os_openbsd_libc_go patch-src_runtime_os_openbsd_syscall1_go patch-src_runtime_os_openbsd_syscall2_go patch-src_runtime_os_openbsd_syscall_go patch-src_runtime_proc_go patch-src_runtime_sys_libc_go patch-src_runtime_sys_openbsd1_go patch-src_runtime_sys_openbsd2_go patch-src_runtime_sys_openbsd3_go patch-src_runtime_sys_openbsd_go patch-src_runtime_sys_openbsd_mips64_s patch-src_runtime_tls_mips64x_s patch-src_syscall_asm_openbsd_mips64_s patch-src_syscall_exec_bsd_go patch-src_syscall_exec_libc2_go patch-src_syscall_exec_unix_go patch-src_syscall_mkall_sh patch-src_syscall_syscall_openbsd1_go patch-src_syscall_syscall_openbsd_libc_go patch-src_syscall_zsyscall_openbsd_mips64_go patch-src_syscall_zsyscall_openbsd_mips64_s patch-test_fixedbugs_issue21576_go patch-test_nilptr_go lang/go/pkg: PLIST Removed files: lang/go/patches: patch-src_cmd_dist_build_go patch-src_cmd_link_link_test_go patch-src_cmd_nm_nm_cgo_test_go patch-src_runtime_asm_386_s patch-src_runtime_asm_arm_s patch-src_runtime_cgo_gcc_openbsd_mips64_c patch-src_runtime_crash_unix_test_go patch-src_runtime_defs_openbsd_386_go patch-src_runtime_defs_openbsd_arm_go patch-src_runtime_os_darwin_go patch-src_runtime_os_linux_go patch-src_runtime_stubs_mips64x_go patch-src_runtime_sys_openbsd2_mips64_go patch-src_runtime_sys_openbsd2_nonmips64_go patch-src_runtime_sys_openbsd_386_s patch-src_runtime_sys_openbsd_arm_s patch-src_syscall_asm_openbsd_386_s patch-src_syscall_asm_openbsd_arm_s patch-src_syscall_asm_unix_386_s patch-src_syscall_mksyscall_pl patch-src_syscall_zsyscall_openbsd_386_go patch-src_syscall_zsyscall_openbsd_386_s patch-src_syscall_zsyscall_openbsd_arm_go patch-src_syscall_zsyscall_openbsd_arm_s Log message: Update lang/go to Go 1.17. Thanks to Jacqueline Jolicoeur and Janne Johansson for testing. ok abieber@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: abie...@cvs.openbsd.org 2021/08/27 10:33:07 Modified files: net: Makefile Log message: + headscale and tailscale
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: abie...@cvs.openbsd.org 2021/08/27 10:32:06 Log message: Import tailscale: an overlay-like VPN built on top of WireGuard OK tracey, sthen Status: Vendor Tag: abieber Release Tags: abieber_20210827 N ports/net/tailscale/Makefile N ports/net/tailscale/distinfo N ports/net/tailscale/modules.inc N ports/net/tailscale/pkg/DESCR N ports/net/tailscale/pkg/PLIST N ports/net/tailscale/pkg/tailscaled.rc No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: abie...@cvs.openbsd.org 2021/08/27 10:30:16 Modified files: infrastructure/db: user.list Log message: use 869 for net/headscale
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: abie...@cvs.openbsd.org 2021/08/27 10:29:34 Log message: Import headscale, an open source Tailscale control server OK tracey, sthen Status: Vendor Tag: abieber Release Tags: abieber_20210827 N ports/net/headscale/Makefile N ports/net/headscale/distinfo N ports/net/headscale/modules.inc N ports/net/headscale/pkg/DESCR N ports/net/headscale/pkg/PLIST N ports/net/headscale/pkg/headscale.rc N ports/net/headscale/pkg/README N ports/net/headscale/patches/patch-config_json_postgres_example N ports/net/headscale/patches/patch-config_json_sqlite_example No conflicts created by this import
Re: [macppc / lld] Unbreak sysutils/gdmap
On Fri, 27 Aug 2021 15:18:14 +
Charlene Wendling wrote:
> Hi,
>
> > https://bin.charlenew.xyz/gdmap-0.8.1p5.log
>
> Once again, macppc needs the `-lm' linker flag.
>
> With the below diff i can build gdmap [0] on macppc. While here, i've
> refreshed WANTLIB.
>
> The runtime has been tested successfully on macppc and amd64.
>
> Comments/feedback are welcome,
>
> Charlène.
>
>
> [0] https://bin.charlenew.xyz/gdmap_fixed.log
>
It's better with a comment :)
Index: Makefile
===
RCS file: /cvs/ports/sysutils/gdmap/Makefile,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 Makefile
--- Makefile12 Jul 2019 20:49:43 - 1.9
+++ Makefile27 Aug 2021 16:21:30 -
@@ -3,17 +3,18 @@
COMMENT = graphical disk map
DISTNAME = gdmap-0.8.1
CATEGORIES = sysutils x11
-REVISION = 5
+REVISION = 6
HOMEPAGE = http://gdmap.sourceforge.net/
# GPLv2
PERMIT_PACKAGE = Yes
-WANTLIB = X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama Xrandr
-WANTLIB += Xrender atk-1.0 c cairo fontconfig freetype gdk-x11-2.0
-WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0 gtk-x11-2.0 iconv
-WANTLIB += intl m pango-1.0 pangocairo-1.0 pangoft2-1.0 pthread xml2 z
+WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
+WANTLIB += Xrandr Xrender atk-1.0 c cairo fontconfig freetype
+WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0
+WANTLIB += gtk-x11-2.0 harfbuzz intl m pango-1.0 pangocairo-1.0
+WANTLIB += pangoft2-1.0 pthread xml2 z
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=gdmap/}
@@ -29,6 +30,9 @@ CONFIGURE_STYLE = autoconf
AUTOCONF_VERSION = 2.61
CONFIGURE_ENV =CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+ LDFLAGS="-L${LOCALBASE}/lib ${LDFLAGS}"
+
+# Needed for architectures not inlining sqrt(3), like powerpc
+LDFLAGS += -lm
.include
Re: [macppc / lld] Unbreak sysutils/gdmap
On Fri, 27 Aug 2021 15:18:14 +
Charlene Wendling wrote:
> Hi,
>
> > https://bin.charlenew.xyz/gdmap-0.8.1p5.log
>
> Once again, macppc needs the `-lm' linker flag.
>
> With the below diff i can build gdmap [0] on macppc. While here, i've
> refreshed WANTLIB.
>
> The runtime has been tested successfully on macppc and amd64.
>
> Comments/feedback are welcome,
>
> Charlène.
ok gkoehler@
You put -lm before *.o in the link command. This back reference might
break some old linkers, but seems to work for us. (It's a backref
because the *.o calling sqrt is after the -lm providing sqrt.)
--George
> [0] https://bin.charlenew.xyz/gdmap_fixed.log
>
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/sysutils/gdmap/Makefile,v
> retrieving revision 1.9
> diff -u -p -u -p -r1.9 Makefile
> --- Makefile 12 Jul 2019 20:49:43 - 1.9
> +++ Makefile 27 Aug 2021 15:14:19 -
> @@ -3,17 +3,18 @@
> COMMENT =graphical disk map
> DISTNAME = gdmap-0.8.1
> CATEGORIES = sysutils x11
> -REVISION = 5
> +REVISION = 6
>
> HOMEPAGE = http://gdmap.sourceforge.net/
>
> # GPLv2
> PERMIT_PACKAGE = Yes
>
> -WANTLIB = X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama Xrandr
> -WANTLIB += Xrender atk-1.0 c cairo fontconfig freetype gdk-x11-2.0
> -WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0 gtk-x11-2.0 iconv
> -WANTLIB += intl m pango-1.0 pangocairo-1.0 pangoft2-1.0 pthread xml2 z
> +WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
> +WANTLIB += Xrandr Xrender atk-1.0 c cairo fontconfig freetype
> +WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0
> +WANTLIB += gtk-x11-2.0 harfbuzz intl m pango-1.0 pangocairo-1.0
> +WANTLIB += pangoft2-1.0 pthread xml2 z
>
> MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=gdmap/}
>
> @@ -29,6 +30,6 @@ CONFIGURE_STYLE = autoconf
> AUTOCONF_VERSION = 2.61
>
> CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include" \
> - LDFLAGS="-L${LOCALBASE}/lib"
> + LDFLAGS="-L${LOCALBASE}/lib -lm"
>
> .include
>
--
George Koehler
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: na...@cvs.openbsd.org 2021/08/27 10:01:41 Modified files: misc/bible-kjv : Makefile distinfo Log message: misc/bible-kjv: keep up with Debian upstream 4.36, no changes for us
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: giova...@cvs.openbsd.org2021/08/27 09:58:30 Modified files: mail/mimedefang: Makefile distinfo mail/mimedefang/patches: patch-examples_mimedefang-filter-openbsd-ports Log message: update to 2.85 ok ajacoutot@ (Maintainer)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2021/08/27 09:43:17 Removed files: www/ruby-mechanize: Makefile distinfo www/ruby-mechanize/pkg: DESCR PLIST Log message: Send ruby-mechanize to the Attic Broken at runtime on Ruby 2.0+ due to use of iconv. Untouched since import in 2009. OK sthen@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2021/08/27 09:42:00 Removed files: geo/ruby-findmyiphone: Makefile distinfo geo/ruby-findmyiphone/pkg: DESCR PLIST Log message: Send ruby-findmyiphone to the Attic Broken at runtime on Ruby 2.0+ due to use of ruby-mechanize. OK sthen@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2021/08/27 09:39:57 Removed files: devel/ruby-gir_ffi: Makefile distinfo devel/ruby-gir_ffi/pkg: DESCR PLIST Log message: Send ruby-gir_ffi to the Attic Doesn't load on Ruby 2.6, 2.7, or 3.0: Could not open library '/usr/local/lib/girepository-1.0': File not an ELF object. OK sthen@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2021/08/27 09:38:45 Removed files: devel/ruby-racc: Makefile distinfo devel/ruby-racc/pkg: DESCR PLIST Log message: Send ruby-racc to the Attic ruby30 FLAVOR conflicts with lang/ruby/3.0. Not needed as the same or newer racc version is shipped with Ruby 2.6, 2.7, and 3.0. OK sthen@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2021/08/27 09:36:26 Removed files: net/ruby-agcaldav: Makefile distinfo net/ruby-agcaldav/patches: patch-agcaldav_gemspec patch-lib_agcaldav_client_rb patch-lib_agcaldav_rb net/ruby-agcaldav/pkg: DESCR PLIST Log message: Send ruby-agcaldav to the Attic Broken at runtime since ruby-icalendar was upgraded to 2.1.0 in July 2014. OK sthen@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2021/08/27 09:33:30 Modified files: net: Makefile devel : Makefile www: Makefile geo: Makefile Log message: Unhook some obsolete ruby ports
Update: lang/mruby 3.0.0
This updates mruby to 3.0.0. Release notes available at:
https://u22788749.ct.sendgrid.net/ls/click?upn=yGPgKxLt0dQzFpcLvHl2PPhK3N-2FLVZTiDzy5GreoSYyxB5XtNmZ56IyvgOD5F0fB7RrALRMkzE3dK2a5lyHxVdpPN1U10A7vZfmPwd9pln4-3DQhJj_7a8z5HXKglTa4iEppNBl7pmmyiLmNe-2BkBcvOJjbwgwSewIYonLntRuoN4GwM7WjPvc-2FXMqASZb04MiyaLnVHylaO4EcWA7oZInCQ-2FzqsvrtCeoCImCCHD2bnubMrEApg46D3lZhO9D1mhb4InQ8q86xmft7sRvJwRzF39EIjWDV-2F6BKUE45BZGD-2FmQ2U8It0D7-2FiFkQYgjxnaXjFc-2FgW-2FQ-3D-3D
Tested on amd64. I'd like to commit it when I commit the default
Ruby version change to 3.0.
There is a comment about keeping the version in sync with www/h2o,
but otto@ (h2o maintainer) doesn't know why, and fcambus@ (who added the
comment) hasn't responded yet. mruby is embedded, not linked, so I'm
not sure why the mruby version should need to be in sync.
Thanks,
Jeremy
Index: Makefile
===
RCS file: /cvs/ports/lang/mruby/Makefile,v
retrieving revision 1.18
diff -u -p -r1.18 Makefile
--- Makefile17 Nov 2020 03:19:37 - 1.18
+++ Makefile13 Aug 2021 15:32:19 -
@@ -7,8 +7,7 @@ COMMENT = lightweight, embeddable imple
# Keep in sync with the version bundled in www/h2o
GH_ACCOUNT = mruby
GH_PROJECT = mruby
-GH_TAGNAME = 2.0.1
-REVISION = 1
+GH_TAGNAME = 3.0.0
CATEGORIES = lang
HOMEPAGE =
https://u22788749.ct.sendgrid.net/ls/click?upn=yGPgKxLt0dQzFpcLvHl2PGAfC22xVKe29SU9ZLF5-2Bww-3DZfhT_7a8z5HXKglTa4iEppNBl7pmmyiLmNe-2BkBcvOJjbwgwSewIYonLntRuoN4GwM7WjPJgYFJlxQ1KStBVDKpdTGO07ypOQVRID4VYY02WGFzQbLba0Ct14l4m66LgRkscBO5xx6KC0I9-2BdNPdYvFMND9AcocfnclYMzpThcHTDdeXlelT7ZQMg5IoTtw4VM6lP3zZaBMzHk5LK-2FRUWmjm0f-2Bg-3D-3D
@@ -29,7 +28,7 @@ NO_CONFIGURE =Yes
SUBST_VARS = RUBY
do-build:
- cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${RUBY} ./minirake --verbose
+ cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${RAKE} --verbose
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/bin/* ${PREFIX}/bin/
@@ -39,6 +38,6 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/doc/guides/* ${PREFIX}/share/doc/mruby/
do-test:
- cd ${WRKSRC} && RUBY=${RUBY} ${RUBY} ./minirake test
+ cd ${WRKSRC} && RUBY=${RUBY} ${RAKE} test
.include
Index: distinfo
===
RCS file: /cvs/ports/lang/mruby/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo11 Nov 2019 11:42:36 - 1.5
+++ distinfo13 Aug 2021 15:32:19 -
@@ -1,2 +1,2 @@
-SHA256 (mruby-2.0.1.tar.gz) = /gxQoltNx2kv1/an38HVi6c/U/7dpXYoRbhTaSz6yBA=
-SIZE (mruby-2.0.1.tar.gz) = 517932
+SHA256 (mruby-3.0.0.tar.gz) = lbeYzdkx7ynTiOKwsmfLpNxGnociw31O+O5SSLyQdbA=
+SIZE (mruby-3.0.0.tar.gz) = 701142
Index: patches/patch-build_config_rb
===
RCS file: patches/patch-build_config_rb
diff -N patches/patch-build_config_rb
--- patches/patch-build_config_rb 12 Nov 2019 09:25:28 - 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,25 +0,0 @@
-$OpenBSD: patch-build_config_rb,v 1.4 2019/11/12 09:25:28 fcambus Exp $
-
-Avoid adding "-g3 -O0" to CFLAGS.
-
-Index: build_config.rb
build_config.rb.orig
-+++ build_config.rb
-@@ -95,7 +95,7 @@ MRuby::Build.new('host-debug') do |conf|
- toolchain :gcc
- end
-
-- enable_debug
-+ # enable_debug
-
- # include the default GEMs
- conf.gembox 'default'
-@@ -118,7 +118,7 @@ MRuby::Build.new('test') do |conf|
- toolchain :gcc
- end
-
-- enable_debug
-+ # enable_debug
- conf.enable_bintest
- conf.enable_test
-
Index: patches/patch-lib_mruby_build_rb
===
RCS file: /cvs/ports/lang/mruby/patches/patch-lib_mruby_build_rb,v
retrieving revision 1.3
diff -u -p -r1.3 patch-lib_mruby_build_rb
--- patches/patch-lib_mruby_build_rb11 Nov 2019 11:42:36 - 1.3
+++ patches/patch-lib_mruby_build_rb13 Aug 2021 15:32:19 -
@@ -3,12 +3,12 @@ $OpenBSD: patch-lib_mruby_build_rb,v 1.3
Index: lib/mruby/build.rb
--- lib/mruby/build.rb.orig
+++ lib/mruby/build.rb
-@@ -317,7 +317,7 @@ EOS
- puts ">>> Bintest #{name} <<<"
- targets = @gems.select { |v| File.directory? "#{v.dir}/bintest" }.map {
|v| filename v.dir }
+@@ -432,7 +432,7 @@ EOS
targets << filename(".") if File.directory? "./bintest"
-- sh "ruby test/bintest.rb#{verbose_flag} #{targets.join ' '}"
-+ sh "${RUBY} test/bintest.rb#{verbose_flag} #{targets.join ' '}"
+ mrbc = @gems["mruby-bin-mrbc"] ? exefile("#{@build_dir}/bin/mrbc") :
mrbcfile
+ env = {"BUILD_DIR" => @build_dir, "MRBCFILE" => mrbc}
+- sh env, "ruby test/bintest.rb#{verbose_flag} #{targets.join ' '}"
++ sh env, "${RUBY} test/bintest.rb#{verbose_flag} #{targets.join ' '}"
end
def print_build_summary
Index: patches/patch-tasks_toolchains_gcc_rake
Re: [macppc / lld] Unbreak games/moonlander
On Thu, 26 Aug 2021 18:30:48 + Charlene Wendling wrote: > Hi, > > The build is broken in the current macppc bulk: > > > https://bin.charlenew.xyz/moonlander.log > > Please see my previous report [0] for explanations about what is going on. > > Adding the `-lm' linker flag allows to fix the build on macppc [1]. > That's only 2 such fixes for around 2000 ports built. I expect to see more > of them, yet hope not being inundated ;) > > While here, i wasn't able to access upstream's Makefile due to > PORTS_PRIVSEP, so i added FIX_EXTRACT_PERMISSIONS. I also updated > WANTLIB. > > The runtime is fine on amd64 and macppc. > > OK? ok gkoehler@, suggest to add a patch comment to explain that -lm is for sqrt on powerpc. > Charlène. > > > [0] https://marc.info/?l=openbsd-ports=162999190921813=2 > [1] https://bin.charlenew.xyz/moonlander_fixed.log > > > Index: Makefile > === > RCS file: /cvs/ports/games/moonlander/Makefile,v > retrieving revision 1.14 > diff -u -p -u -p -r1.14 Makefile > --- Makefile 20 Mar 2020 16:44:23 - 1.14 > +++ Makefile 26 Aug 2021 17:54:01 - > @@ -3,16 +3,18 @@ > COMMENT= clone of atari game > DISTNAME=moon-lander-1.0 > PKGNAME= moonlander-1.0 > -REVISION=2 > +REVISION=3 > CATEGORIES= games x11 > MASTER_SITES=http://downloads.daveblood.com/lunar_lander/ > > +FIX_EXTRACT_PERMISSIONS= yes > + > HOMEPAGE=http://magigames.org/moonlander.html > > # BSD > PERMIT_PACKAGE= Yes > > -WANTLIB= SDL X11 Xext c m pthread usbhid xcb SDL_image SDL_mixer > +WANTLIB += SDL SDL_image SDL_mixer c m pthread > > LIB_DEPENDS= devel/sdl-image \ > devel/sdl-mixer > Index: patches/patch-Makefile > === > RCS file: /cvs/ports/games/moonlander/patches/patch-Makefile,v > retrieving revision 1.1.1.1 > diff -u -p -u -p -r1.1.1.1 patch-Makefile > --- patches/patch-Makefile15 Apr 2003 16:01:42 - 1.1.1.1 > +++ patches/patch-Makefile26 Aug 2021 17:54:01 - > @@ -1,6 +1,7 @@ > $OpenBSD: patch-Makefile,v 1.1.1.1 2003/04/15 16:01:42 espie Exp $ > Makefile.origTue Aug 14 18:28:49 2001 > -+++ Makefile Thu Apr 10 14:54:33 2003 > +Index: Makefile > +--- Makefile.orig > Makefile > @@ -1,26 +1,20 @@ > # Makefile for test program for game_libs - lunar lander > -CFLAGS=-Wall `sdl-config --libs --cflags` > @@ -9,7 +10,7 @@ $OpenBSD: patch-Makefile,v 1.1.1.1 2003/ > +#CC=gcc > > -LIBS=SDL_image > -+LIBS=`sdl-config --libs` -lSDL_image -lSDL_mixer > ++LIBS=`sdl-config --libs` -lSDL_image -lSDL_mixer -lm > > C_FILES=moon_lander.c game_lib.c DT_drawtext.c > OBJ_FILES=moon_lander.o game_lib.o DT_drawtext.o > -- George Koehler
[macppc / lld] Unbreak sysutils/gdmap
Hi,
> https://bin.charlenew.xyz/gdmap-0.8.1p5.log
Once again, macppc needs the `-lm' linker flag.
With the below diff i can build gdmap [0] on macppc. While here, i've
refreshed WANTLIB.
The runtime has been tested successfully on macppc and amd64.
Comments/feedback are welcome,
Charlène.
[0] https://bin.charlenew.xyz/gdmap_fixed.log
Index: Makefile
===
RCS file: /cvs/ports/sysutils/gdmap/Makefile,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 Makefile
--- Makefile12 Jul 2019 20:49:43 - 1.9
+++ Makefile27 Aug 2021 15:14:19 -
@@ -3,17 +3,18 @@
COMMENT = graphical disk map
DISTNAME = gdmap-0.8.1
CATEGORIES = sysutils x11
-REVISION = 5
+REVISION = 6
HOMEPAGE = http://gdmap.sourceforge.net/
# GPLv2
PERMIT_PACKAGE = Yes
-WANTLIB = X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama Xrandr
-WANTLIB += Xrender atk-1.0 c cairo fontconfig freetype gdk-x11-2.0
-WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0 gtk-x11-2.0 iconv
-WANTLIB += intl m pango-1.0 pangocairo-1.0 pangoft2-1.0 pthread xml2 z
+WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
+WANTLIB += Xrandr Xrender atk-1.0 c cairo fontconfig freetype
+WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0
+WANTLIB += gtk-x11-2.0 harfbuzz intl m pango-1.0 pangocairo-1.0
+WANTLIB += pangoft2-1.0 pthread xml2 z
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=gdmap/}
@@ -29,6 +30,6 @@ CONFIGURE_STYLE = autoconf
AUTOCONF_VERSION = 2.61
CONFIGURE_ENV =CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+ LDFLAGS="-L${LOCALBASE}/lib -lm"
.include
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: na...@cvs.openbsd.org 2021/08/27 08:37:59 Modified files: archivers/libarchive: Makefile distinfo archivers/libarchive/patches: patch-tar_bsdtar_1 Added files: archivers/libarchive/patches: patch-libarchive_archive_write_set_format_cpio_binary_c Log message: archivers/libarchive: update to 3.5.2 New features: * CPIO: Support for PWB and v7 binary cpio formats * ZIP reader: Support of deflate algorithm in symbolic link decompression
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2021/08/27 08:28:41 Modified files: security/vault : Makefile Log message: Space.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2021/08/27 08:27:56 Modified files: security/vault : Makefile Log message: Move up PKGNAME.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: abie...@cvs.openbsd.org 2021/08/27 07:58:24 Modified files: devel/sqlc : Makefile distinfo modules.inc Log message: Update sqlc to 1.9.0
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: abie...@cvs.openbsd.org 2021/08/27 07:57:32 Modified files: net/dendrite : Makefile distinfo modules.inc net/dendrite/pkg: PLIST Log message: Update dendrite to 0.4.1
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: abie...@cvs.openbsd.org 2021/08/27 07:56:30 Modified files: audio/navidrome: Makefile distinfo modules.inc Log message: Bump navidrome to 0.45.1 Changes listed here: https://github.com/navidrome/navidrome/releases
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rob...@cvs.openbsd.org 2021/08/27 07:38:54 Modified files: www/nextcloud/22: Makefile distinfo www/nextcloud/22/pkg: PLIST Log message: update to 22.1.1; ok gonzalo@
Re: WIP update: mail/mimedefang
On Wed, Aug 25, 2021 at 11:14:28AM +0200, Giovanni Bechis wrote:
> On Tue, Aug 03, 2021 at 11:16:50PM +0200, Giovanni Bechis wrote:
> > Hi,
> > MIMEDefang 2.85-rc1 has been released last week and 2.85 will be
> > released soon, now looking for testers.
> > Full changelog at
> > https://github.com/The-McGrail-Foundation/MIMEDefang/blob/2.85-rc1/Changelog
> >
>
> MIMEDefang 2.85 has been released, updated diff follows.
OK aja
> Cheers
> Giovanni
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/mail/mimedefang/Makefile,v
> retrieving revision 1.51
> diff -u -p -r1.51 Makefile
> --- Makefile 12 Jul 2019 20:47:30 - 1.51
> +++ Makefile 25 Aug 2021 08:31:33 -
> @@ -2,12 +2,11 @@
>
> COMMENT= mailfilter to identify and mark spam
>
> -DISTNAME=mimedefang-2.84
> +DISTNAME=mimedefang-2.85
> CATEGORIES= mail
> -REVISION=0
>
> -HOMEPAGE=http://www.mimedefang.org/
> -MASTER_SITES=${HOMEPAGE}static/
> +HOMEPAGE=https://www.mimedefang.org/
> +MASTER_SITES=${HOMEPAGE}releases/
>
> MAINTAINER= Antoine Jacoutot
>
> @@ -17,10 +16,10 @@ PERMIT_PACKAGE= Yes
> WANTLIB += c m milter perl pthread
>
> BUILD_DEPENDS= ${RUN_DEPENDS}
> -RUN_DEPENDS= devel/p5-IO-stringy \
> - mail/p5-Mail-Tools \
> +RUN_DEPENDS= mail/p5-Mail-Tools \
> mail/p5-MIME-tools \
> security/p5-Digest-SHA1 \
> + security/p5-Crypt-OpenSSL-Random \
> sysutils/p5-Unix-Syslog
>
> # useful optional dependencies
> @@ -36,7 +35,10 @@ CONFIGURE_ARGS=--with-user=_mdefang \
> --disable-anti-virus \
> --enable-poll
>
> -NO_TEST= Yes
> +TEST_DEPENDS=devel/p5-Test-Class \
> + devel/p5-Test-Most
> +
> +TEST_TARGET= test
>
> FAKE_FLAGS= sysconfdir=${PREFIX}/share/examples/mimedefang
>
> Index: distinfo
> ===
> RCS file: /cvs/ports/mail/mimedefang/distinfo,v
> retrieving revision 1.19
> diff -u -p -r1.19 distinfo
> --- distinfo 29 Mar 2018 20:52:15 - 1.19
> +++ distinfo 25 Aug 2021 08:31:33 -
> @@ -1,2 +1,2 @@
> -SHA256 (mimedefang-2.84.tar.gz) =
> bRUxxwqQH83fnLmJ1Ii+r3isDMFtEb65gbmSABRsSEg=
> -SIZE (mimedefang-2.84.tar.gz) = 371596
> +SHA256 (mimedefang-2.85.tar.gz) =
> JA6VIHfnrJzBRWjzJSqGG4UHD6yCl0lTY9Tc1+HBt4Y=
> +SIZE (mimedefang-2.85.tar.gz) = 499350
> Index: patches/patch-examples_mimedefang-filter-openbsd-ports
> ===
> RCS file:
> /cvs/ports/mail/mimedefang/patches/patch-examples_mimedefang-filter-openbsd-ports,v
> retrieving revision 1.7
> diff -u -p -r1.7 patch-examples_mimedefang-filter-openbsd-ports
> --- patches/patch-examples_mimedefang-filter-openbsd-ports31 Oct 2017
> 07:34:01 - 1.7
> +++ patches/patch-examples_mimedefang-filter-openbsd-ports25 Aug 2021
> 08:31:33 -
> @@ -13,7 +13,7 @@ Index: examples/mimedefang-filter-openbs
> #
> # This program may be distributed under the terms of the GNU General
> @@ -20,7 +17,7 @@
> - # MIMEDefang policy. A good example would be 'defang-ad...@mydomain.com'
> + # MIMEDefang policy.A good example would be 'defang-ad...@mydomain.com'
> #***
> $AdminAddress = 'postmaster@localhost';
> -$AdminName = "MIMEDefang Administrator's Full Name";
> @@ -22,7 +22,7 @@ Index: examples/mimedefang-filter-openbs
> #***
> # Set the e-mail address from which MIMEDefang quarantine warnings and
> @@ -28,7 +25,7 @@ $AdminName = "MIMEDefang Administrator's Full Name";
> - # 'mimedef...@mydomain.com'. Make sure to have an alias for this
> + # 'mimedef...@mydomain.com'.Make sure to have an alias for this
> # address if you want replies to it to work.
> #***
> -$DaemonAddress = 'mimedefang@localhost';
> @@ -43,50 +43,7 @@ Index: examples/mimedefang-filter-openbs
> # Set various stupid things your mail client does below.
> #***
>
> -@@ -137,6 +140,8 @@ sub filter_begin {
> - if ($FoundVirus) {
> - md_graphdefang_log('virus', $VirusName, $RelayAddr);
> - md_syslog('warning', "Discarding because of virus $VirusName");
> -+# Uncomment to copy the message to quarantine before discarding it.
> -+# action_quarantine_entire_message();
> - return action_discard();
> - }
> -
> -@@ -180,10 +185,11 @@ sub filter {
> - return action_bounce("MIME type message/partial not accepted here");
> - }
> -
> --if (filter_bad_filename($entity)) {
> --md_graphdefang_log('bad_filename', $fname, $type);
> --return action_drop_with_warning("An attachment named $fname
Re: nginx gracefull shutdown
Hi
Okay
On 27/08/21 15:01 +0200, Antoine Jacoutot wrote:
> Hi.
>
> According to nginx man page:
>
> SIGINT, SIGTERM Shut down quickly.
> SIGQUIT Shut down gracefully.
>
> While I am not a fan of rewriting rc_ functions, I don't think this particular
> use case warrants new code to implement some new "rc_stop_sig" feature so I
> propose this to the rc.d script (and fix the reload case to add the proper
> rtable).
>
> OK?
>
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/www/nginx/Makefile,v
> retrieving revision 1.153
> diff -u -p -r1.153 Makefile
> --- Makefile 25 May 2021 19:43:55 - 1.153
> +++ Makefile 27 Aug 2021 12:56:50 -
> @@ -38,6 +38,8 @@ PKGNAME-passenger= nginx-passenger-${VER
> 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/
> Index: pkg/nginx.rc
> ===
> RCS file: /cvs/ports/www/nginx/pkg/nginx.rc,v
> retrieving revision 1.14
> diff -u -p -r1.14 nginx.rc
> --- pkg/nginx.rc 11 Jan 2018 19:27:11 - 1.14
> +++ pkg/nginx.rc 27 Aug 2021 12:56:50 -
> @@ -9,7 +9,12 @@ daemon="${TRUEPREFIX}/sbin/nginx"
> pexp="nginx: master process ${daemon}${daemon_flags:+ ${daemon_flags}}"
>
> rc_reload() {
> - ${daemon} ${daemon_flags} -t && pkill -HUP -xf "${pexp}"
> + ${daemon} ${daemon_flags} -t &&
> + pkill -HUP -T "${daemon_rtable}" -xf "${pexp}"
> +}
> +
> +rc_stop() {
> + pkill -QUIT -T "${daemon_rtable}" -xf "${pexp}"
> }
>
> rc_cmd $1
>
>
> --
> Antoine
--
Regards,
Robert Nagy
nginx gracefull shutdown
Hi.
According to nginx man page:
SIGINT, SIGTERM Shut down quickly.
SIGQUIT Shut down gracefully.
While I am not a fan of rewriting rc_ functions, I don't think this particular
use case warrants new code to implement some new "rc_stop_sig" feature so I
propose this to the rc.d script (and fix the reload case to add the proper
rtable).
OK?
Index: Makefile
===
RCS file: /cvs/ports/www/nginx/Makefile,v
retrieving revision 1.153
diff -u -p -r1.153 Makefile
--- Makefile25 May 2021 19:43:55 - 1.153
+++ Makefile27 Aug 2021 12:56:50 -
@@ -38,6 +38,8 @@ PKGNAME-passenger=nginx-passenger-${VER
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/
Index: pkg/nginx.rc
===
RCS file: /cvs/ports/www/nginx/pkg/nginx.rc,v
retrieving revision 1.14
diff -u -p -r1.14 nginx.rc
--- pkg/nginx.rc11 Jan 2018 19:27:11 - 1.14
+++ pkg/nginx.rc27 Aug 2021 12:56:50 -
@@ -9,7 +9,12 @@ daemon="${TRUEPREFIX}/sbin/nginx"
pexp="nginx: master process ${daemon}${daemon_flags:+ ${daemon_flags}}"
rc_reload() {
- ${daemon} ${daemon_flags} -t && pkill -HUP -xf "${pexp}"
+ ${daemon} ${daemon_flags} -t &&
+ pkill -HUP -T "${daemon_rtable}" -xf "${pexp}"
+}
+
+rc_stop() {
+ pkill -QUIT -T "${daemon_rtable}" -xf "${pexp}"
}
rc_cmd $1
--
Antoine
Re: MariaDB in current - fatal error with clients "utf8 is not supported by MySQL"
> -Original Message- > From: Stuart Henderson [mailto:s...@spacehopper.org] > Sent: Thursday, August 26, 2021 2:55 PM > On 2021/08/26 13:11, Ted Wynnychenko wrote: > > > > I have no idea what may have changed, but everything was working as > expected > > until after a reboot yesterday. > > After the restart, I started getting errors from php applications (in > this > > case, Horde). > > If you "grep started /var/mysql/*.err" you'll likely have versions and > dates. > The port switched to the 10.6 branch here: > > date: 2021/07/09 11:35:29; author: sthen; state: Exp; lines: +7 -10; > commitid: I3rHhQR1jFVVyvVB; > update to mariadb-10.6.3, from Brad > > If you updated from a snapshot before then, and then updated packages > but didn't reboot after doing so, you would still have been running > an older version > Yes, I think that explains why it happened yesterday. I previously updated everything before 7/9 (base/ports), and last updated base/ports about a month ago. But, I probably did not restart after updating ports, so I was still running the older version of MariaDB until the other day (something to correct in my update process in the future). > > > > MariaDB [(none)]> show character set; > > +--+-+-+- > ---+ > > | Charset | Description | Default collation | > Maxlen | > > +--+-+-+- > ---+ > > ... > > | utf8mb3 | UTF-8 Unicode | utf8mb3_general_ci | > 3 | > > ... > > | utf8mb4 | UTF-8 Unicode | utf8mb4_general_ci | > 4 | > > ... > > | utf16| UTF-16 Unicode | utf16_general_ci| > 4 | > > | utf16le | UTF-16LE Unicode| utf16le_general_ci | > 4 | > > ... > > +--+-+-+- > ---+ > > 40 rows in set (0.000 sec) > > > > There is no "utf8" listed by MariaDB. But, according to the MariaDB > > website, it seems like it still should be. > > "show character set" only shows the actual names, not aliases. > IMO it is correct that it's not listed there. > If this is true, I am wondering why it worked before and not now, since horde was always checking for utf8 (before and now)? According to the MariaDB website (https://mariadb.com/kb/en/supported-character-sets-and-collations/) they list utf8 as a separate and distinct character set from both uft8mb3 and utf8mb4. Also, if utf8 was not listed as a character set with "show character set;" in prior versions of MariaDB port on openbsd, then this problem with Horde would have happened before the change in MariaDB version. > > So this is where it comes from: > > https://github.com/horde/Db/blob/master/lib/Horde/Db/Adapter/Mysql/Sche > ma.php#L577 > > I think Horde should maybe try using the charset name as-is without > trying > to look it up in 'show character set' first. Suggest reporting it to > them > and see what they say. > > It might be worth a note in the Upgrades section of the pkg-readme but > I bet nobody running into the problem would see it there. Thanks again. Ted
Re: MariaDB in current - fatal error with clients "utf8 is not supported by MySQL"
On 2021/08/27 06:51, Ted Wynnychenko wrote: > > > > -Original Message- > > From: Stuart Henderson [mailto:s...@spacehopper.org] > > Sent: Thursday, August 26, 2021 2:55 PM > > > > On 2021/08/26 13:11, Ted Wynnychenko wrote: > > > > > > I have no idea what may have changed, but everything was working as > > expected > > > until after a reboot yesterday. > > > After the restart, I started getting errors from php applications (in > > this > > > case, Horde). > > > > If you "grep started /var/mysql/*.err" you'll likely have versions and > > dates. > > The port switched to the 10.6 branch here: > > > > date: 2021/07/09 11:35:29; author: sthen; state: Exp; lines: +7 -10; > > commitid: I3rHhQR1jFVVyvVB; > > update to mariadb-10.6.3, from Brad > > > > If you updated from a snapshot before then, and then updated packages > > but didn't reboot after doing so, you would still have been running > > an older version > > > > Yes, I think that explains why it happened yesterday. I previously updated > everything before 7/9 (base/ports), and last updated base/ports about a > month ago. But, I probably did not restart after updating ports, so I was > still running the older version of MariaDB until the other day (something to > correct in my update process in the future). > > > > > > > > MariaDB [(none)]> show character set; > > > +--+-+-+- > > ---+ > > > | Charset | Description | Default collation | > > Maxlen | > > > +--+-+-+- > > ---+ > > > ... > > > | utf8mb3 | UTF-8 Unicode | utf8mb3_general_ci | > > 3 | > > > ... > > > | utf8mb4 | UTF-8 Unicode | utf8mb4_general_ci | > > 4 | > > > ... > > > | utf16| UTF-16 Unicode | utf16_general_ci| > > 4 | > > > | utf16le | UTF-16LE Unicode| utf16le_general_ci | > > 4 | > > > ... > > > +--+-+-+- > > ---+ > > > 40 rows in set (0.000 sec) > > > > > > There is no "utf8" listed by MariaDB. But, according to the MariaDB > > > website, it seems like it still should be. > > > > "show character set" only shows the actual names, not aliases. > > IMO it is correct that it's not listed there. > > > > If this is true, I am wondering why it worked before and not now, since > horde was always checking for utf8 (before and now)? > > According to the MariaDB website > (https://mariadb.com/kb/en/supported-character-sets-and-collations/) they > list utf8 as a separate and distinct character set from both uft8mb3 and > utf8mb4. > > Also, if utf8 was not listed as a character set with "show character set;" > in prior versions of MariaDB port on openbsd, then this problem with Horde > would have happened before the change in MariaDB version. 10.5 listed utf8 but it did not list utf8mb3 (the reverse of the situation now, and exactly what's described in the 10.6 upgrade notes). The table on https://mariadb.com/kb/en/supported-character-sets-and-collations/ is for 10.2, I don't have an old enough install to check that. > > > > So this is where it comes from: > > > > https://github.com/horde/Db/blob/master/lib/Horde/Db/Adapter/Mysql/Sche > > ma.php#L577 > > > > I think Horde should maybe try using the charset name as-is without > > trying > > to look it up in 'show character set' first. Suggest reporting it to > > them > > and see what they say. > > > > It might be worth a note in the Upgrades section of the pkg-readme but > > I bet nobody running into the problem would see it there. > > > Thanks again. > Ted > >
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2021/08/27 05:32:00 Modified files: www/seamonkey : Makefile distinfo www/seamonkey-i18n: Makefile.inc distinfo Removed files: www/seamonkey/patches: patch-third_party_rust_packed_simd_src_api_shuffle_rs patch-third_party_rust_packed_simd_src_codegen_llvm_rs patch-third_party_rust_packed_simd_src_lib_rs Log message: www/seamonkey: update to 2.53.9. see https://www.seamonkey-project.org/releases/seamonkey2.53.9/#new
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2021/08/27 03:54:10 Modified files: sysutils/terragrunt: Makefile distinfo Log message: Update to terragrunt-0.31.7.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2021/08/27 03:46:07 Modified files: sysutils/terraform: Makefile distinfo Log message: Update to terraform-1.0.5.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2021/08/27 03:29:49 Modified files: sysutils/deja-dup: Makefile distinfo Log message: Update to deja-dup-42.8.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2021/08/27 03:25:58 Modified files: devel/py-prompt_toolkit: Makefile distinfo Log message: Update to py-prompt_toolkit-3.0.20 Changelog: https://github.com/prompt-toolkit/python-prompt-toolkit/blob/3.0.20/CHANGELOG
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2021/08/27 03:25:26 Modified files: audio/audacious/player: Makefile Log message: Missing RDEP on x11/qt5/qtsvg, found by Carsten Boysen Jensen
Re: UPDATE: Aircrack-ng 1.6
On 8/20/2021 11:12 PM, Brad Smith wrote:
Here is an update to Aircrack-ng 1.6.
Other than building the package that is all I have tested on amd64
and i386.
Any users familiar with Aircrack-ng able to test this out?
Anyone?
Index: Makefile
===
RCS file: /home/cvs/ports/security/aircrack-ng/Makefile,v
retrieving revision 1.33
diff -u -p -u -p -r1.33 Makefile
--- Makefile27 Dec 2020 18:13:18 - 1.33
+++ Makefile20 Aug 2021 00:21:44 -
@@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.33 2020/12/27 18:13:18 sthen Exp $
COMMENT= 802.11 WEP and WPA-PSK keys cracking program
-DISTNAME= aircrack-ng-1.5.2
-REVISION= 6
+
+DISTNAME= aircrack-ng-1.6
CATEGORIES= security
HOMEPAGE= https://www.aircrack-ng.org/
@@ -10,8 +10,7 @@ HOMEPAGE= https://www.aircrack-ng.org/
# GPLv2
PERMIT_PACKAGE= Yes
-WANTLIB+= c pthread crypto z pcre
-WANTLIB+= ${COMPILER_LIBCXX} m sqlite3
+WANTLIB+= ${COMPILER_LIBCXX} c crypto m pcre pthread sqlite3 ssl z
MASTER_SITES= https://download.aircrack-ng.org/
@@ -23,10 +22,6 @@ LIB_DEPENDS= databases/sqlite3 \
RUN_DEPENDS+= net/arp-scan,-mac>=20190128
USE_GMAKE= Yes
-.if ${MACHINE_ARCH} == "i386"
-# ld: error: undefined symbol: __i686.get_pc_thunk.bx
-USE_LLD= No
-.endif
LIBTOOL_FLAGS=--tag=disable-static
AUTOCONF_VERSION= 2.69
AUTOMAKE_VERSION= 1.16
@@ -56,8 +51,7 @@ PKG_ARGS+= -Darm=0
MAKE_ENV+= ALTIVEC=false POWER8=false
.endif
-
pre-configure:
- ${SUBST_CMD} ${WRKSRC}/src/airodump-ng.h
+ ${SUBST_CMD} ${WRKSRC}/src/airodump-ng/airodump-ng.c
.include
Index: distinfo
===
RCS file: /home/cvs/ports/security/aircrack-ng/distinfo,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 distinfo
--- distinfo23 Feb 2019 22:23:25 - 1.4
+++ distinfo20 Aug 2021 00:21:44 -
@@ -1,2 +1,2 @@
-SHA256 (aircrack-ng-1.5.2.tar.gz) =
nlkv52WARiIOCsCm0FxAJpA/MHeySIk+AFbMvk7ogkE=
-SIZE (aircrack-ng-1.5.2.tar.gz) = 7138360
+SHA256 (aircrack-ng-1.6.tar.gz) = Twv9SG78bqcin3+8VDQP+LIJSg1z6fYX4KOfh4mZokc=
+SIZE (aircrack-ng-1.6.tar.gz) = 7933308
Index: patches/patch-build_m4_aircrack_ng_simd_m4
===
RCS file: patches/patch-build_m4_aircrack_ng_simd_m4
diff -N patches/patch-build_m4_aircrack_ng_simd_m4
--- patches/patch-build_m4_aircrack_ng_simd_m4 13 Jun 2020 17:38:49 -
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,25 +0,0 @@
-$OpenBSD: patch-build_m4_aircrack_ng_simd_m4,v 1.1 2020/06/13 17:38:49 cwen
Exp $
-
-Ensure that disabling AltiVec and POWER8 instructions with MAKE_ENV is honoured
-even if the build machine supports them, from:
-https://github.com/aircrack-ng/aircrack-ng/issues/1941
-
-Index: build/m4/aircrack_ng_simd.m4
build/m4/aircrack_ng_simd.m4.orig
-+++ build/m4/aircrack_ng_simd.m4
-@@ -132,7 +132,6 @@ then
- AX_CHECK_COMPILE_FLAG([-maltivec], [
- AX_APPEND_FLAG(-maltivec, [ppc_altivec_[]_AC_LANG_ABBREV[]flags])
- AC_SUBST(ppc_altivec_[]_AC_LANG_ABBREV[]flags)
--ALTIVEC_FOUND=1
- ])
-
- AX_CHECK_COMPILE_FLAG([-mabi=altivec], [
-@@ -148,7 +147,6 @@ then
- AX_CHECK_COMPILE_FLAG([-mpower8-vector], [
- AX_APPEND_FLAG(-mpower8-vector,
[ppc_altivec_[]_AC_LANG_ABBREV[]flags])
- AC_SUBST(ppc_altivec_[]_AC_LANG_ABBREV[]flags)
--POWER8_FOUND=1
- ])
- fi
-
Index: patches/patch-include_aircrack-ng_crypto_sha1-sse2_h
===
RCS file: patches/patch-include_aircrack-ng_crypto_sha1-sse2_h
diff -N patches/patch-include_aircrack-ng_crypto_sha1-sse2_h
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-include_aircrack-ng_crypto_sha1-sse2_h20 Aug 2021
00:21:44 -
@@ -0,0 +1,365 @@
+$OpenBSD$
+
+chore: remove unused assembly routines
+
+Index: include/aircrack-ng/crypto/sha1-sse2.h
+--- include/aircrack-ng/crypto/sha1-sse2.h.orig
include/aircrack-ng/crypto/sha1-sse2.h
+@@ -36,357 +36,3 @@
+ #include
+
+ #include
+-
+-#if defined(__i386__) || ((defined(__x86_64__) && !defined(__CYGWIN__))
\
+-|| (defined(__x86_64__) &&
defined(__CYGWIN__) \
+-&&
!defined(__clang__)))
+-
+-#ifdef OLD_SSE_CORE
+-void show_result(char * key, unsigned char * pmk)
+-{
+- int i;
+- printf("%-14s ", key);
+- for (i = 0; i < 32; i++) printf("%.2X", pmk[i]);
+- printf("\n");
+-}
+-
+-#endif
+-extern int shasse2_init(unsigned char ctx[80]) __attribute__((regparm(1)));
+-
+-extern int shasse2_ends(unsigned char ctx[80], unsigned char digests[80])
+-
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/08/27 02:57:52 Modified files: security/libssh: Tag: OPENBSD_6_9 Makefile distinfo security/libssh/patches: Tag: OPENBSD_6_9 patch-tests_unittests_torture_misc_c Log message: update to libssh-0.9.6, notable fixes: CVE-2021-3634: Fix possible heap-buffer overflow when rekeying with different key exchange mechanism Fix handshake bug with AEAD ciphers and no HMAC overlap
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/08/27 02:57:30 Modified files: security/libssh: Makefile distinfo security/libssh/patches: patch-tests_unittests_torture_misc_c Log message: update to libssh-0.9.6, notable fixes: CVE-2021-3634: Fix possible heap-buffer overflow when rekeying with different key exchange mechanism Fix handshake bug with AEAD ciphers and no HMAC overlap
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/08/27 02:57:25 Modified files: lang/php/7.4 : Tag: OPENBSD_6_9 Makefile distinfo lang/php/7.4/patches: Tag: OPENBSD_6_9 patch-configure_ac patch-sapi_cgi_cgi_main_c Removed files: lang/php/7.4/patches: Tag: OPENBSD_6_9 patch-ext_openssl_openssl_c Log message: update to php-7.4.23
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/08/27 02:57:27 Modified files: lang/php/8.0 : Tag: OPENBSD_6_9 Makefile distinfo lang/php/8.0/patches: Tag: OPENBSD_6_9 patch-sapi_cgi_cgi_main_c Removed files: lang/php/8.0/patches: Tag: OPENBSD_6_9 patch-ext_openssl_openssl_c Log message: update to php-8.0.10
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/08/27 02:57:24 Modified files: lang/php/7.3 : Tag: OPENBSD_6_9 Makefile distinfo Log message: update to php-7.3.30
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/08/27 02:51:28 Modified files: lang/php/7.3 : Makefile distinfo Log message: update to php-7.3.30
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/08/27 02:51:18 Modified files: lang/php/7.4 : Makefile distinfo lang/php/7.4/patches: patch-sapi_cgi_cgi_main_c Removed files: lang/php/7.4/patches: patch-ext_openssl_openssl_c Log message: update to php-7.4.23
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/08/27 02:51:22 Modified files: lang/php/8.0 : Makefile distinfo Removed files: lang/php/8.0/patches: patch-ext_openssl_openssl_c Log message: update to php-8.0.10
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2021/08/27 02:51:15 Modified files: sysutils/consul-template: Makefile distinfo Log message: Update to consul-template-0.27.0.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2021/08/27 02:38:47 Modified files: x11/gnome/gdl : Makefile distinfo x11/gnome/gdl/pkg: PLIST Log message: Update to gdl-3.40.0.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2021/08/27 02:28:02 Modified files: multimedia/gstreamer1/plugins-good: Makefile Added files: multimedia/gstreamer1/plugins-good/patches: patch-gst_deinterlace_meson_build Log message: Deinterlace: Use proper ASM output format for *BSD OS from Brad
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2021/08/27 02:16:20 Modified files: audio/pavucontrol: Makefile Log message: Sync WANTLIB.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2021/08/27 01:35:14 Modified files: sysutils/awscli: Makefile distinfo sysutils/awscli/pkg: PLIST Log message: Update to awscli-1.20.30.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2021/08/27 01:34:55 Modified files: net/py-boto3 : Makefile distinfo Log message: Update to py3-boto3-1.18.30.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2021/08/27 01:34:43 Modified files: net/py-botocore: Makefile distinfo net/py-botocore/pkg: PLIST Log message: Update to py3-botocore-1.21.30.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2021/08/27 01:34:21 Modified files: sysutils/google-cloud-sdk: Makefile distinfo sysutils/google-cloud-sdk/pkg: PLIST Log message: Update to google-cloud-sdk-354.0.0.
Re: [UPDATE] profanity 0.11.0 & change to libstrophe
On 2021/08/26 23:26, Florian Viehweger wrote:
> Hi,
>
> this updates profanity to 0.11.0.
>
> Changes are listed here [1] as they are too long to list in this mail.
>
> This version fixes several issues regarding OMEMO. Additional the XMPP
> library is changed to libstrophe, as libmesode is deprecated upstream.
>
> portcheck, 'make lib-depends-check' and 'make test' are happy for both
> profanity and libstrophe.
>
> Tested on amd64. I'm using it with 'standard' conversations with OMEMO
> and on an another server with a self signed certificate in a MUC chat
> room, again with OMEMO. No issues so far, it is running fine.
>
> As libmesode is deprecated, I've modified devel/quirks.
>
> Comments? OK?
This is looking pretty good. Couple of small things inline:
> Thanks!
>
> [1] https://github.com/profanity-im/profanity/releases/tag/0.11.0
>
>
> Index: devel/quirks/files/Quirks.pm
> ===
> RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
> retrieving revision 1.1296
> diff -u -p -u -p -r1.1296 Quirks.pm
> --- devel/quirks/files/Quirks.pm 10 Aug 2021 20:43:52 - 1.1296
> +++ devel/quirks/files/Quirks.pm 26 Aug 2021 20:25:58 -
> @@ -477,7 +477,8 @@ my $stem_extensions = {
> 'py-spark-parser' => 'py3-spark-parser',
> 'py-xdis' => 'py3-xdis',
> 'py-uncompyle6' => 'py3-uncompyle6',
> - 'py-click' => 'py3-click'
> + 'py-click' => 'py3-click',
> + 'libmesode' => 'libstrophe'
> };
>
> my $obsolete_reason = {};
> @@ -647,7 +648,6 @@ setup_obsolete_reason(
> 6 => 'suricata-update',
> 1 => 'exploitdb-papers',
> 3 => 'nautilus-sendto',
> - 5 => 'libstrophe',
> 2 => 'ghostview',
> 7 => 'libcudf',
> 7 => 'ocaml-cudf',
> @@ -1234,6 +1234,7 @@ setup_obsolete_reason(
> 3 => 'qt4-postgresql',
> 3 => 'qt4-sqlite2',
> 3 => 'qt4-tds',
> + 5 => 'libmesode',
> );
With the $stem_extensions addition that will automatically replace
libmesode with libstrophe, there shouldn't be a $obsolete_reason entry
for this. quirks needs a REVISION bump.
>
> # though it's not yet used, these should be pkgnames, so that eventually
> Index: net/Makefile
> ===
> RCS file: /cvs/ports/net/Makefile,v
> retrieving revision 1.1262
> diff -u -p -u -p -r1.1262 Makefile
> --- net/Makefile 24 Jul 2021 21:33:15 - 1.1262
> +++ net/Makefile 26 Aug 2021 20:26:04 -
> @@ -225,6 +225,7 @@
> SUBDIR += libsignal-protocol-c
> SUBDIR += libsmi
> SUBDIR += libst
> + SUBDIR += libstrophe
> SUBDIR += libtorrent
> SUBDIR += libtorrent-rasterbar
> SUBDIR += libunbound
libmesode should be removed from net/Makefile
> Index: net/libmesode/Makefile
> ===
> RCS file: net/libmesode/Makefile
> diff -N net/libmesode/Makefile
> --- net/libmesode/Makefile23 Oct 2020 13:44:41 - 1.6
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,39 +0,0 @@
> -# $OpenBSD: Makefile,v 1.6 2020/10/23 13:44:41 rsadowski Exp $
> -
> -COMMENT =fork of libstrophe for use with profanity XMPP client
> -
> -GH_ACCOUNT = boothj5
> -GH_PROJECT = libmesode
> -GH_TAGNAME = 0.10.1
> -
> -CATEGORIES = net devel
> -
> -SHARED_LIBS += mesode1.0 # 0.0
> -
> -MAINTAINER = Rafael Sadowski
> -
> -# Dual licensed: MIT and GPLv3
> -PERMIT_PACKAGE = Yes
> -
> -WANTLIB += crypto expat ssl
> -
> -# Only needed for tests, but cannot be a TEST_DEPENDS.
> -# Check must be present at build time for tests to work.
> -BUILD_DEPENDS += devel/check
> -
> -SEPARATE_BUILD = Yes
> -
> -USE_GMAKE = Yes
> -
> -AUTOMAKE_VERSION = 1.16
> -AUTOCONF_VERSION = 2.69
> -
> -MAKE_FLAGS = CC="${CC}" \
> - CFLAGS="${CFLAGS}"
> -
> -CONFIGURE_STYLE =autoreconf
> -CONFIGURE_ENV += CPPFLAGS="-I${LOCALBASE}/include" \
> - LDFLAGS="-L${LOCALBASE}/lib"
> -AUTORECONF = ./bootstrap.sh
> -
> -.include
> Index: net/libmesode/distinfo
> ===
> RCS file: net/libmesode/distinfo
> diff -N net/libmesode/distinfo
> --- net/libmesode/distinfo23 Oct 2020 13:44:41 - 1.4
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,2 +0,0 @@
> -SHA256 (libmesode-0.10.1.tar.gz) =
> yd2QZI5z2SuQ8rCuQaddj0abEW0+aqKXwUzVe+k32Z4=
> -SIZE (libmesode-0.10.1.tar.gz) = 150629
> Index: net/libmesode/pkg/DESCR
> ===
> RCS file: net/libmesode/pkg/DESCR
> diff -N net/libmesode/pkg/DESCR
> --- net/libmesode/pkg/DESCR 3 Mar 2019 19:14:28 - 1.1.1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,13 +0,0 @@
> -libmesode is a minimal XMPP library written in C. libmesode is a fork of
> -libstrophe for use in Profanity
