Re: New port: arx-libertatis

[Jonathan Gray]

On Sat, Mar 03, 2018 at 08:06:46PM -0800, Thomas Frohwein wrote:
> On Sun, Mar 04, 2018 at 02:10:53PM +1100, Jonathan Gray wrote:
> > This doesn't build here
> > 
> > Create /usr/ports/packages/amd64/all/ArxLibertatis-1.1.2-r1.tgz
> > Creating package ArxLibertatis-1.1.2-r1
> > checksumming|***  | 
> > 57%
> > Error: 
> > /usr/ports/pobj/ArxLibertatis-1.1.2-r1/fake-amd64/usr/local/%D/bin/update-desktop-database
> >  does not exist
> > Error: 
> > /usr/ports/pobj/ArxLibertatis-1.1.2-r1/fake-amd64/usr/local/%D/bin/update-desktop-database
> >  does not exist
> > Error: duplicate item in packing-list 
> > /usr/local/%D/bin/update-desktop-database
> > Fatal error: can't continue
> 
> My bad, I misinterpreted a portcheck message. After updating PLIST this is 
> gone
> on my testing and builds fine again.

Builds here.  Though I suspect the package name 'ArxLibertatis' should
match the port directory name 'arx-libertatis'.

The package should also not include a hyphen in the version string as
that will confuse the package tools when doing comparisons.

1.1.2-r1 may map to 1.1.2pl1 (1.1.2 patch level 1) if I read
packages-specs(7) correctly as there was a 1.1.2 release prior to r1.

> 
> > The README would be better linking to
> > http://wiki.arx-libertatis.org/Getting_the_game_data
> > as that also covers getting the data from steam and the demo.
> 
> Actually this page here got more detailed and pertinent instructions IMO:
> 
> http://wiki.arx-libertatis.org/Installing_the_game_data_under_Linux
> 
> I linked to it in the README. Turns out that data can be either in datadir or
> the userdir (see bottom of the linked webpage) per ustream instructions. 
> README
> now mentions both alternatives.
> 
> Is there a preferred location for read-only game data? I know that some of the
> games in our ports put their data in ~/.local/share, like openjk, openxcom...

$PREFIX/share/game/ is what I'd expect.  At least with quake games
they tend to look in multiple places ~/ first then a shared directory.

> 
> > 
> > Could you explain why you are using ~/.local/share/arx/datadir ?
> > Shouldn't this rather be $PREFIX/share/arx/datadir
> > 
> > http://wiki.arx-libertatis.org/Data_directories
> > states that the datadir is read-only and gives defaults outside
> > of home directories.
> 
> see above
> 
> Updated tarball attached.

The manual page is not installed into the right place.

$ man arx
man: No entry for arx in the manual.

The arx-install-data script the installing under linux page references
isn't installed into $PREFIX/bin not sure if that is desirable.
Same with arxsavetool/arxunpak.

Re: New port: arx-libertatis

[Thomas Frohwein]

On Sun, Mar 04, 2018 at 02:10:53PM +1100, Jonathan Gray wrote:
> This doesn't build here
> 
> Create /usr/ports/packages/amd64/all/ArxLibertatis-1.1.2-r1.tgz
> Creating package ArxLibertatis-1.1.2-r1
> checksumming|***  | 
> 57%
> Error: 
> /usr/ports/pobj/ArxLibertatis-1.1.2-r1/fake-amd64/usr/local/%D/bin/update-desktop-database
>  does not exist
> Error: 
> /usr/ports/pobj/ArxLibertatis-1.1.2-r1/fake-amd64/usr/local/%D/bin/update-desktop-database
>  does not exist
> Error: duplicate item in packing-list 
> /usr/local/%D/bin/update-desktop-database
> Fatal error: can't continue

My bad, I misinterpreted a portcheck message. After updating PLIST this is gone
on my testing and builds fine again.

> The README would be better linking to
> http://wiki.arx-libertatis.org/Getting_the_game_data
> as that also covers getting the data from steam and the demo.

Actually this page here got more detailed and pertinent instructions IMO:

http://wiki.arx-libertatis.org/Installing_the_game_data_under_Linux

I linked to it in the README. Turns out that data can be either in datadir or
the userdir (see bottom of the linked webpage) per ustream instructions. README
now mentions both alternatives.

Is there a preferred location for read-only game data? I know that some of the
games in our ports put their data in ~/.local/share, like openjk, openxcom...

> 
> Could you explain why you are using ~/.local/share/arx/datadir ?
> Shouldn't this rather be $PREFIX/share/arx/datadir
> 
> http://wiki.arx-libertatis.org/Data_directories
> states that the datadir is read-only and gives defaults outside
> of home directories.

see above

Updated tarball attached.


arx-libertatis.tgz
Description: Binary data

Re: update: games/urbanterror and games/urbanterror-data

[Ryan Freeman]

On Sat, Mar 03, 2018 at 09:22:26AM +, Stuart Henderson wrote:
> This is not an uploaded release tarball, it's auto-generated so
> please keep GH_*.
> 
> Like Makefile.template says, look at the file url -
> 
> /archive/ -> GH_*
> /releases/ -> MASTER_SITES etc
> 
> -- 
>  Sent from a phone, apologies for poor formatting.

Here is a patch that undoes that change, thanks for catching that.


Index: urbanterror/Makefile
===
RCS file: /cvs/ports/games/urbanterror/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- urbanterror/Makefile26 Feb 2018 08:54:59 -  1.5
+++ urbanterror/Makefile4 Mar 2018 03:55:32 -
@@ -3,11 +3,11 @@
 ONLY_FOR_ARCHS = amd64 i386
 
 COMMENT =  fast-paced hollywood-tactical shooter: "fun over realism"
-DISTNAME = urbanterror-4.3.2pl1
+DISTNAME = urbanterror-4.3.3
 
 GH_ACCOUNT =   Barbatos
 GH_PROJECT =   ioq3-for-UrbanTerror-4
-GH_TAGNAME =   release-4.3.2-hotfix
+GH_TAGNAME =   release-4.3.3
 
 CATEGORIES =   games x11
 
Index: urbanterror/distinfo
===
RCS file: /cvs/ports/games/urbanterror/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- urbanterror/distinfo26 Feb 2018 08:54:59 -  1.4
+++ urbanterror/distinfo4 Mar 2018 03:55:32 -
@@ -1,2 +1,2 @@
-SHA256 (urbanterror-4.3.2pl1.tar.gz) = 
kyvOLKLR+uSd9mLoUQmf1kmNV8VuDE+dXMOg+NtAhNI=
-SIZE (urbanterror-4.3.2pl1.tar.gz) = 3326324
+SHA256 (urbanterror-4.3.3.tar.gz) = 
uQvKfqksCyfUzjvArkTlPEu1jaJsgHXSOUYxeSPEa2A=
+SIZE (urbanterror-4.3.3.tar.gz) = 3325609
Index: urbanterror-data/Makefile
===
RCS file: /cvs/ports/games/urbanterror-data/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- urbanterror-data/Makefile   9 Feb 2017 11:19:47 -   1.5
+++ urbanterror-data/Makefile   4 Mar 2018 03:55:32 -
@@ -3,11 +3,11 @@
 ONLY_FOR_ARCHS = amd64 i386
 
 COMMENT =  Urban Terror game data
-PKGNAME =  urbanterror-data-4.3.2
+PKGNAME =  urbanterror-data-4.3.3
 CATEGORIES =   games
 
 URT_VER =  43
-URT_REV =  2
+URT_REV =  3
 
 DISTNAME = UrbanTerror${URT_VER}${URT_REV}_full
 
Index: urbanterror-data/distinfo
===
RCS file: /cvs/ports/games/urbanterror-data/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- urbanterror-data/distinfo   7 Feb 2017 06:12:27 -   1.3
+++ urbanterror-data/distinfo   4 Mar 2018 03:55:32 -
@@ -1,2 +1,2 @@
-SHA256 (UrbanTerror432_full.zip) = dN7hVm+mzQ6ybYZhSaG2rX6PGKZTaT8CeQwF73zjUqQ=
-SIZE (UrbanTerror432_full.zip) = 1469432087
+SHA256 (UrbanTerror433_full.zip) = w1gnGSckr8qqB9e9t08X4G5LhlNGZy7aKwBxez0CMGc=
+SIZE (UrbanTerror433_full.zip) = 1472028382

Re: New port: arx-libertatis

[Jonathan Gray]

On Sat, Mar 03, 2018 at 05:26:33PM -0800, Thomas Frohwein wrote:
> Hi,
> 
> Attached is a port of Arx Libertatis, an open source port of the engine for 
> the
> first-person role-playing game Arx Fatalis by Arkane Studios.
> 
> >From Wikipedia:
> 
> Arx Fatalis (Latin for "fatal fortress") is set on a world whose sun has 
> failed,
> forcing the above-ground creatures to take refuge in subterranean caverns. The
> action in Arx Fatalis takes place in one of these large caves, where 
> inhabitants
> from all races such as Trolls, Goblins, Dwarves, Humans, etc. have made their
> homes on various levels of the cave. The player awakens inside a prison cell
> and, after making his escape, eventually discovers his mission is to subvert 
> and
> imprison the God of Destruction, Akbaa, who is trying to manifest itself in 
> Arx.
> 
> Some comments on the port:
> 
> - compilation with proper data/user/config dirs is flawed and never worked in
>   any acceptable way, which is why the port now has a wrapper script that
>   passes them as command line arguments
> - portcheck and make port-lib-depends pass
> - runs with the gog.com version after fixing the case of some filenames.
> - Instructions where to put game files and adjust case are in README
> - advice and fixes from bcallah@

This doesn't build here

Create /usr/ports/packages/amd64/all/ArxLibertatis-1.1.2-r1.tgz
Creating package ArxLibertatis-1.1.2-r1
checksumming|***  | 57%
Error: 
/usr/ports/pobj/ArxLibertatis-1.1.2-r1/fake-amd64/usr/local/%D/bin/update-desktop-database
 does not exist
Error: 
/usr/ports/pobj/ArxLibertatis-1.1.2-r1/fake-amd64/usr/local/%D/bin/update-desktop-database
 does not exist
Error: duplicate item in packing-list /usr/local/%D/bin/update-desktop-database
Fatal error: can't continue

The README would be better linking to
http://wiki.arx-libertatis.org/Getting_the_game_data
as that also covers getting the data from steam and the demo.

Could you explain why you are using ~/.local/share/arx/datadir ?
Shouldn't this rather be $PREFIX/share/arx/datadir

http://wiki.arx-libertatis.org/Data_directories
states that the datadir is read-only and gives defaults outside
of home directories.

Re: Porters, please read re GitHub auto-generated tarballs vs releases

[trondd]

Stuart Henderson  wrote:

> Many ports are using github's on-the-fly generated source-code tarballs
> via the GH_ variables in Makefiles.
> 
> ...
>
> www/liferea

Below is the update for www/liferea to use the release source tarball.

Tim.


Index: Makefile
===
RCS file: /cvs/ports/www/liferea/Makefile,v
retrieving revision 1.98
diff -u -p -r1.98 Makefile
--- Makefile30 Dec 2017 09:21:49 -  1.98
+++ Makefile4 Mar 2018 01:43:30 -
@@ -4,9 +4,9 @@ BROKEN-i386=hangs during build while r
 
 COMMENT=   simple GTK desktop news aggregator
 
-GH_ACCOUNT=lwindolf
-GH_PROJECT=liferea
-GH_TAGNAME=v1.12.1
+V= 1.12.1
+DISTNAME=  liferea-${V}
+REVISION=  0
 
 CATEGORIES=www news x11
 
@@ -32,6 +32,10 @@ WANTLIB += secret-1 soup-2.4 sqlite3 tas
 WANTLIB += xcb xcb-dri2 xcb-glx xcb-render xcb-shm xcb-xfixes
 WANTLIB += xml2 xslt z
 
+MASTER_SITES=  
https://github.com/lwindolf/liferea/releases/download/v${V}/
+
+EXTRACT_SUFX=  .tar.bz2
+
 MODULES=   devel/dconf \
lang/python \
textproc/intltool
@@ -63,12 +67,6 @@ AUTOMAKE_VERSION=1.15
 BUILD_DEPENDS +=   ${MODGNU_AUTOCONF_DEPENDS} \
${MODGNU_AUTOMAKE_DEPENDS} \
devel/libtool
-
-pre-configure:
-   cd ${WRKSRC} && \
-   AUTOCONF_VERSION=${AUTOCONF_VERSION} \
-   AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \
-   NOCONFIGURE=1 ./autogen.sh
 
 post-install:
rm ${PREFIX}/lib/liferea/web-extension/*.{a,la}
Index: distinfo
===
RCS file: /cvs/ports/www/liferea/distinfo,v
retrieving revision 1.42
diff -u -p -r1.42 distinfo
--- distinfo30 Dec 2017 09:21:49 -  1.42
+++ distinfo4 Mar 2018 01:43:30 -
@@ -1,2 +1,2 @@
-SHA256 (liferea-1.12.1.tar.gz) = zQ1/gpzjRc2WT52mnlUGFmYMGJCCu+nvnZ2ifVzE3lg=
-SIZE (liferea-1.12.1.tar.gz) = 1529678
+SHA256 (liferea-1.12.1.tar.bz2) = uO1bx+7bOFhyWoTKxb88WsE7DFNtI1UJa94y2UUfHZM=
+SIZE (liferea-1.12.1.tar.bz2) = 1490079

New port: arx-libertatis

[Thomas Frohwein]

Hi,

Attached is a port of Arx Libertatis, an open source port of the engine for the
first-person role-playing game Arx Fatalis by Arkane Studios.

>From Wikipedia:

Arx Fatalis (Latin for "fatal fortress") is set on a world whose sun has failed,
forcing the above-ground creatures to take refuge in subterranean caverns. The
action in Arx Fatalis takes place in one of these large caves, where inhabitants
from all races such as Trolls, Goblins, Dwarves, Humans, etc. have made their
homes on various levels of the cave. The player awakens inside a prison cell
and, after making his escape, eventually discovers his mission is to subvert and
imprison the God of Destruction, Akbaa, who is trying to manifest itself in Arx.

Some comments on the port:

- compilation with proper data/user/config dirs is flawed and never worked in
  any acceptable way, which is why the port now has a wrapper script that
  passes them as command line arguments
- portcheck and make port-lib-depends pass
- runs with the gog.com version after fixing the case of some filenames.
- Instructions where to put game files and adjust case are in README
- advice and fixes from bcallah@


arx-libertatis.tgz
Description: Binary data

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2018/03/03 18:07:51

Modified files:
mail/mutt  : Makefile distinfo 
mail/mutt/pkg  : PLIST 

Log message:
update to mutt-1.9.4

CVS: cvs.openbsd.org: ports

[Bjorn Ketelaars]

CVSROOT:/cvs
Module name:ports
Changes by: b...@cvs.openbsd.org2018/03/03 15:11:38

Modified files:
net/ocserv : Makefile distinfo 

Log message:
Update to ocserv-0.11.11.

OK sthen@

Re: [update] openvpn-2.4.5

[Jiri B]

On Sat, Mar 03, 2018 at 03:21:15PM +0100, Jeremie Courreges-Anglas wrote:
> 
> See changelog at
> 
>   https://community.openvpn.net/openvpn/wiki/ChangesInOpenvpn24
> 
> If anyone wants to give it a try.  The src/openvpn/openssl_compat.h diff
> is being worked on.

I can still connect (client) to work. Thank you.

Jiri

Re: UPDATE: burp -> 2.0/2.0.54, stable (2.1.28)

[Jiri B]

On Fri, Mar 02, 2018 at 08:47:01PM +, Stuart Henderson wrote:
> On 2018/02/28 17:32, Jiri B wrote:
> > OK, new diff and tarball attached.
> 
> I've cleaned it up a bit. Does it still work for you?

Yes, it does work. Some comments below.

Our pkg* tools don't have a method to upgrade between various
branches? I tried to upgrade from 2.0.54 to 2.1.28 and it seems
our pkg* tools can't do it - thus I did pkg_delete and pkg_add.

While uninstalling 2.0.54 and installing 2.1.28 it revealed
a little change in configuration, 2.1.28 has 'monitor_exe'
option added (so we don't need to keep Landry's patch for this).
But when doing such "upgrade" this little change is not visible.
How to solve this? A 'MESSAGE' or something else?

Thank you for help. It's OK for me.

Jiri

UPDATE net/ocserv

[Björn Ketelaars]

ocserv received an update to 0.11.11, which fixes some bugs. Changelog
can be found at http://ocserv.gitlab.io/www/changelog.html

A couple of tests failed because they tried running ocserv, which was
being built in ${WRKDIR}/build-${MACHINE_ARCH}${_FLAVOR_EXT2}. Issue has
been fixed by removing SEPARATE_BUILD=yes.
CONFIGURE_ARGS gained --without-docker-tests to prevent running tests
that rely on docker.

While here change HOMEPAGE.

Tested by updating an existing setup, and connecting to it with
openconnect.

OK?


Index: Makefile
===
RCS file: /cvs/ports/net/ocserv/Makefile,v
retrieving revision 1.28
diff -u -p -r1.28 Makefile
--- Makefile30 Jan 2018 00:53:52 -  1.28
+++ Makefile3 Mar 2018 19:10:06 -
@@ -2,13 +2,12 @@
 
 COMMENT=   server implementing the AnyConnect SSL VPN protocol
 
-DISTNAME=  ocserv-0.11.10
-REVISION=  0
+DISTNAME=  ocserv-0.11.11
 EXTRACT_SUFX=  .tar.xz
 
 CATEGORIES=net
 
-HOMEPAGE=  http://www.infradead.org/ocserv/
+HOMEPAGE=  https://ocserv.gitlab.io/www/
 
 MAINTAINER=Bjorn Ketelaars 
 
@@ -33,10 +32,10 @@ TEST_DEPENDS=   net/openconnect \
shells/bash \
sysutils/coreutils
 
-SEPARATE_BUILD=Yes
 USE_GMAKE= Yes
 CONFIGURE_STYLE=   autoconf
 CONFIGURE_ARGS=--enable-local-libopts \
+   --without-docker-tests \
--without-http-parser \
--without-pcl-lib
 
Index: distinfo
===
RCS file: /cvs/ports/net/ocserv/distinfo,v
retrieving revision 1.20
diff -u -p -r1.20 distinfo
--- distinfo12 Jan 2018 22:28:51 -  1.20
+++ distinfo3 Mar 2018 19:10:06 -
@@ -1,2 +1,2 @@
-SHA256 (ocserv-0.11.10.tar.xz) = Usgh3NI0qPDWH0QM48gNCyMFHX+9dMbUfcK4hK4llmo=
-SIZE (ocserv-0.11.10.tar.xz) = 784420
+SHA256 (ocserv-0.11.11.tar.xz) = TXtmPxDYQLbfwhbhPyh978KBlTlPqfgPrVeBhhBfq/g=
+SIZE (ocserv-0.11.11.tar.xz) = 785972

rm devel/hgview?

[Juan Francisco Cantero Hurtado]

If there is not objections in the next days, I will remove the hgview
port. Upstream has not released a new version for years and the code will
be broken with almost every new mercurial release. tortoisehg is a well
maintained alternative and works with mercurial 4.5.



-- 
Juan Francisco Cantero Hurtado http://juanfra.info

[update] openvpn-2.4.5

[Jeremie Courreges-Anglas]

See changelog at

  https://community.openvpn.net/openvpn/wiki/ChangesInOpenvpn24

If anyone wants to give it a try.  The src/openvpn/openssl_compat.h diff
is being worked on.


Index: Makefile
===
RCS file: /d/cvs/ports/net/openvpn/Makefile,v
retrieving revision 1.86
diff -u -p -r1.86 Makefile
--- Makefile26 Oct 2017 08:22:36 -  1.86
+++ Makefile3 Mar 2018 00:34:18 -
@@ -2,8 +2,7 @@
 
 COMMENT=   easy-to-use, robust, and highly configurable VPN
 
-DISTNAME=  openvpn-2.4.4
-REVISION=  0
+DISTNAME=  openvpn-2.4.5
 CATEGORIES=net security
 
 HOMEPAGE=  https://openvpn.net/index.php/open-source/
Index: distinfo
===
RCS file: /d/cvs/ports/net/openvpn/distinfo,v
retrieving revision 1.39
diff -u -p -r1.39 distinfo
--- distinfo29 Sep 2017 16:36:23 -  1.39
+++ distinfo3 Mar 2018 00:34:18 -
@@ -1,2 +1,2 @@
-SHA256 (openvpn-2.4.4.tar.gz) = GuiD2VIsn6bRieXkqqBYqT7dPQuJfjwmZBB8R4UJn8M=
-SIZE (openvpn-2.4.4.tar.gz) = 1390194
+SHA256 (openvpn-2.4.5.tar.gz) = sVgv9+u7ZxlgSKVokRhWRwFErNQg3oJnAUjL/6oPvzM=
+SIZE (openvpn-2.4.5.tar.gz) = 1430930
Index: patches/patch-configure
===
RCS file: /d/cvs/ports/net/openvpn/patches/patch-configure,v
retrieving revision 1.18
diff -u -p -r1.18 patch-configure
--- patches/patch-configure 29 Sep 2017 16:36:23 -  1.18
+++ patches/patch-configure 3 Mar 2018 00:34:18 -
@@ -2,7 +2,7 @@ $OpenBSD: patch-configure,v 1.18 2017/09
 Index: configure
 --- configure.orig
 +++ configure
-@@ -17409,7 +17409,7 @@ else
+@@ -18057,7 +18057,7 @@ else
  fi
  
  
Index: patches/patch-include_Makefile_in
===
RCS file: /d/cvs/ports/net/openvpn/patches/patch-include_Makefile_in,v
retrieving revision 1.8
diff -u -p -r1.8 patch-include_Makefile_in
--- patches/patch-include_Makefile_in   28 Mar 2017 22:16:37 -  1.8
+++ patches/patch-include_Makefile_in   3 Mar 2018 00:34:18 -
@@ -1,7 +1,8 @@
 $OpenBSD: patch-include_Makefile_in,v 1.8 2017/03/28 22:16:37 jca Exp $
 include/Makefile.in.orig   Wed Mar 22 16:34:37 2017
-+++ include/Makefile.inMon Mar 27 06:01:57 2017
-@@ -325,7 +325,7 @@ host_cpu = @host_cpu@
+Index: include/Makefile.in
+--- include/Makefile.in.orig
 include/Makefile.in
+@@ -337,7 +337,7 @@ host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
  htmldir = @htmldir@
Index: patches/patch-src_openvpn_error_c
===
RCS file: /d/cvs/ports/net/openvpn/patches/patch-src_openvpn_error_c,v
retrieving revision 1.3
diff -u -p -r1.3 patch-src_openvpn_error_c
--- patches/patch-src_openvpn_error_c   5 Nov 2017 01:09:28 -   1.3
+++ patches/patch-src_openvpn_error_c   3 Mar 2018 00:34:18 -
@@ -1,20 +0,0 @@
-$OpenBSD: patch-src_openvpn_error_c,v 1.3 2017/11/05 01:09:28 jca Exp $
-
-Correctly print time_t.
-
-  
https://github.com/OpenVPN/openvpn/commit/4ac769fb848619dcb39589af29302d8c2d698258
-
-Index: src/openvpn/error.c
 src/openvpn/error.c.orig
-+++ src/openvpn/error.c
-@@ -342,8 +342,8 @@ x_msg_va(const unsigned int flags, const char *format,
- struct timeval tv;
- gettimeofday(, NULL);
- 
--fprintf(fp, "%lu.%06lu %x %s%s%s%s",
--tv.tv_sec,
-+fprintf(fp, "%lld.%06lu %x %s%s%s%s",
-+(long long)tv.tv_sec,
- (unsigned long)tv.tv_usec,
- flags,
- prefix,
Index: patches/patch-src_openvpn_openssl_compat_h
===
RCS file: patches/patch-src_openvpn_openssl_compat_h
diff -N patches/patch-src_openvpn_openssl_compat_h
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-src_openvpn_openssl_compat_h  3 Mar 2018 00:34:18 -
@@ -0,0 +1,58 @@
+$OpenBSD$
+
+Index: src/openvpn/openssl_compat.h
+--- src/openvpn/openssl_compat.h.orig
 src/openvpn/openssl_compat.h
+@@ -661,7 +661,7 @@ EC_GROUP_order_bits(const EC_GROUP *group)
+ #define RSA_F_RSA_OSSL_PRIVATE_ENCRYPT   RSA_F_RSA_EAY_PRIVATE_ENCRYPT
+ #endif
+ 
+-#ifndef SSL_CTX_get_min_proto_version
++#ifndef SSL_CTRL_GET_MAX_PROTO_VERSION
+ /** Return the min SSL protocol version currently enabled in the context.
+  *  If no valid version >= TLS1.0 is found, return 0. */
+ static inline int
+@@ -682,9 +682,9 @@ SSL_CTX_get_min_proto_version(SSL_CTX *ctx)
+ }
+ return 0;
+ }
+-#endif /* SSL_CTX_get_min_proto_version */
++#endif /*  SSL_CTRL_GET_MAX_PROTO_VERSION */
+ 
+-#ifndef SSL_CTX_get_max_proto_version
++#ifndef SSL_CTRL_GET_MAX_PROTO_VERSION
+ /** Return the max SSL protocol version currently enabled in the context.
+  *  If no valid version >= TLS1.0 

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2018/03/03 06:39:18

Modified files:
misc/memcached : Makefile distinfo 
misc/memcached/patches: patch-configure patch-memcached_c 
misc/memcached/pkg: PLIST README memcached.rc 

Log message:
Update to memcached-1.5.6. Upstream now stops listening to UDP by default so
remove the extra bit from the rc.d script and tweak pkg-readme. Also listen
to IPv6 localhost suggested by jca. ok giovanni@

CVS: cvs.openbsd.org: ports

[Peter Hessler]

CVSROOT:/cvs
Module name:ports
Changes by: phess...@cvs.openbsd.org2018/03/03 05:34:01

Added files:
devel/py-pyinotify/patches: patch-common_inotify_syscalls_c 

Log message:
add patch to fix build on aarch64

Re: [UPDATE] sysutils/sleuthkit

[nigel]

On 03/03/18 08:25, Remi Pointel wrote:
> ping
> 
> On 02/26/18 15:14, Remi Pointel wrote:
>> Hi,
>>
>> this is the diff to update sleuthkit to latest release.
>>
>> Ok?
>>
>> Cheers,
>>
>> Remi.
> 
> 
Been a little occupied with other things. Builds fine on amd64 can't do
much to test.

Ok with me.

[wip] grafana 5

[Landry Breuil]

Hi,

grafana 5 was recently released, cf
https://grafana.com/blog/2018/03/01/grafana-v5.0-released/ &
https://github.com/grafana/grafana/blob/master/CHANGELOG.md - here's the
port update, i havent been further than building & packaging it. If you
use grafana, please give this a try at runtime.

Landry
Index: Makefile
===
RCS file: /cvs/ports/sysutils/grafana/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- Makefile11 Jan 2018 19:27:10 -  1.2
+++ Makefile3 Mar 2018 09:45:16 -
@@ -4,8 +4,7 @@
 
 GH_ACCOUNT =   grafana
 GH_PROJECT =   grafana
-GH_TAGNAME =   v4.6.3
-REVISION = 0
+GH_TAGNAME =   v5.0.0
 
 CATEGORIES =   sysutils
 
Index: distinfo
===
RCS file: /cvs/ports/sysutils/grafana/distinfo,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 distinfo
--- distinfo4 Jan 2018 20:46:00 -   1.1.1.1
+++ distinfo3 Mar 2018 09:45:16 -
@@ -1,4 +1,4 @@
-SHA256 (grafana-4.6.3.linux-x64.tar.gz) = 
A3z3Z4hYxKWzYy3nvqTCBHXggf9IwnyGi+ceewoHxQU=
-SHA256 (grafana-4.6.3.tar.gz) = dZWdHNj2bTYrO7iFSB3Od2k0F/UcLoGrCR49FmUPGmk=
-SIZE (grafana-4.6.3.linux-x64.tar.gz) = 47187988
-SIZE (grafana-4.6.3.tar.gz) = 7604595
+SHA256 (grafana-5.0.0.linux-x64.tar.gz) = 
DdJQwCzXRc2NB84mUtyQGZPFueSIGKWvDQ8wppcvVNg=
+SHA256 (grafana-5.0.0.tar.gz) = /gbu7y0VwBmud3xqJ8azkqPM37DWPerWflD2/y40+IE=
+SIZE (grafana-5.0.0.linux-x64.tar.gz) = 51530668
+SIZE (grafana-5.0.0.tar.gz) = 9725517
Index: patches/patch-conf_sample_ini
===
RCS file: /cvs/ports/sysutils/grafana/patches/patch-conf_sample_ini,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-conf_sample_ini
--- patches/patch-conf_sample_ini   4 Jan 2018 20:46:00 -   1.1.1.1
+++ patches/patch-conf_sample_ini   3 Mar 2018 09:45:16 -
@@ -3,21 +3,19 @@
 Index: conf/sample.ini
 --- conf/sample.ini.orig
 +++ conf/sample.ini
-@@ -13,7 +13,7 @@
+@@ -12,13 +12,13 @@
+  Paths 

  [paths]
  # Path to where grafana can store temp files, sessions, and the sqlite3 db 
(if that is used)
- #
 -;data = /var/lib/grafana
 +data = /var/grafana
- #
+ 
  # Directory where grafana can store logs
- #
-@@ -21,7 +21,7 @@
- #
+ ;logs = /var/log/grafana
+ 
  # Directory where grafana will automatically scan and look for plugins
- #
 -;plugins = /var/lib/grafana/plugins
 +plugins = /var/grafana/plugins
  
- #
-  Server 

+ # folder that contains provisioning config files that grafana will apply on 
startup and while running.
+ ; provisioning = conf/provisioning
Index: pkg/PLIST
===
RCS file: /cvs/ports/sysutils/grafana/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 PLIST
--- pkg/PLIST   4 Jan 2018 20:46:00 -   1.1.1.1
+++ pkg/PLIST   3 Mar 2018 09:45:16 -
@@ -3,8 +3,6 @@
 @newuser _grafana:798:798:daemon:Grafana Daemon:/var/empty:/sbin/nologin
 @bin bin/grafana-cli
 @bin bin/grafana-server
-share/grafana/
-share/grafana/conf/
 share/examples/grafana/
 @sample ${SYSCONFDIR}/grafana/
 share/examples/grafana/defaults.ini
@@ -13,13 +11,84 @@
 @sample ${SYSCONFDIR}/grafana/ldap.toml
 share/examples/grafana/sample.ini
 @sample ${SYSCONFDIR}/grafana/config.ini
+share/grafana/
+share/grafana/conf/
 share/grafana/public/
 share/grafana/public/app/
 share/grafana/public/app/app.ts
+share/grafana/public/app/containers/
+share/grafana/public/app/containers/AlertRuleList/
+share/grafana/public/app/containers/AlertRuleList/AlertRuleList.jest.tsx
+share/grafana/public/app/containers/AlertRuleList/AlertRuleList.tsx
+share/grafana/public/app/containers/AlertRuleList/__snapshots__/
+share/grafana/public/app/containers/AlertRuleList/__snapshots__/AlertRuleList.jest.tsx.snap
+share/grafana/public/app/containers/IContainerProps.ts
+share/grafana/public/app/containers/ManageDashboards/
+share/grafana/public/app/containers/ManageDashboards/FolderPermissions.tsx
+share/grafana/public/app/containers/ManageDashboards/FolderSettings.jest.tsx
+share/grafana/public/app/containers/ManageDashboards/FolderSettings.tsx
+share/grafana/public/app/containers/ServerStats/
+share/grafana/public/app/containers/ServerStats/ServerStats.jest.tsx
+share/grafana/public/app/containers/ServerStats/ServerStats.tsx
+share/grafana/public/app/containers/ServerStats/__snapshots__/
+share/grafana/public/app/containers/ServerStats/__snapshots__/ServerStats.jest.tsx.snap
 share/grafana/public/app/core/
+share/grafana/public/app/core/angular_wrappers.ts
 share/grafana/public/app/core/app_events.ts
 share/grafana/public/app/core/components/
+share/grafana/public/app/core/components/Animations/
+share/grafana/public/app/core/components/Animations/SlideDown.tsx

Re: update: games/urbanterror and games/urbanterror-data

[Stuart Henderson]

This is not an uploaded release tarball, it's auto-generated so please keep 
GH_*.


Like Makefile.template says, look at the file url -

/archive/ -> GH_*
/releases/ -> MASTER_SITES etc

--
 Sent from a phone, apologies for poor formatting.



On 3 March 2018 07:07:47 Ryan Freeman  wrote:


Hot on the heels of the 4.3.2 hotfix is a full-fledged 4.3.3 release.

Titled 'Still Dying', it has lots of bug fixes and game behavior
tweaks this time around, as well as security fixes:

http://www.urbanterror.info/news/516-urban-terror-4-3-3-release/

Diff inline for both urbanterror and urbanterror-data

I've switched this from the GH_ vars to using a release tarball
in the engine port.

Builds and packages good here on amd64, OKs and anyone available
to commit?  I am hoping we can sneak this one if we are getting
close to lock, as most servers seem to have already made the switch
and the current version in ports won't be able to join network
games.

Cheers,
-ryan


Index: urbanterror/Makefile
===
RCS file: /cvs/ports/games/urbanterror/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- urbanterror/Makefile26 Feb 2018 08:54:59 -  1.5
+++ urbanterror/Makefile3 Mar 2018 06:47:10 -
@@ -2,12 +2,10 @@

 ONLY_FOR_ARCHS = amd64 i386

+V =4.3.3
 COMMENT =  fast-paced hollywood-tactical shooter: "fun over realism"
-DISTNAME = urbanterror-4.3.2pl1
-
-GH_ACCOUNT =   Barbatos
-GH_PROJECT =   ioq3-for-UrbanTerror-4
-GH_TAGNAME =   release-4.3.2-hotfix
+DISTNAME = release-${V}
+PKGNAME =  urbanterror-${V}

 CATEGORIES =   games x11

@@ -20,9 +18,12 @@ PERMIT_PACKAGE_CDROM =   Yes

 WANTLIB += X11 Xxf86vm c m pthread SDL

+MASTER_SITES = https://github.com/Barbatos/ioq3-for-UrbanTerror-4/archive/
+
 LIB_DEPENDS =  devel/sdl
 RUN_DEPENDS =  games/urbanterror-data \
net/curl
+
 # using clang's integrated assembler for %xmm (code/qcommon/snapvector_sse.c)
 MODULES =  lang/clang
 MODCLANG_ARCHS = i386
@@ -32,6 +33,8 @@ ALL_TARGET =release

 MAKE_ENV = V=1 \
DEFAULT_BASEDIR=${TRUEPREFIX}/share/urbanterror
+
+WRKDIST =  ${WRKDIR}/ioq3-for-UrbanTerror-4-release-${V}

 do-install:
${INSTALL_PROGRAM} \
Index: urbanterror/distinfo
===
RCS file: /cvs/ports/games/urbanterror/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- urbanterror/distinfo26 Feb 2018 08:54:59 -  1.4
+++ urbanterror/distinfo3 Mar 2018 06:47:10 -
@@ -1,2 +1,2 @@
-SHA256 (urbanterror-4.3.2pl1.tar.gz) = 
kyvOLKLR+uSd9mLoUQmf1kmNV8VuDE+dXMOg+NtAhNI=

-SIZE (urbanterror-4.3.2pl1.tar.gz) = 3326324
+SHA256 (release-4.3.3.tar.gz) = uQvKfqksCyfUzjvArkTlPEu1jaJsgHXSOUYxeSPEa2A=
+SIZE (release-4.3.3.tar.gz) = 3325609
Index: urbanterror-data/Makefile
===
RCS file: /cvs/ports/games/urbanterror-data/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- urbanterror-data/Makefile   9 Feb 2017 11:19:47 -   1.5
+++ urbanterror-data/Makefile   3 Mar 2018 06:47:10 -
@@ -3,11 +3,11 @@
 ONLY_FOR_ARCHS = amd64 i386

 COMMENT =  Urban Terror game data
-PKGNAME =  urbanterror-data-4.3.2
+PKGNAME =  urbanterror-data-4.3.3
 CATEGORIES =   games

 URT_VER =  43
-URT_REV =  2
+URT_REV =  3

 DISTNAME = UrbanTerror${URT_VER}${URT_REV}_full

Index: urbanterror-data/distinfo
===
RCS file: /cvs/ports/games/urbanterror-data/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- urbanterror-data/distinfo   7 Feb 2017 06:12:27 -   1.3
+++ urbanterror-data/distinfo   3 Mar 2018 06:47:10 -
@@ -1,2 +1,2 @@
-SHA256 (UrbanTerror432_full.zip) = 
dN7hVm+mzQ6ybYZhSaG2rX6PGKZTaT8CeQwF73zjUqQ=

-SIZE (UrbanTerror432_full.zip) = 1469432087
+SHA256 (UrbanTerror433_full.zip) = 
w1gnGSckr8qqB9e9t08X4G5LhlNGZy7aKwBxez0CMGc=

+SIZE (UrbanTerror433_full.zip) = 1472028382

Re: [UPDATE] sysutils/sleuthkit

[Remi Pointel]

ping

On 02/26/18 15:14, Remi Pointel wrote:

Hi,

this is the diff to update sleuthkit to latest release.

Ok?

Cheers,

Remi.

Re: [UPDATE] sysutils/libsmraw

[Remi Pointel]

ping

On 02/26/18 13:27, Remi Pointel wrote:

Hi,

this is the diff to update libsmraw to latest release.

Ok?

Cheers,

Remi.

Re: [UPDATE] sysutils/py-tsk

[Remi Pointel]

ping

On 02/26/18 13:28, Remi Pointel wrote:

Hi,

this is the diff to update py-tsk to latest release.

Ok?

Cheers,

Remi.

Re: [UPDATE] sysutils/libsmdev

[Remi Pointel]

ping

On 02/26/18 13:27, Remi Pointel wrote:

Hi,

this is the diff to update libsmdev to latest release.

Ok?

Cheers,

Remi.

Re: [UPDATE] sysutils/libfvde

[Remi Pointel]

ping

On 02/26/18 13:26, Remi Pointel wrote:

Hi,

this is the diff to update libfvde to latest release.

Ok?

Cheers,

Remi.

Re: [UPDATE] security/libewf

[Remi Pointel]

ping

On 02/26/18 13:25, Remi Pointel wrote:

Hi,

this is the diff to update libewf to latest release.

Ok?

Cheers,

Remi.