[gentoo-commits] repo/gentoo:master commit in: games-server/ut2004-ded/, games-server/ut2004-ded/files/
commit: 8901773bdbd36ccf9157642a98e5f39fd0245e54
Author: James Le Cuirot gentoo org>
AuthorDate: Fri Dec 27 00:19:18 2019 +
Commit: James Le Cuirot gentoo org>
CommitDate: Fri Dec 27 00:25:53 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8901773b
Revert "games-server/ut2004-ded: drop vulnerable package"
This reverts commit 5e1e96c14effb4f076191f9d8023547cb7e15ff4.
This package was dropped because of CVE-2008-6441 and
CVE-2008-7011. However, UT2004 was reported to *not* be vulnerable to
the former and the latter was almost certainly fixed in 3369.3. I
cannot find any release notes but the published workaround related to
3369.2 and 3369.3 was built just three days after the vulnerability
was announced.
Bug: https://bugs.gentoo.org/285010
Signed-off-by: James Le Cuirot gentoo.org>
games-server/ut2004-ded/Manifest | 3 +
games-server/ut2004-ded/files/ut2004-ded.confd | 6 ++
games-server/ut2004-ded/files/ut2004-ded.initd | 13
games-server/ut2004-ded/metadata.xml | 11 +++
.../ut2004-ded/ut2004-ded-3369.3-r2.ebuild | 88 ++
5 files changed, 121 insertions(+)
diff --git a/games-server/ut2004-ded/Manifest b/games-server/ut2004-ded/Manifest
new file mode 100644
index 000..7be18ac0efa
--- /dev/null
+++ b/games-server/ut2004-ded/Manifest
@@ -0,0 +1,3 @@
+DIST dedicatedserver3339-bonuspack.zip 914213907 BLAKE2B
883253d9817b4ee7f9594bf611e9d440d7e90c8cd43d34b366cfb4e781d4ad78e2812a0aa4f5acaed4880b1bc47f0dffed6fbb0caf9cc53477c01bc92d891325
SHA512
353161a7c811ac5c688c6438e3ecfad1aa37bcfd13a3e17f2a9deaf510eda9311a423524bd4635fcf972001cfe24c1a1b71a2bb6a060c37a24351f3bce0c7f26
+DIST ut2004-lnxpatch3369-2.tar.bz2 22465217 BLAKE2B
9852f9d55804b7f2927a31be86aee1552aaebeb38d2a40fb206154c236e9d6eff47f7594024c0d9b25c7216d3ca62571b1f89f23f72ee9e135b2e6451bcb006a
SHA512
0d6f26d5a811efd64be8c304e928e03f546d9a8eaba6b074843e2b7e76e0670b39df95200a2fe2040d72bbd204c7157ed0115649a5c85396a76d9e0b7ec284b1
+DIST ut2004-v3369-3-linux-dedicated.7z 5013927 BLAKE2B
72d24d7bc37c777f3697b767a03e052ad9b547005dd6da73833e439496e87a9c1ebbe01f88d62b29a41b2bf6380a3b3bd745e6883fbb6d0f2b7e52998d4af276
SHA512
3b2a7b64934a3647c02c9fec48565c5c2c35370d635b2af4059eb76587bfa13f46e6a4e14fdb0494ba7a4182497ed5963601986f4fcfa318e69a8a8a8c0178cf
diff --git a/games-server/ut2004-ded/files/ut2004-ded.confd
b/games-server/ut2004-ded/files/ut2004-ded.confd
new file mode 100644
index 000..e82238b93de
--- /dev/null
+++ b/games-server/ut2004-ded/files/ut2004-ded.confd
@@ -0,0 +1,6 @@
+# User and group the server should run as.
+ut2004_ded_user="nobody"
+ut2004_ded_group="nobody"
+
+# Any extra options you want to pass to the server.
+ut2004_ded_opts="DM-Deck17"
diff --git a/games-server/ut2004-ded/files/ut2004-ded.initd
b/games-server/ut2004-ded/files/ut2004-ded.initd
new file mode 100644
index 000..c4cf9810cd1
--- /dev/null
+++ b/games-server/ut2004-ded/files/ut2004-ded.initd
@@ -0,0 +1,13 @@
+#!/sbin/openrc-run
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+pidfile="/var/run/${RC_SVCNAME}.pid"
+command_background="true"
+command_user="${ut2004_ded_user}:${ut2004_ded_group}"
+command="ut2004-ded"
+command_args="${ut2004_ded_opts}"
+
+depend() {
+ need net
+}
diff --git a/games-server/ut2004-ded/metadata.xml
b/games-server/ut2004-ded/metadata.xml
new file mode 100644
index 000..6c721750729
--- /dev/null
+++ b/games-server/ut2004-ded/metadata.xml
@@ -0,0 +1,11 @@
+
+http://www.gentoo.org/dtd/metadata.dtd";>
+
+
+ ga...@gentoo.org
+ Gentoo Games Project
+
+
+Unreal Tounament 2004 is a first-person 3-D shooter and sequel to the 2003
Game of the Year, Unreal Tournament 2003. The game was ported to Linux by Ryan
"icculus" Gordon under contract from Epic Games and the Linux installer was
released in the retail box. This is the dedicated server portion of the game
and does not require the retail discs to use.
+
+
diff --git a/games-server/ut2004-ded/ut2004-ded-3369.3-r2.ebuild
b/games-server/ut2004-ded/ut2004-ded-3369.3-r2.ebuild
new file mode 100644
index 000..63f7dcb5240
--- /dev/null
+++ b/games-server/ut2004-ded/ut2004-ded-3369.3-r2.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit check-reqs eutils
+
+BONUSPACK_P="dedicatedserver3339-bonuspack.zip"
+PATCH_P="ut2004-lnxpatch${PV%.*}-2.tar.bz2"
+DESCRIPTION="Unreal Tournament 2004 Linux Dedicated Server"
+HOMEPAGE="https://liandri.beyondunreal.com/Unreal_Tournament_2004";
+SRC_URI="
+ https://ut2004.ut-files.com/Entire_Server_Download/${BONUSPACK_P}
+ https://ut2004.ut-files.com/Patches/Linux/${PATCH_P}
+
https://dev.gentoo.org/~chewi/distfiles/ut2004-v${PV/./-}-linux-dedicated.7z
+"
+
+LICENSE="ut2003"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x
[gentoo-commits] repo/gentoo:master commit in: games-server/ut2004-ded/, games-server/ut2004-ded/files/
commit: 5e1e96c14effb4f076191f9d8023547cb7e15ff4
Author: Aaron Bauman gentoo org>
AuthorDate: Sun Dec 8 21:21:44 2019 +
Commit: Aaron Bauman gentoo org>
CommitDate: Sun Dec 8 21:27:53 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e1e96c1
games-server/ut2004-ded: drop vulnerable package
* This should have been dropped along with the other ut2004/unreal engine bugs
Closes: https://bugs.gentoo.org/285010
Signed-off-by: Aaron Bauman gentoo.org>
games-server/ut2004-ded/Manifest | 3 -
games-server/ut2004-ded/files/ut2004-ded.confd | 6 --
games-server/ut2004-ded/files/ut2004-ded.initd | 13
games-server/ut2004-ded/metadata.xml | 11 ---
.../ut2004-ded/ut2004-ded-3369.3-r2.ebuild | 88 --
5 files changed, 121 deletions(-)
diff --git a/games-server/ut2004-ded/Manifest b/games-server/ut2004-ded/Manifest
deleted file mode 100644
index 7be18ac0efa..000
--- a/games-server/ut2004-ded/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST dedicatedserver3339-bonuspack.zip 914213907 BLAKE2B
883253d9817b4ee7f9594bf611e9d440d7e90c8cd43d34b366cfb4e781d4ad78e2812a0aa4f5acaed4880b1bc47f0dffed6fbb0caf9cc53477c01bc92d891325
SHA512
353161a7c811ac5c688c6438e3ecfad1aa37bcfd13a3e17f2a9deaf510eda9311a423524bd4635fcf972001cfe24c1a1b71a2bb6a060c37a24351f3bce0c7f26
-DIST ut2004-lnxpatch3369-2.tar.bz2 22465217 BLAKE2B
9852f9d55804b7f2927a31be86aee1552aaebeb38d2a40fb206154c236e9d6eff47f7594024c0d9b25c7216d3ca62571b1f89f23f72ee9e135b2e6451bcb006a
SHA512
0d6f26d5a811efd64be8c304e928e03f546d9a8eaba6b074843e2b7e76e0670b39df95200a2fe2040d72bbd204c7157ed0115649a5c85396a76d9e0b7ec284b1
-DIST ut2004-v3369-3-linux-dedicated.7z 5013927 BLAKE2B
72d24d7bc37c777f3697b767a03e052ad9b547005dd6da73833e439496e87a9c1ebbe01f88d62b29a41b2bf6380a3b3bd745e6883fbb6d0f2b7e52998d4af276
SHA512
3b2a7b64934a3647c02c9fec48565c5c2c35370d635b2af4059eb76587bfa13f46e6a4e14fdb0494ba7a4182497ed5963601986f4fcfa318e69a8a8a8c0178cf
diff --git a/games-server/ut2004-ded/files/ut2004-ded.confd
b/games-server/ut2004-ded/files/ut2004-ded.confd
deleted file mode 100644
index e82238b93de..000
--- a/games-server/ut2004-ded/files/ut2004-ded.confd
+++ /dev/null
@@ -1,6 +0,0 @@
-# User and group the server should run as.
-ut2004_ded_user="nobody"
-ut2004_ded_group="nobody"
-
-# Any extra options you want to pass to the server.
-ut2004_ded_opts="DM-Deck17"
diff --git a/games-server/ut2004-ded/files/ut2004-ded.initd
b/games-server/ut2004-ded/files/ut2004-ded.initd
deleted file mode 100644
index c4cf9810cd1..000
--- a/games-server/ut2004-ded/files/ut2004-ded.initd
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-pidfile="/var/run/${RC_SVCNAME}.pid"
-command_background="true"
-command_user="${ut2004_ded_user}:${ut2004_ded_group}"
-command="ut2004-ded"
-command_args="${ut2004_ded_opts}"
-
-depend() {
- need net
-}
diff --git a/games-server/ut2004-ded/metadata.xml
b/games-server/ut2004-ded/metadata.xml
deleted file mode 100644
index 6c721750729..000
--- a/games-server/ut2004-ded/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-http://www.gentoo.org/dtd/metadata.dtd";>
-
-
- ga...@gentoo.org
- Gentoo Games Project
-
-
-Unreal Tounament 2004 is a first-person 3-D shooter and sequel to the 2003
Game of the Year, Unreal Tournament 2003. The game was ported to Linux by Ryan
"icculus" Gordon under contract from Epic Games and the Linux installer was
released in the retail box. This is the dedicated server portion of the game
and does not require the retail discs to use.
-
-
diff --git a/games-server/ut2004-ded/ut2004-ded-3369.3-r2.ebuild
b/games-server/ut2004-ded/ut2004-ded-3369.3-r2.ebuild
deleted file mode 100644
index 63f7dcb5240..000
--- a/games-server/ut2004-ded/ut2004-ded-3369.3-r2.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit check-reqs eutils
-
-BONUSPACK_P="dedicatedserver3339-bonuspack.zip"
-PATCH_P="ut2004-lnxpatch${PV%.*}-2.tar.bz2"
-DESCRIPTION="Unreal Tournament 2004 Linux Dedicated Server"
-HOMEPAGE="https://liandri.beyondunreal.com/Unreal_Tournament_2004";
-SRC_URI="
- https://ut2004.ut-files.com/Entire_Server_Download/${BONUSPACK_P}
- https://ut2004.ut-files.com/Patches/Linux/${PATCH_P}
-
https://dev.gentoo.org/~chewi/distfiles/ut2004-v${PV/./-}-linux-dedicated.7z
-"
-
-LICENSE="ut2003"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-RESTRICT="bindist mirror strip"
-
-BDEPEND="
- app-arch/p7zip
- app-arch/unzip
-"
-
-RDEPEND="
- !games-fps/ut2004
- !games-fps/ut2004-data
- games-fps/ut2004-bonuspack-ece
- games-fps/ut2004-bonuspack-mega
- sys-libs/glibc
-"
-
-CHECKREQS_DISK_BUILD="2G"
-QA_PREBUILT="*"
-
[gentoo-commits] repo/gentoo:master commit in: games-server/ut2004-ded/, games-server/ut2004-ded/files/
commit: d1d13e3aa811314a41cc87d4ce5af54b24574847
Author: James Le Cuirot gentoo org>
AuthorDate: Sun Oct 27 22:34:34 2019 +
Commit: James Le Cuirot gentoo org>
CommitDate: Sun Oct 27 23:44:07 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1d13e3a
games-server/ut2004-ded: EAPI 7, drop games eclass, misc improvements
This now blocks games-server/ut2004(-data) entirely rather than just
the dedicated USE flag. This allows both to be installed to
/opt/ut2004, vastly simplying the related ebuilds.
This was admittedly done in a hurry but it seems to work. I have
chosen nobody:nobody for the server user and group because I don't
have time to formally request one. This may be sufficient anyway.
Also fixes collision with games-fps/ut2004-bonuspack-ece.
Closes: https://bugs.gentoo.org/594642
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: James Le Cuirot gentoo.org>
games-server/ut2004-ded/files/ut2004-ded.confd | 11 +--
games-server/ut2004-ded/files/ut2004-ded.initd | 26 ++
.../ut2004-ded/ut2004-ded-3369.3-r1.ebuild | 93 --
.../ut2004-ded/ut2004-ded-3369.3-r2.ebuild | 88
4 files changed, 99 insertions(+), 119 deletions(-)
diff --git a/games-server/ut2004-ded/files/ut2004-ded.confd
b/games-server/ut2004-ded/files/ut2004-ded.confd
index a485b12d221..e82238b93de 100644
--- a/games-server/ut2004-ded/files/ut2004-ded.confd
+++ b/games-server/ut2004-ded/files/ut2004-ded.confd
@@ -1,9 +1,6 @@
-# User and group the server should run as
-ut2004_ded_user="@USER@"
-ut2004_ded_group="@GROUP@"
+# User and group the server should run as.
+ut2004_ded_user="nobody"
+ut2004_ded_group="nobody"
-# Directory to use for HOME
-ut2004_ded_home="@HOME@"
-
-# Any extra options you want to pass to the server
+# Any extra options you want to pass to the server.
ut2004_ded_opts="DM-Deck17"
diff --git a/games-server/ut2004-ded/files/ut2004-ded.initd
b/games-server/ut2004-ded/files/ut2004-ded.initd
index fe323a9e00e..c4cf9810cd1 100644
--- a/games-server/ut2004-ded/files/ut2004-ded.initd
+++ b/games-server/ut2004-ded/files/ut2004-ded.initd
@@ -1,25 +1,13 @@
#!/sbin/openrc-run
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
+pidfile="/var/run/${RC_SVCNAME}.pid"
+command_background="true"
+command_user="${ut2004_ded_user}:${ut2004_ded_group}"
+command="ut2004-ded"
+command_args="${ut2004_ded_opts}"
+
depend() {
need net
}
-
-start() {
- ebegin "Starting ut2004-ded"
- start-stop-daemon --start --quiet --background --make-pidfile \
- --pidfile /var/run/ut2004-ded.pid \
- --chuid ${ut2004_ded_user}:${ut2004_ded_group} \
- --env HOME="${ut2004_ded_home}" \
- --exec "@DIR@/ut2004-ded" \
- -- ${ut2004_ded_opts}
- eend $?
-}
-
-stop() {
- ebegin "Stopping ut2004-ded"
- start-stop-daemon --stop \
- --pidfile /var/run/ut2004-ded.pid
- eend $?
-}
diff --git a/games-server/ut2004-ded/ut2004-ded-3369.3-r1.ebuild
b/games-server/ut2004-ded/ut2004-ded-3369.3-r1.ebuild
deleted file mode 100644
index cfee57c4fc6..000
--- a/games-server/ut2004-ded/ut2004-ded-3369.3-r1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit games
-
-BONUSPACK_P="dedicatedserver3339-bonuspack.zip"
-PATCH_P="ut2004-lnxpatch${PV%.*}-2.tar.bz2"
-DESCRIPTION="Unreal Tournament 2004 Linux Dedicated Server"
-HOMEPAGE="http://www.unrealtournament.com/";
-SRC_URI="
-
https://files.chaoticdreams.org/UT2004/DedicatedServer3339-BonusPack.zip ->
${BONUSPACK_P}
- http://ut2004.ut-files.com/index.php?dir=Patches/Linux/&file=${PATCH_P}
-> ${PATCH_P}
-
https://dev.gentoo.org/~chewi/distfiles/ut2004-v${PV/./-}-linux-dedicated.7z
-"
-
-LICENSE="ut2003"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="bindist mirror strip"
-
-DEPEND="app-arch/unzip
- app-arch/p7zip"
-RDEPEND="sys-libs/glibc
- !games-fps/ut2004[dedicated]
- games-fps/ut2004-bonuspack-ece
- games-fps/ut2004-bonuspack-mega"
-
-S=${WORKDIR}
-
-dir=${GAMES_PREFIX_OPT}/${PN}
-
-src_prepare() {
- cp -rf UT2004-Patch/* . || die
- rm -rf System/{ucc-bin*,ut2004-bin*,*.dll,*.exe} UT2004-Patch
- if use amd64 ; then
- mv -f ut2004-ucc-bin-09192008/ucc-bin-linux-amd64
System/ucc-bin || die
- else
- mv -f ut2004-ucc-bin-09192008/ucc-bin System/ || die
- fi
- rm -rf ut2004-ucc-bin-09192008
- # Owned by ut2004-bonuspack-ece
- rm -f
Animations/{MetalGuardAnim,ONSBPAnimations,NecrisAnim,MechaSkaarjAnims}.ukx
- rm -f Help/BonusPackReadme.txt
- rm -f Maps/{ONS-Adara,ONS-IslandHop,ONS-Tricky,ONS-Urban}.ut2
- rm -f Sound
