Re: NEW: games/devilutionx
I promise that this third attachment preserves ^M properly. I had to use application/octet-stream and not text/x-patch in my e-mail client. Nam Nguyen writes: > I just realized that pasting it mangled the ^M. I have attached it > here. Also, the commit is dated July 23, 2019. devilutionx.diff Description: diff
productivity/tryton: add cdn to MASTER_SITES
Hi,
tryton upstream added a cdn in front of their downloads.tryton.org host
to reduce the load for serving static files.
The following diff makes all tryton ports uses downloads-cdn.t.o first,
and next fallback to downloads.t.o.
I assume changing MASTER_SITES doesn't require to bump REVISION.
I checked that the tarballs are the same (make fetch doesn't complain
about change in hashes).
Comments or OK ?
--
Sebastien Marie
Index: Makefile.inc
===
RCS file: /cvs/ports/productivity/tryton/Makefile.inc,v
retrieving revision 1.27
diff -u -p -r1.27 Makefile.inc
--- Makefile.inc2 Jul 2019 10:21:26 - 1.27
+++ Makefile.inc24 Jul 2019 06:38:18 -
@@ -10,7 +10,8 @@ MAINTAINER ?= Sebastien Marie https://downloads.tryton.org/${VERSION:C/^([0-9]+\.[0-9]+).*/\1/}/
+MASTER_SITES =
https://downloads-cdn.tryton.org/${VERSION:C/^([0-9]+\.[0-9]+).*/\1/}/ \
+
https://downloads.tryton.org/${VERSION:C/^([0-9]+\.[0-9]+).*/\1/}/
DIST_SUBDIR = tryton
VERSION ?= ${MODPY_EGG_VERSION}
Re: NEW: games/devilutionx
I just realized that pasting it mangled the ^M. I have attached it
here. Also, the commit is dated July 23, 2019.
Nam Nguyen writes:
> amd64 multiplayer now works. Here is a diff for the git version as of
> July 19, 2019 from this commit
> (https://github.com/diasurgical/devilutionX/commit/72f65d577124d24ab9f459ef164e31c9ab225b3e).
>
> I added __LP64__ for amd64 specific bits, allowing it to compile on both
> amd64 and i386. Bryan suggested, "You could probably do #ifdef __i386__
> or __amd64__ or more generally, #ifdef __LP64__ I suspect there may be a
> way to fix it so the code works on both 32-bit and 64-bit platforms,
> however."
>
> To test I connected to a game hosted by Bryan, and we played the first
> several rooms in the first dungeon. Also, I was able to build and play
> from i386 and amd64 in the same game.
>
> Brian Callahan writes:
>> We'll sync with releases starting with the next release (presumable
>> 0.5).
>
> I have communicated my findings with upstream
> (https://github.com/diasurgical/devilutionX/issues/191). Multiplayer
> testing is a priority for the next release.
>
> This diff is pasted for consideration in ports, in case multiplayer is
> desired before the next release. Tests and feedback are welcome. Thank
> you to all involved in this port.
>
> Bryan Steele writes:
>
>> On Fri, Jul 19, 2019 at 10:37:59AM -0400, Bryan Steele wrote:
>>> On Thu, Jul 18, 2019 at 07:49:51PM -0400, Brian Callahan wrote:
>>> > Hi ports --
>>> >
>>> > Attached is a new port, games/devilutionx. DevilutionX is an open source
>>> > engine recreation for the original Diablo I game.
>>> >
>>> > ---
>>> > pkg/DESCR:
>>> > DevilutionX is an open source recreation of the game engine used in
>>> > Diablo I, an action role-playing game by Blizzard Entertainment.
>>> >
>>> > While this package and the game engine are open source, one still needs
>>> > to provide the original game assets from Diablo I, which is not open
>>> > source. You will need to purchase the original game to use this package.
>>> > ---
>>> >
>>> > This port is a multi-person effort between myself, thfr@, and brynet@. The
>>> > game works very well on amd64--the underlying engine is claimed to be
>>> > nearly
>>> > 100% binary identical to the original game. Sadly, multiplayer doesn't
>>> > work
>>> > on 64-bit platforms, but this is known and hopefully will be fixed at some
>>> > point.
>>> >
>>> > OK?
>>> >
>>> > ~Brian
>>>
>>> I'm obviously ok with this going in, w/ the pkg/README fix from Nam. :-)
>>>
>>> It's unfortunate that we will initially miss out on multiplayer support,
>>> but good that someone is working on the problem, and upstream is aware.
>>>
>>> Hopefully some of these changes can be sent upstream.
>>>
>>> -Bryan.
>>
>> To those of you following along, this is the port that thfr@ used when
>> streaming Diablo last month on OpenBSD.
>>
>> https://www.youtube.com/watch?v=5sBKaqkFev8
Index: Makefile
===
RCS file: /cvs/ports/games/devilutionx/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 Makefile
--- Makefile 19 Jul 2019 13:42:33 - 1.1.1.1
+++ Makefile 24 Jul 2019 06:14:21 -
@@ -1,12 +1,12 @@
# $OpenBSD: Makefile,v 1.1.1.1 2019/07/19 13:42:33 bcallah Exp $
COMMENT = open source engine recreation for Diablo 1 game
-DISTNAME = devilutionx-0.4.0pl20190715
+DISTNAME = devilutionx-0.4.0pl20190723
CATEGORIES = games x11
GH_ACCOUNT = diasurgical
GH_PROJECT = devilutionX
-GH_COMMIT = 10ebca4efd422bbf46bad6d12ea4cdade9038b01
+GH_COMMIT = 72f65d577124d24ab9f459ef164e31c9ab225b3e
MAINTAINER = Brian Callahan
Index: distinfo
===
RCS file: /cvs/ports/games/devilutionx/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 distinfo
--- distinfo 19 Jul 2019 13:42:33 - 1.1.1.1
+++ distinfo 24 Jul 2019 06:14:21 -
@@ -1,2 +1,2 @@
-SHA256 (devilutionx-0.4.0pl20190715-10ebca4e.tar.gz) = 6WOyN6WpRoYuKpe1P24YgQ8OaYEtShyt8p1R8JrZT4U=
-SIZE (devilutionx-0.4.0pl20190715-10ebca4e.tar.gz) = 1350054
+SHA256 (devilutionx-0.4.0pl20190723-72f65d57.tar.gz) = 13YESHQhAY4y15I8OKjjoyf6pxMEJSCeot84/Qs3Cxg=
+SIZE (devilutionx-0.4.0pl20190723-72f65d57.tar.gz) = 1354368
Index: patches/patch-CMakeLists_txt
===
RCS file: /cvs/ports/games/devilutionx/patches/patch-CMakeLists_txt,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt 19 Jul 2019 13:42:33 - 1.1.1.1
+++ patches/patch-CMakeLists_txt 24 Jul 2019 06:14:21 -
@@ -14,7 +14,7 @@ Index: CMakeLists.txt
set(ASAN OFF)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DO_LARGEFILE=0 -Dstat64=stat -Dlstat64=lstat -Dlseek64=lseek -Doff64_t=off_t -Dfstat64=fstat -Dftruncate64=ftruncate")
endif()
-@@ -289,7 +289,7 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+@@ -290,7 +290,7 @@ if(CMAKE_CXX_COMP
Re: NEW: games/devilutionx
amd64 multiplayer now works. Here is a diff for the git version as of
July 19, 2019 from this commit
(https://github.com/diasurgical/devilutionX/commit/72f65d577124d24ab9f459ef164e31c9ab225b3e).
I added __LP64__ for amd64 specific bits, allowing it to compile on both
amd64 and i386. Bryan suggested, "You could probably do #ifdef __i386__
or __amd64__ or more generally, #ifdef __LP64__ I suspect there may be a
way to fix it so the code works on both 32-bit and 64-bit platforms,
however."
To test I connected to a game hosted by Bryan, and we played the first
several rooms in the first dungeon. Also, I was able to build and play
from i386 and amd64 in the same game.
Brian Callahan writes:
> We'll sync with releases starting with the next release (presumable
> 0.5).
I have communicated my findings with upstream
(https://github.com/diasurgical/devilutionX/issues/191). Multiplayer
testing is a priority for the next release.
This diff is pasted for consideration in ports, in case multiplayer is
desired before the next release. Tests and feedback are welcome. Thank
you to all involved in this port.
Bryan Steele writes:
> On Fri, Jul 19, 2019 at 10:37:59AM -0400, Bryan Steele wrote:
>> On Thu, Jul 18, 2019 at 07:49:51PM -0400, Brian Callahan wrote:
>> > Hi ports --
>> >
>> > Attached is a new port, games/devilutionx. DevilutionX is an open source
>> > engine recreation for the original Diablo I game.
>> >
>> > ---
>> > pkg/DESCR:
>> > DevilutionX is an open source recreation of the game engine used in
>> > Diablo I, an action role-playing game by Blizzard Entertainment.
>> >
>> > While this package and the game engine are open source, one still needs
>> > to provide the original game assets from Diablo I, which is not open
>> > source. You will need to purchase the original game to use this package.
>> > ---
>> >
>> > This port is a multi-person effort between myself, thfr@, and brynet@. The
>> > game works very well on amd64--the underlying engine is claimed to be
>> > nearly
>> > 100% binary identical to the original game. Sadly, multiplayer doesn't work
>> > on 64-bit platforms, but this is known and hopefully will be fixed at some
>> > point.
>> >
>> > OK?
>> >
>> > ~Brian
>>
>> I'm obviously ok with this going in, w/ the pkg/README fix from Nam. :-)
>>
>> It's unfortunate that we will initially miss out on multiplayer support,
>> but good that someone is working on the problem, and upstream is aware.
>>
>> Hopefully some of these changes can be sent upstream.
>>
>> -Bryan.
>
> To those of you following along, this is the port that thfr@ used when
> streaming Diablo last month on OpenBSD.
>
> https://www.youtube.com/watch?v=5sBKaqkFev8
Index: Makefile
===
RCS file: /cvs/ports/games/devilutionx/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 Makefile
--- Makefile19 Jul 2019 13:42:33 - 1.1.1.1
+++ Makefile24 Jul 2019 01:53:09 -
@@ -1,12 +1,12 @@
# $OpenBSD: Makefile,v 1.1.1.1 2019/07/19 13:42:33 bcallah Exp $
COMMENT = open source engine recreation for Diablo 1 game
-DISTNAME = devilutionx-0.4.0pl20190715
+DISTNAME = devilutionx-0.4.0pl20190723
CATEGORIES = games x11
GH_ACCOUNT = diasurgical
GH_PROJECT = devilutionX
-GH_COMMIT =10ebca4efd422bbf46bad6d12ea4cdade9038b01
+GH_COMMIT =72f65d577124d24ab9f459ef164e31c9ab225b3e
MAINTAINER = Brian Callahan
Index: distinfo
===
RCS file: /cvs/ports/games/devilutionx/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 distinfo
--- distinfo19 Jul 2019 13:42:33 - 1.1.1.1
+++ distinfo24 Jul 2019 01:53:09 -
@@ -1,2 +1,2 @@
-SHA256 (devilutionx-0.4.0pl20190715-10ebca4e.tar.gz) =
6WOyN6WpRoYuKpe1P24YgQ8OaYEtShyt8p1R8JrZT4U=
-SIZE (devilutionx-0.4.0pl20190715-10ebca4e.tar.gz) = 1350054
+SHA256 (devilutionx-0.4.0pl20190723-72f65d57.tar.gz) =
13YESHQhAY4y15I8OKjjoyf6pxMEJSCeot84/Qs3Cxg=
+SIZE (devilutionx-0.4.0pl20190723-72f65d57.tar.gz) = 1354368
Index: patches/patch-CMakeLists_txt
===
RCS file: /cvs/ports/games/devilutionx/patches/patch-CMakeLists_txt,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt19 Jul 2019 13:42:33 - 1.1.1.1
+++ patches/patch-CMakeLists_txt24 Jul 2019 01:53:09 -
@@ -14,7 +14,7 @@ Index: CMakeLists.txt
set(ASAN OFF)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DO_LARGEFILE=0 -Dstat64=stat
-Dlstat64=lstat -Dlseek64=lseek -Doff64_t=off_t -Dfstat64=fstat
-Dftruncate64=ftruncate")
endif()
-@@ -289,7 +289,7 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+@@ -290,7 +290,7 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
# Silence warnings about __int64 alignment hack not always being applicable
target_compile_options(devilutionx PRIVATE -Wno-ig
[NEW] devel/p5-Exception-Class-TryCatch
Hi ports@, The attached port provides Exception::Class::TryCatch, which is a requirement for devel/p5-CLI-Framework, which I will be submitting shortly. The port builds cleanly and passes all tests on my amd64 running today's -current. I am fairly new to porting, so any feedback would be greatly appreciated. Comments? Ok? Peter p5-Exception-Class-TryCatch-1.13.tar.gz Description: application/gzip
sparc64 bulk build report
bulk build on sparc64-1.ports.openbsd.org started on Sun Jul 21 05:43:19 MDT 2019 finished at Tue Jul 23 15:08:51 MDT 2019 lasted 03D02h25m done with kern.version=OpenBSD 6.5-current (GENERIC) #223: Sat Jul 20 08:21:59 MDT 2019 built packages:7600 Jul 21:5872 Jul 22:1221 Jul 23:506 critical path missing pkgs: http://build-failures.rhaalovely.net//sparc64/2019-07-21/summary.log build failures: 248 http://build-failures.rhaalovely.net//sparc64/2019-07-21/archivers/unrar.log http://build-failures.rhaalovely.net//sparc64/2019-07-21/archivers/zipios.log http://build-failures.rhaalovely.net//sparc64/2019-07-21/audio/adplug.log http://build-failures.rhaalovely.net//sparc64/2019-07-21/audio/espeak.log http://build-failures.rhaalovely.net//sparc64/2019-07-21/audio/libmusicbrainz.log http://build-failures.rhaalovely.net//sparc64/2019-07-21/audio/libopenmpt.log http://build-failures.rhaalovely.net//sparc64/2019-07-21/audio/libsidplay.log http://build-failures.rhaalovely.net//sparc64/2019-07-21/audio/mpd.log http://build-failures.rhaalovely.net//sparc64/2019-07-21/audio/ncmpcpp.log http://build-failures.rhaalovely.net//sparc64/2019-07-21/audio/portmidi.log http://build-failures.rhaalovely.net//sparc64/2019-07-21/audio/vorbis-tools.log http://build-failures.rhaalovely.net//sparc64/2019-07-21/cad/gnucap.log http://build-failures.rhaalovely.net//sparc64/2019-07-21/cad/magic.log http://build-failures.rhaalovely.net//sparc64/2019-07-21/cad/netgen.log http://build-failures.rhaalovely.net//sparc64/2019-07-21/cad/qcad.log http://build-failures.rhaalovely.net//sparc64/2019-07-21/cad/qucs.log http://build-failures.rhaalovely.net//sparc64/2019-07-21/chinese/libpinyin.log http://build-failures.rhaalovely.net//sparc64/2019-07-21/comms/fldigi.log http://build-failures.rhaalovely.net//sparc64/2019-07-21/comms/sigrok/libsigrokdecode.log http://build-failures.rhaalovely.net//sparc64/2019-07-21/comms/xastir.log http://build-failures.rhaalovely.net//sparc64/2019-07-21/converters/lastools.log http://build-failures.rhaalovely.net//sparc64/2019-07-21/databases/kyotocabinet.log http://build-failures.rhaalovely.net//sparc64/2019-07-21/databases/openldap,aci,-server.log http://build-failures.rhaalovely.net//sparc64/2019-07-21/databases/postgresql-plr.log http://build-failures.rhaalovely.net//sparc64/2019-07-21/databases/postgresql-previous.log http://build-failures.rhaalovely.net//sparc64/2019-07-21/databases/py-apsw.log http://build-failures.rhaalovely.net//sparc64/2019-07-21/databases/py-mysql.log http://build-failures.rhaalovely.net//sparc64/2019-07-21/databases/py-sql,python3.log http://build-failures.rhaalovely.net//sparc64/2019-07-21/devel/arm-none-eabi/gdb.log http://build-failures.rhaalovely.net//sparc64/2019-07-21/devel/arm-none-eabi/newlib.log http://build-failures.rhaalovely.net//sparc64/2019-07-21/devel/atf.log http://build-failures.rhaalovely.net//sparc64/2019-07-21/devel/avr32/gcc.log http://build-failures.rhaalovely.net//sparc64/2019-07-21/devel/codeworker.log http://build-failures.rhaalovely.net//sparc64/2019-07-21/devel/commoncpp.log http://build-failures.rhaalovely.net//sparc64/2019-07-21/devel/cpputest.log http://build-failures.rhaalovely.net//sparc64/2019-07-21/devel/ddd.log http://build-failures.rhaalovely.net//sparc64/2019-07-21/devel/dlib.log http://build-failures.rhaalovely.net//sparc64/2019-07-21/devel/fox.log http://build-failures.rhaalovely.net//sparc64/2019-07-21/devel/gsoap.log http://build-failures.rhaalovely.net//sparc64/2019-07-21/devel/include-what-you-use.log http://build-failures.rhaalovely.net//sparc64/2019-07-21/devel/jsonrpc-glib.log http://build-failures.rhaalovely.net//sparc64/2019-07-21/devel/keystone/main.log http://build-failures.rhaalovely.net//sparc64/2019-07-21/devel/libIDL.log http://build-failures.rhaalovely.net//sparc64/2019-07-21/devel/libconfig.log http://build-failures.rhaalovely.net//sparc64/2019-07-21/devel/libftdi1.log http://build-failures.rhaalovely.net//sparc64/2019-07-21/devel/libgit2/libgit2-glib.log http://build-failures.rhaalovely.net//sparc64/2019-07-21/devel/liblouis.log http://build-failures.rhaalovely.net//sparc64/2019-07-21/devel/libspectrum.log http://build-failures.rhaalovely.net//sparc64/2019-07-21/devel/libvirt-glib.log http://build-failures.rhaalovely.net//sparc64/2019-07-21/devel/msgpack.log http://build-failures.rhaalovely.net//sparc64/2019-07-21/devel/openmpi.log http://build-failures.rhaalovely.net//sparc64/2019-07-21/devel/openocd.log http://build-failures.rhaalovely.net//sparc64/2019-07-21/devel/p5-Glib2.log http://build-failures.rhaalovely.net//sparc64/2019-07-21/devel/pangox-compat.log http://build-failures.rhaalovely.net//sparc64/2019-07-21/devel/py-backports-functools-lru-cache.log http://build-failures.rhaalovely.net//sparc64/2019-07-21/devel/py-cffi,python3.log http://build-failures.rhaalovely.net//sparc64/2019-07-21/devel/py-doit.log http://build-failures.rhaalovely.net//sparc64/2019-07-21/devel/py-enum34.log http://build-failures.rhaalovely.net//spar
[Update] sysutils/stow 2.2.2 --> 2.3.0
GNU Stow 2.3.0 was released on the 29th of June 2019.
Patch is attached.
Regards,
Andreas (port maintainer)
Release announcement:
https://lists.gnu.org/archive/html/info-stow/2019-06/msg0.html
Summary:
1. New features / changes in behaviour
.. 1. New --dotfiles option
.. 2. Shell-like expansion in .stowrc files
.. 3. chkstow now honours the $STOW_DIR environment variable
.. 4. Stow now has a non-zero exit code if option parsing failed
2. License upgraded from GPL version 2 to version 3
3. Documentation fixes and enhancements
.. 1. Remove dependency on unmaintained texi2html
.. 2. Fixed naming of man page
.. 3. Convert README and INSTALL to Markdown
.. 4. Update documentation to reflect more modern use cases
.. 5. Miscellaneous documentation fixes
4. Fixes for bugs, tests, and other technical debt
.. 1. Add Docker files for convenient testing across multiple Perl versions
.. 2. Set up continuous testing via Travis CI
.. 3. Add Coveralls integration with GitHub
.. 4. Miscellaneous improvements to the test suite
.. 5. Fix for test suite on Cygwin
.. 6. aclocal.m4 was updated using aclocal 1.15.1.
.. 7. Miscellaneous fixes to the build and distribution process
.. 8. Improve handling of directories with unusual names
Index: Makefile
===
RCS file: /cvs/ports/sysutils/stow/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- Makefile12 Jul 2019 20:49:52 - 1.14
+++ Makefile23 Jul 2019 19:46:51 -
@@ -2,21 +2,24 @@
COMMENT= manages software package installations with symlinks
-DISTNAME= stow-2.2.2
-REVISION= 0
+DISTNAME= stow-2.3.0
CATEGORIES=sysutils
HOMEPAGE= https://www.gnu.org/software/stow/stow.html
MAINTAINER=Andreas Kusalananda Kahari
-# GPLv2+
+# GPLv3+
PERMIT_PACKAGE=Yes
MASTER_SITES= ${MASTER_SITE_GNU:=stow/}
CONFIGURE_STYLE=gnu
USE_GMAKE=Yes
+
+RUN_DEPENDS= devel/p5-Clone \
+ devel/p5-Clone-Choose \
+ devel/p5-Hash-Merge
TEST_DEPENDS= devel/p5-IO-stringy \
devel/p5-Test-Output
Index: distinfo
===
RCS file: /cvs/ports/sysutils/stow/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo10 Nov 2015 09:13:50 - 1.6
+++ distinfo23 Jul 2019 19:46:51 -
@@ -1,2 +1,2 @@
-SHA256 (stow-2.2.2.tar.gz) = 4vd2STAbIVua28LwdFI77eutNmgSaQudyURXr1zyc98=
-SIZE (stow-2.2.2.tar.gz) = 579324
+SHA256 (stow-2.3.0.tar.gz) = BSTqoNRIXRv/t4tc31tvwT45REZmyi5RM29m3bPIGEE=
+SIZE (stow-2.3.0.tar.gz) = 652135
Index: pkg/PLIST
===
RCS file: /cvs/ports/sysutils/stow/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- pkg/PLIST 7 May 2015 11:27:59 - 1.4
+++ pkg/PLIST 23 Jul 2019 19:46:51 -
@@ -9,7 +9,8 @@ libdata/perl5/site_perl/Stow/Util.pm
share/doc/stow/
share/doc/stow/ChangeLog
share/doc/stow/ChangeLog.OLD
-share/doc/stow/README
+share/doc/stow/INSTALL.md
+share/doc/stow/README.md
share/doc/stow/manual-single.html
share/doc/stow/manual-split/
share/doc/stow/manual-split/Bootstrapping.html
Re: UPDATE: net/snort 2.9.14
On Tue, Jul 23, 2019 at 12:23:02PM -0400, Lawrence Teo wrote:
> On Mon, Jul 22, 2019 at 09:41:21PM -0600, Aaron Bieber wrote:
> > Fixes it for me! Need to also regen WANTLIB, then OK abiener@
>
> Great, thanks! Here is the updated diff with the regenerated WANTLIB.
>
> Markus, is this ok with you too?
Hi Lawrence, Hi Aaron,
I haven't got those undefined symbol messages here so far.
As the fix seems to fix those, I'm fine with it.
Thank you!
Regards
Markus
> > > On Jul 22, 2019, at 9:13 PM, Lawrence Teo wrote:
> > >
> > > ???On Sun, Jul 21, 2019 at 11:38:06PM -0600, Aaron Bieber wrote:
> > >>> On Fri, 19 Jul 2019 at 22:01:53 -0400, Lawrence Teo wrote:
> > >>> This updates Snort to 2.9.14.
> > >>>
> > >>> https://blog.snort.org/2019/07/snort-29140-has-been-released.html
> > >>>
> > >>> ok?
> > >>
> > >> Builds and runs fine here! When I start it with "-d" I see:
> > >>
> > >> snort:/usr/local/lib/libluajit-5.1.so.1.0: undefined symbol
> > >> '_Unwind_GetCFA'
> > >> snort:/usr/local/lib/libluajit-5.1.so.1.0: undefined symbol
> > >> '_Unwind_DeleteException'
> > >> snort:/usr/local/lib/libluajit-5.1.so.1.0: undefined symbol
> > >> '_Unwind_SetGR'
> > >> snort:/usr/local/lib/libluajit-5.1.so.1.0: undefined symbol
> > >> '_Unwind_SetIP'
> > >> snort:/usr/local/lib/libluajit-5.1.so.1.0: undefined symbol
> > >> '_Unwind_RaiseException'
> > >>
> > >> I think this might be a combo of the packages / snapshot I have. I will
> > >> update
> > >> and report back.
> > >>
> > >> If you aren't seeing the undefined symbols, OK abieber@
> > >
> > > Thanks for testing!
> > >
> > > It looks like those Unwind errors are due to libsf_appid_preproc.so
> > > which links against luajit, which in turn needs access to libunwind
> > > symbols.
> > >
> > > I found another port games/tome4 that had the same issue. In that port
> > > the issue was resolved by linking against libc++abi (in
> > > games/tome4/patches/lld-linking).
> > >
> > > Here's an updated diff that does the same thing for
> > > libsf_appid_preproc.so. I made it link against libc++abi in
> > > src/dynamic-preprocessors/appid/Makefile.in. I'm not certain that that
> > > is the right place to fix it, but it does resolve those errors for me.
> > >
> Index: Makefile
> ===
> RCS file: /cvs/ports/net/snort/Makefile,v
> retrieving revision 1.103
> diff -u -p -r1.103 Makefile
> --- Makefile 12 Jul 2019 20:48:49 - 1.103
> +++ Makefile 23 Jul 2019 13:50:47 -
> @@ -2,8 +2,8 @@
>
> COMMENT =highly flexible sniffer/NIDS
>
> -DISTNAME = snort-2.9.13
> -RULESV = 29130
> +DISTNAME = snort-2.9.14
> +RULESV = 29140
> SUBST_VARS = RULESV
>
> CATEGORIES = net security
> @@ -15,7 +15,8 @@ MAINTAINER =Markus Lude # GPLv2
> PERMIT_PACKAGE = Yes
>
> -WANTLIB =c crypto daq dnet luajit-5.1 lzma m nghttp2 pcap pcre
> pthread z
> +WANTLIB += c c++abi crypto daq dnet luajit-5.1 lzma m nghttp2
> +WANTLIB += pcap pcre pthread z
>
> MASTER_SITES = https://www.snort.org/downloads/snort/
>
> Index: distinfo
> ===
> RCS file: /cvs/ports/net/snort/distinfo,v
> retrieving revision 1.39
> diff -u -p -r1.39 distinfo
> --- distinfo 2 Jun 2019 02:07:44 - 1.39
> +++ distinfo 19 Jul 2019 20:17:52 -
> @@ -1,2 +1,2 @@
> -SHA256 (snort-2.9.13.tar.gz) = MURzk9FShrhIgQ3XirLLOtIx/NHxZj+VlYdpDu6nVBM=
> -SIZE (snort-2.9.13.tar.gz) = 6553425
> +SHA256 (snort-2.9.14.tar.gz) = wDBtuc5k9FzHxkya/HCr6WidqoYAIDRew7oJmSi3Rks=
> +SIZE (snort-2.9.14.tar.gz) = 6688482
> Index: patches/patch-src_dynamic-preprocessors_appid_Makefile_in
> ===
> RCS file:
> /cvs/ports/net/snort/patches/patch-src_dynamic-preprocessors_appid_Makefile_in,v
> retrieving revision 1.2
> diff -u -p -r1.2 patch-src_dynamic-preprocessors_appid_Makefile_in
> --- patches/patch-src_dynamic-preprocessors_appid_Makefile_in 2 Jun 2019
> 02:07:44 - 1.2
> +++ patches/patch-src_dynamic-preprocessors_appid_Makefile_in 23 Jul 2019
> 01:51:20 -
> @@ -1,14 +1,19 @@
> $OpenBSD: patch-src_dynamic-preprocessors_appid_Makefile_in,v 1.2 2019/06/02
> 02:07:44 lteo Exp $
> +
> +libsf_appid_preproc.so needs to link against libc++abi so that luajit can
> access
> +libunwind symbols.
>
> Index: src/dynamic-preprocessors/appid/Makefile.in
> --- src/dynamic-preprocessors/appid/Makefile.in.orig
> +++ src/dynamic-preprocessors/appid/Makefile.in
> -@@ -586,7 +586,7 @@ APPID_SOURCES = $(APPID_SRC_DIR)/commonAppMatcher.c \
> +@@ -586,8 +586,8 @@ APPID_SOURCES = $(APPID_SRC_DIR)/commonAppMatcher.c \
> $(APPID_SRC_DIR)/util/sfutil.c $(APPID_SRC_DIR)/util/sfutil.h
> dynamicpreprocessordir = ${libdir}/snort_dynamicpreprocessor
> dynamicpreprocessor_LTLIBRARIES = libsf_appid_preproc.la
> -libsf_appid
powerpc bulk build report
bulk build on macppc-1.ports.openbsd.org started on Sun Jul 14 07:28:39 MDT 2019 finished at Tue Jul 23 10:31:59 MDT 2019 lasted 09D20h03m done with kern.version=OpenBSD 6.5-current (GENERIC.MP) #552: Fri Jul 12 01:10:36 MDT 2019 built packages:9332 Jul 14:2395 Jul 15:1745 Jul 16:3022 Jul 17:312 Jul 18:293 Jul 19:293 Jul 20:316 Jul 21:482 Jul 22:385 Jul 23:88 critical path missing pkgs: http://build-failures.rhaalovely.net//powerpc/2019-07-14/summary.log ls: /usr/ports/logs/powerpc/locks: No such file or directory build failures: 0 grep: /usr/ports/logs/powerpc/locks/*: No such file or directory cp: failures/: No such file or directory find: failures: No such file or directory tar: Unable to access powerpc/failures: No such file or directory tar: WARNING! These file names were not selected: powerpc/failures
Re: UPDATE: net/snort 2.9.14
On Mon, Jul 22, 2019 at 09:41:21PM -0600, Aaron Bieber wrote:
> Fixes it for me! Need to also regen WANTLIB, then OK abiener@
Great, thanks! Here is the updated diff with the regenerated WANTLIB.
Markus, is this ok with you too?
> > On Jul 22, 2019, at 9:13 PM, Lawrence Teo wrote:
> >
> > ???On Sun, Jul 21, 2019 at 11:38:06PM -0600, Aaron Bieber wrote:
> >>> On Fri, 19 Jul 2019 at 22:01:53 -0400, Lawrence Teo wrote:
> >>> This updates Snort to 2.9.14.
> >>>
> >>> https://blog.snort.org/2019/07/snort-29140-has-been-released.html
> >>>
> >>> ok?
> >>
> >> Builds and runs fine here! When I start it with "-d" I see:
> >>
> >> snort:/usr/local/lib/libluajit-5.1.so.1.0: undefined symbol
> >> '_Unwind_GetCFA'
> >> snort:/usr/local/lib/libluajit-5.1.so.1.0: undefined symbol
> >> '_Unwind_DeleteException'
> >> snort:/usr/local/lib/libluajit-5.1.so.1.0: undefined symbol '_Unwind_SetGR'
> >> snort:/usr/local/lib/libluajit-5.1.so.1.0: undefined symbol '_Unwind_SetIP'
> >> snort:/usr/local/lib/libluajit-5.1.so.1.0: undefined symbol
> >> '_Unwind_RaiseException'
> >>
> >> I think this might be a combo of the packages / snapshot I have. I will
> >> update
> >> and report back.
> >>
> >> If you aren't seeing the undefined symbols, OK abieber@
> >
> > Thanks for testing!
> >
> > It looks like those Unwind errors are due to libsf_appid_preproc.so
> > which links against luajit, which in turn needs access to libunwind
> > symbols.
> >
> > I found another port games/tome4 that had the same issue. In that port
> > the issue was resolved by linking against libc++abi (in
> > games/tome4/patches/lld-linking).
> >
> > Here's an updated diff that does the same thing for
> > libsf_appid_preproc.so. I made it link against libc++abi in
> > src/dynamic-preprocessors/appid/Makefile.in. I'm not certain that that
> > is the right place to fix it, but it does resolve those errors for me.
> >
Index: Makefile
===
RCS file: /cvs/ports/net/snort/Makefile,v
retrieving revision 1.103
diff -u -p -r1.103 Makefile
--- Makefile12 Jul 2019 20:48:49 - 1.103
+++ Makefile23 Jul 2019 13:50:47 -
@@ -2,8 +2,8 @@
COMMENT = highly flexible sniffer/NIDS
-DISTNAME = snort-2.9.13
-RULESV = 29130
+DISTNAME = snort-2.9.14
+RULESV = 29140
SUBST_VARS = RULESV
CATEGORIES = net security
@@ -15,7 +15,8 @@ MAINTAINER = Markus Lude https://www.snort.org/downloads/snort/
Index: distinfo
===
RCS file: /cvs/ports/net/snort/distinfo,v
retrieving revision 1.39
diff -u -p -r1.39 distinfo
--- distinfo2 Jun 2019 02:07:44 - 1.39
+++ distinfo19 Jul 2019 20:17:52 -
@@ -1,2 +1,2 @@
-SHA256 (snort-2.9.13.tar.gz) = MURzk9FShrhIgQ3XirLLOtIx/NHxZj+VlYdpDu6nVBM=
-SIZE (snort-2.9.13.tar.gz) = 6553425
+SHA256 (snort-2.9.14.tar.gz) = wDBtuc5k9FzHxkya/HCr6WidqoYAIDRew7oJmSi3Rks=
+SIZE (snort-2.9.14.tar.gz) = 6688482
Index: patches/patch-src_dynamic-preprocessors_appid_Makefile_in
===
RCS file:
/cvs/ports/net/snort/patches/patch-src_dynamic-preprocessors_appid_Makefile_in,v
retrieving revision 1.2
diff -u -p -r1.2 patch-src_dynamic-preprocessors_appid_Makefile_in
--- patches/patch-src_dynamic-preprocessors_appid_Makefile_in 2 Jun 2019
02:07:44 - 1.2
+++ patches/patch-src_dynamic-preprocessors_appid_Makefile_in 23 Jul 2019
01:51:20 -
@@ -1,14 +1,19 @@
$OpenBSD: patch-src_dynamic-preprocessors_appid_Makefile_in,v 1.2 2019/06/02
02:07:44 lteo Exp $
+
+libsf_appid_preproc.so needs to link against libc++abi so that luajit can
access
+libunwind symbols.
Index: src/dynamic-preprocessors/appid/Makefile.in
--- src/dynamic-preprocessors/appid/Makefile.in.orig
+++ src/dynamic-preprocessors/appid/Makefile.in
-@@ -586,7 +586,7 @@ APPID_SOURCES = $(APPID_SRC_DIR)/commonAppMatcher.c \
+@@ -586,8 +586,8 @@ APPID_SOURCES = $(APPID_SRC_DIR)/commonAppMatcher.c \
$(APPID_SRC_DIR)/util/sfutil.c $(APPID_SRC_DIR)/util/sfutil.h
dynamicpreprocessordir = ${libdir}/snort_dynamicpreprocessor
dynamicpreprocessor_LTLIBRARIES = libsf_appid_preproc.la
-libsf_appid_preproc_la_LDFLAGS = -export-dynamic -module @XCCFLAGS@
+-@SO_WITH_STATIC_LIB_FALSE@libsf_appid_preproc_la_LIBADD = $(LUA_LIBS)
+libsf_appid_preproc_la_LDFLAGS = -export-dynamic -module -avoid-version
@XCCFLAGS@
- @SO_WITH_STATIC_LIB_FALSE@libsf_appid_preproc_la_LIBADD = $(LUA_LIBS)
++@SO_WITH_STATIC_LIB_FALSE@libsf_appid_preproc_la_LIBADD = $(LUA_LIBS) -lc++abi
@SO_WITH_STATIC_LIB_TRUE@libsf_appid_preproc_la_LIBADD =
../libsf_dynamic_preproc.la ../libsf_dynamic_utils.la $(LUA_LIBS)
@SO_WITH_STATIC_LIB_FALSE@nodist_libsf_appid_preproc_la_SOURCES = \
+ @SO_WITH_STATIC_LIB_FALSE@../include/sf_dynamic_preproc_lib.c \
Index: patches/patch-src_preprocessors_St
Re: lang/gcc fails on -current
On 2019/07/22 22:05, Christian Weisgerber wrote: > Mark Patruck: > > > lang/gcc always fails with the following error on amd64 -current (~6 hours > > old) > > > > > > Check for missing set procedures in body > > OK > > > > All tests completed successfully, no errors detected > > > > raised ADA.IO_EXCEPTIONS.USE_ERROR : sinfo.h: No such file or directory > > The problem is in libgnat and triggered by the recent change to > make realpath() POSIX-ly correct. > > In libgnat/s-fileio.adb, the System.File_IO Open function calls > full_name() on all pathnames, including when creating files that > don't exist yet. > > full_name() maps to __gnat_full_name(). > > In cstreams.c, __gnat_full_name() calls realpath(). > > Upstream doesn't notice because... > > /* Use realpath function which resolves links and references to . and .. > on those Unix systems that support it. Note that GNU/Linux provides it > but > cannot handle more than 5 symbolic links in a full name, so we use the > getcwd approach instead. */ > > ... Linux uses a different code path. > > The trivial patch below makes us use that same codepath. Unfortunately, > it also requires building a new adastrap (on a system without the > realpath change). > > With the new adastrap, gcc/8 will then build fine on -current. OK sthen@ to add this and bump REVISION-ada. I've copied out the i386 bootstrap to https://spacehopper.org/mirrors/adastrap-i386-8.3.0-0.tar.xz which is already in MASTER_SITES0. ADASTRAP_LIBC-i386 = 95.1 ADASTRAP_LIBM-i386 = 10.1 ADASTRAP-i386 = adastrap-i386-$V-0.tar.xz
Re: Prepare for gpsd-3.x
On Tue, July 23, 2019 09:26, Kirill Bychkov wrote:
> On Thu, June 20, 2019 10:08, Kirill Bychkov wrote:
>> Hi!
>> Long time ago I've started update of gpsd from 2.x to 3.x.
>> Upstream moved from auto crap to scons so it gave me some
>> headache.
>> Before switching to new gpsd we need to prepare some ports
>> which are linking against libgps because API has changed.
>> Here are the diffs for foxtrotgps, geoclue and qlandkaretegt.
>> (diff for geo/viking is still WIP):
>
> Hi!
> Diff for viking is attached. This update adds support for
> newer gpsd API.
> Successfuly buuilds on amd64, i386 and macppc. Works fine
> on amd64.
> OK?
>
>
>>
>> Index: patches/patch-src_gps_functions_c
>> ===
>> RCS file: patches/patch-src_gps_functions_c
>> diff -N patches/patch-src_gps_functions_c
>> --- /dev/null1 Jan 1970 00:00:00 -
>> +++ patches/patch-src_gps_functions_c14 Jun 2019 07:04:02 -
>> @@ -0,0 +1,20 @@
>> +$OpenBSD$
>> +
>> +Fix build with newer gpsd API.
>> +https://bazaar.launchpad.net/~foxtrotgps-team/foxtrotgps/trunk/revision/316
>> +
>> +Index: src/gps_functions.c
>> +--- src/gps_functions.c.orig
>> src/gps_functions.c
>> +@@ -738,7 +738,11 @@ cb_gpsd_data(GIOChannel *src, GIOCondition condition,
>> +if (!libgps_initialized)
>> +return FALSE;
>> +
>> ++#if GPSD_API_MAJOR_VERSION >= 7 /* API change. gpsd version 3.18 and
>> subsequent. */
>> ++ ret = gps_read(&libgps_gpsdata, NULL, 0);
>> ++#else
>> +ret = gps_read(&libgps_gpsdata);
>> ++#endif
>> +/* Note that gps_read() will never actually return 0
>> + (zero-length reads are converted internally to a -1 return,
>> +since they mean that the connection to the daemon has closed),
>>
>>
>>
>>
>> Index: patches/patch-providers_gpsd_geoclue-gpsd_c
>> ===
>> RCS file: patches/patch-providers_gpsd_geoclue-gpsd_c
>> diff -N patches/patch-providers_gpsd_geoclue-gpsd_c
>> --- /dev/null1 Jan 1970 00:00:00 -
>> +++ patches/patch-providers_gpsd_geoclue-gpsd_c 14 Jun 2019 07:11:23
>> -
>> @@ -0,0 +1,72 @@
>> +$OpenBSD$
>> +
>> +Fix build with newer gpsd API.
>> +
>> +--- providers/gpsd/geoclue-gpsd.c.orig Tue Jul 31 20:47:05 2012
>> providers/gpsd/geoclue-gpsd.c Sun Mar 27 12:35:47 2016
>> +@@ -40,7 +40,12 @@
>> + #include
>> + #include
>> +
>> ++#if GPSD_API_MAJOR_VERSION >= 5
>> ++/* gps_data conflicts with gps_data function */
>> ++typedef struct gps_data_t gps_data_l;
>> ++#else
>> + typedef struct gps_data_t gps_data;
>> ++#endif
>> + typedef struct gps_fix_t gps_fix;
>> +
>> + /* only listing used tags */
>> +@@ -59,7 +64,11 @@ typedef struct {
>> +char *host;
>> +char *port;
>> +
>> ++#if GPSD_API_MAJOR_VERSION >= 5
>> ++ gps_data_l *gpsdata;
>> ++#else
>> +gps_data *gpsdata;
>> ++#endif
>> +
>> +gps_fix *last_fix;
>> +
>> +@@ -397,10 +406,16 @@ geoclue_gpsd_stop_gpsd (GeoclueGpsd *self)
>> + static gboolean
>> + geoclue_gpsd_start_gpsd (GeoclueGpsd *self)
>> + {
>> ++#if GPSD_API_MAJOR_VERSION >= 5
>> ++ int status = gps_open (self->host, self->port, self->gpsdata);
>> ++ if (status == 0) {
>> ++ gps_stream(self->gpsdata, WATCH_ENABLE | WATCH_NMEA, NULL);
>> ++#else
>> +self->gpsdata = gps_open (self->host, self->port);
>> +if (self->gpsdata) {
>> +gps_stream(self->gpsdata, WATCH_ENABLE | WATCH_NMEA |
>> POLL_NONBLOCK,
>> NULL);
>> +gps_set_raw_hook (self->gpsdata, gpsd_raw_hook);
>> ++#endif
>> +return TRUE;
>> +} else {
>> +g_warning ("gps_open() failed, is gpsd running
>> (host=%s,port=%s)?",
>> self->host, self->port);
>> +@@ -413,10 +428,23 @@ gpsd_poll(gpointer data)
>> + {
>> +GeoclueGpsd *self = (GeoclueGpsd*)data;
>> +if (self->gpsdata) {
>> ++#if GPSD_API_MAJOR_VERSION >= 5
>> ++ /* gps_poll and gps_set_raw_hook no longer present in this API
>> version
>> */
>> ++ if (gps_waiting(self->gpsdata, 500)) {
>> ++ if (gps_read(self->gpsdata) == -1) {
>> ++ geoclue_gpsd_set_status (self,
>> GEOCLUE_STATUS_ERROR);
>> ++ geoclue_gpsd_stop_gpsd(self);
>> ++ return FALSE;
>> ++ } else {
>> ++ /* Call existing raw_hook to process the data */
>> ++ gpsd_raw_hook(self->gpsdata, NULL, 0);
>> ++ }
>> ++#else
>> +if (gps_poll(self->gpsdata) < 0) {
>> +geoclue_gpsd_set_status (self, GEOCLUE_STATUS_ERROR);
>> +geoclue_gpsd_stop_gpsd(self);
>> +return FALSE;
>> ++#endif
>> +}
>> +}
>> +return TRUE;
>>
>>
>> __
>>
>> Index: patches/patch-src_CDeviceGPSD_cpp
