UPDATE: games/urbanterror

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
4 messages Options
Reply | Threaded
Open this post in threaded view
|

UPDATE: games/urbanterror

Ryan Freeman
mazocomp _at_ disroot.org noticed that the code does not contain
PROT_WRITE|PROT_EXEC anymore, and thusly we can strip USE_WXNEEDED.

At the same time there is also a hotfix update that addresses some CVE
related to the quake3 engine:
https://github.com/Barbatos/ioq3-for-UrbanTerror-4/commit/340b8dfe05025fa9830549747b3c67986310ac4d

(This CVE seems to have been resolved in ioq3 back on March 13, 2017,
so ioquake3 port does not need further attention.)

I've only tested this very lightly on amd64, still waiting on
internet at home, so this is a workplace breaktime sponsored
update ;-)

Cheers,
-ryan


? urt.diff
Index: Makefile
===================================================================
RCS file: /cvs/ports/games/urbanterror/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- Makefile 8 Feb 2017 12:55:18 -0000 1.4
+++ Makefile 6 Feb 2018 16:57:20 -0000
@@ -1,14 +1,13 @@
 # $OpenBSD: Makefile,v 1.4 2017/02/08 12:55:18 sthen Exp $
 
-USE_WXNEEDED = Yes
 ONLY_FOR_ARCHS = amd64 i386
 
 COMMENT = fast-paced hollywood-tactical shooter: "fun over realism"
-DISTNAME = urbanterror-4.3.2
+DISTNAME = urbanterror-4.3.2p1
 
 GH_ACCOUNT = Barbatos
 GH_PROJECT = ioq3-for-UrbanTerror-4
-GH_TAGNAME = release-4.3.2
+GH_TAGNAME = release-4.3.2-hotfix
 
 CATEGORIES = games x11
 
Index: distinfo
===================================================================
RCS file: /cvs/ports/games/urbanterror/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo 7 Feb 2017 06:12:27 -0000 1.3
+++ distinfo 6 Feb 2018 16:57:20 -0000
@@ -1,2 +1,2 @@
-SHA256 (urbanterror-4.3.2.tar.gz) = gRrLDcuQNQnFbNwFaz0qZuQ1myO6Smj1bw6hRSEJzvs=
-SIZE (urbanterror-4.3.2.tar.gz) = 11775787
+SHA256 (urbanterror-4.3.2p1.tar.gz) = kyvOLKLR+uSd9mLoUQmf1kmNV8VuDE+dXMOg+NtAhNI=
+SIZE (urbanterror-4.3.2p1.tar.gz) = 3326324

Reply | Threaded
Open this post in threaded view
|

Re: UPDATE: games/urbanterror

Mikolaj Kucharski-3
On Tue, Feb 06, 2018 at 08:58:29AM -0800, Ryan Freeman wrote:
> -DISTNAME = urbanterror-4.3.2
> +DISTNAME = urbanterror-4.3.2p1

I think `p` marker is reserved for REVISION, so why not useing
revision directly?

--
best regards
q#

Reply | Threaded
Open this post in threaded view
|

Re: UPDATE: games/urbanterror

Ryan Freeman
On Wed, Feb 07, 2018 at 07:22:04AM +0000, Mikolaj Kucharski wrote:
> On Tue, Feb 06, 2018 at 08:58:29AM -0800, Ryan Freeman wrote:
> > -DISTNAME = urbanterror-4.3.2
> > +DISTNAME = urbanterror-4.3.2p1
>
> I think `p` marker is reserved for REVISION, so why not useing
> revision directly?

Woops, thanks.  That 'p' should be 'pl' for patch level.  Unless
I am wrong, the REVISION marker is more for updating a package
that itself hasn't changed, but a dependency of it has?  Or
some other small tweak to the port that doesn't actually change
the src of the program in question.

As this is a hotfix update from upstream, I meant to use 'pl' for
patchlevel.

Thank you,
-ryan


? urt.diff
Index: Makefile
===================================================================
RCS file: /cvs/ports/games/urbanterror/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- Makefile 8 Feb 2017 12:55:18 -0000 1.4
+++ Makefile 7 Feb 2018 16:11:26 -0000
@@ -1,14 +1,13 @@
 # $OpenBSD: Makefile,v 1.4 2017/02/08 12:55:18 sthen Exp $
 
-USE_WXNEEDED = Yes
 ONLY_FOR_ARCHS = amd64 i386
 
 COMMENT = fast-paced hollywood-tactical shooter: "fun over realism"
-DISTNAME = urbanterror-4.3.2
+DISTNAME = urbanterror-4.3.2pl1
 
 GH_ACCOUNT = Barbatos
 GH_PROJECT = ioq3-for-UrbanTerror-4
-GH_TAGNAME = release-4.3.2
+GH_TAGNAME = release-4.3.2-hotfix
 
 CATEGORIES = games x11
 
Index: distinfo
===================================================================
RCS file: /cvs/ports/games/urbanterror/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo 7 Feb 2017 06:12:27 -0000 1.3
+++ distinfo 7 Feb 2018 16:11:26 -0000
@@ -1,2 +1,2 @@
-SHA256 (urbanterror-4.3.2.tar.gz) = gRrLDcuQNQnFbNwFaz0qZuQ1myO6Smj1bw6hRSEJzvs=
-SIZE (urbanterror-4.3.2.tar.gz) = 11775787
+SHA256 (urbanterror-4.3.2pl1.tar.gz) = kyvOLKLR+uSd9mLoUQmf1kmNV8VuDE+dXMOg+NtAhNI=
+SIZE (urbanterror-4.3.2pl1.tar.gz) = 3326324

Reply | Threaded
Open this post in threaded view
|

Re: UPDATE: games/urbanterror

Ryan Freeman
On Wed, Feb 07, 2018 at 08:12:07AM -0800, Ryan Freeman wrote:

> On Wed, Feb 07, 2018 at 07:22:04AM +0000, Mikolaj Kucharski wrote:
> > On Tue, Feb 06, 2018 at 08:58:29AM -0800, Ryan Freeman wrote:
> > > -DISTNAME = urbanterror-4.3.2
> > > +DISTNAME = urbanterror-4.3.2p1
> >
> > I think `p` marker is reserved for REVISION, so why not useing
> > revision directly?
>
> Woops, thanks.  That 'p' should be 'pl' for patch level.  Unless
> I am wrong, the REVISION marker is more for updating a package
> that itself hasn't changed, but a dependency of it has?  Or
> some other small tweak to the port that doesn't actually change
> the src of the program in question.
>
> As this is a hotfix update from upstream, I meant to use 'pl' for
> patchlevel.
>
> Thank you,
> -ryan

ping

>
>
> ? urt.diff
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/games/urbanterror/Makefile,v
> retrieving revision 1.4
> diff -u -p -r1.4 Makefile
> --- Makefile 8 Feb 2017 12:55:18 -0000 1.4
> +++ Makefile 7 Feb 2018 16:11:26 -0000
> @@ -1,14 +1,13 @@
>  # $OpenBSD: Makefile,v 1.4 2017/02/08 12:55:18 sthen Exp $
>  
> -USE_WXNEEDED = Yes
>  ONLY_FOR_ARCHS = amd64 i386
>  
>  COMMENT = fast-paced hollywood-tactical shooter: "fun over realism"
> -DISTNAME = urbanterror-4.3.2
> +DISTNAME = urbanterror-4.3.2pl1
>  
>  GH_ACCOUNT = Barbatos
>  GH_PROJECT = ioq3-for-UrbanTerror-4
> -GH_TAGNAME = release-4.3.2
> +GH_TAGNAME = release-4.3.2-hotfix
>  
>  CATEGORIES = games x11
>  
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/games/urbanterror/distinfo,v
> retrieving revision 1.3
> diff -u -p -r1.3 distinfo
> --- distinfo 7 Feb 2017 06:12:27 -0000 1.3
> +++ distinfo 7 Feb 2018 16:11:26 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (urbanterror-4.3.2.tar.gz) = gRrLDcuQNQnFbNwFaz0qZuQ1myO6Smj1bw6hRSEJzvs=
> -SIZE (urbanterror-4.3.2.tar.gz) = 11775787
> +SHA256 (urbanterror-4.3.2pl1.tar.gz) = kyvOLKLR+uSd9mLoUQmf1kmNV8VuDE+dXMOg+NtAhNI=
> +SIZE (urbanterror-4.3.2pl1.tar.gz) = 3326324
>