Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/games-server
diff options
context:
space:
mode:
Diffstat (limited to 'games-server')
-rw-r--r--games-server/tetrix/ChangeLog8
-rw-r--r--games-server/tetrix/files/tetrix-1.13.16.1.40c-build.patch237
-rw-r--r--games-server/tetrix/tetrix-1.13.16.1.40c-r2.ebuild29
3 files changed, 257 insertions, 17 deletions
diff --git a/games-server/tetrix/ChangeLog b/games-server/tetrix/ChangeLog
index 82b585d8f223..e61dfdc004a7 100644
--- a/games-server/tetrix/ChangeLog
+++ b/games-server/tetrix/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for games-server/tetrix
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-server/tetrix/ChangeLog,v 1.7 2007/04/28 16:04:40 tove Exp $
+# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-server/tetrix/ChangeLog,v 1.8 2009/06/15 04:24:28 mr_bones_ Exp $
+
+ 15 Jun 2009; Michael Sterrett <mr_bones_@gentoo.org>
+ +files/tetrix-1.13.16.1.40c-build.patch, tetrix-1.13.16.1.40c-r2.ebuild:
+ EAPI=2; quoting; roll-up patch and fix warnings and hostname code
28 Apr 2007; Torsten Veller <tove@gentoo.org>
tetrix-1.13.16.1.40c-r2.ebuild:
diff --git a/games-server/tetrix/files/tetrix-1.13.16.1.40c-build.patch b/games-server/tetrix/files/tetrix-1.13.16.1.40c-build.patch
new file mode 100644
index 000000000000..fcf93882ae27
--- /dev/null
+++ b/games-server/tetrix/files/tetrix-1.13.16.1.40c-build.patch
@@ -0,0 +1,237 @@
+diff -ru tetrinetx-1.13.16+qirc-1.40c.orig/bin/game.conf tetrinetx-1.13.16+qirc-1.40c/bin/game.conf
+--- tetrinetx-1.13.16+qirc-1.40c.orig/bin/game.conf 1999-09-06 08:14:38.000000000 -0400
++++ tetrinetx-1.13.16+qirc-1.40c/bin/game.conf 2009-06-15 00:17:22.000000000 -0400
+@@ -8,11 +8,16 @@
+ # Any text after a # is ignored, and can be used as comments.
+
+ # pidfile [game.pid] - Where should the Process ID be written
+-pidfile=game.pid
++pidfile=/var/run/tetrix.pid
+
+ # bindip [0.0.0.0] - What IP should server be bound to (0.0.0.0 means all)
+ bindip=0.0.0.0
+
++# username/group to switch UID/GID to
++droproot=1
++dropuser=games
++dropgroup=games
++
+ # maxchannels [1] - How many channels should be available on server
+ maxchannels=8
+
+diff -ru tetrinetx-1.13.16+qirc-1.40c.orig/src/config.h tetrinetx-1.13.16+qirc-1.40c/src/config.h
+--- tetrinetx-1.13.16+qirc-1.40c.orig/src/config.h 2001-04-23 22:31:29.000000000 -0400
++++ tetrinetx-1.13.16+qirc-1.40c/src/config.h 2009-06-15 00:17:22.000000000 -0400
+@@ -7,16 +7,16 @@
+ */
+
+ /* Location of the various external files */
+-#define FILE_MOTD "game.motd" /* Message of the Day File */
+-#define FILE_PMOTD "game.pmotd" /* Playback motd */
+-#define FILE_CONF "game.conf" /* Game configuration File */
+-#define FILE_WINLIST "game.winlist" /* Winlist storage file */
+-#define FILE_WINLIST2 "game.winlist2" /* Winlist storage file */
+-#define FILE_WINLIST3 "game.winlist3" /* Winlist storage file */
++#define FILE_MOTD "GENTOO_CONFDIR/game.motd" /* Message of the Day File */
++#define FILE_PMOTD "GENTOO_CONFDIR/game.pmotd" /* Playback motd */
++#define FILE_CONF "GENTOO_CONFDIR/game.conf" /* Game configuration File */
++#define FILE_WINLIST "GENTOO_STATEDIR/game.winlist" /* Winlist storage file */
++#define FILE_WINLIST2 "GENTOO_STATEDIR/game.winlist2" /* Winlist storage file */
++#define FILE_WINLIST3 "GENTOO_STATEDIR/game.winlist3" /* Winlist storage file */
+
+-#define FILE_BAN "game.ban" /* List of Banned IP's */
+-#define FILE_BAN_COMPROMISE "game.ban.compromise" /* List of Banned IP's */
+-#define FILE_ALLOW "game.allow" /* List of allow IP's */
+-#define FILE_LOG "game.log" /* Logfile */
+-#define FILE_PID "game.pid" /* Default PID */
+-#define FILE_SECURE "game.secure" /* Security file */
++#define FILE_BAN "GENTOO_CONFDIR/game.ban" /* List of Banned IP's */
++#define FILE_BAN_COMPROMISE "GENTOO_CONFDIR/game.ban.compromise" /* List of Banned IP's */
++#define FILE_ALLOW "GENTOO_CONFDIR/game.allow" /* List of allow IP's */
++#define FILE_LOG "GENTOO_LOGDIR/tetrix.log" /* Logfile */
++#define FILE_PID "/var/run/tetrix.pid" /* Default PID */
++#define FILE_SECURE "GENTOO_CONFDIR/game.secure" /* Security file */
+diff -ru tetrinetx-1.13.16+qirc-1.40c.orig/src/game.c tetrinetx-1.13.16+qirc-1.40c/src/game.c
+--- tetrinetx-1.13.16+qirc-1.40c.orig/src/game.c 2001-04-23 22:31:29.000000000 -0400
++++ tetrinetx-1.13.16+qirc-1.40c/src/game.c 2009-06-15 00:17:22.000000000 -0400
+@@ -2,6 +2,8 @@
+ game.c
+
+ */
++#include <pwd.h>
++#include <grp.h>
+
+ /* securitywrite() */
+ /* Writes out the security structure into a text format game.secure file */
+@@ -149,6 +151,11 @@
+ fprintf(file_out,"# bindip [0.0.0.0] - What IP should server be bound to (0.0.0.0 means all)\n");
+ fprintf(file_out,"bindip=%s\n", game.bindip);
+ fprintf(file_out,"\n");
++ fprintf(file_out,"# username/group to switch UID/GID to");
++ fprintf(file_out,"droproot=%d\n", game.droproot);
++ fprintf(file_out,"dropuser=%s\n", game.user);
++ fprintf(file_out,"dropgroup=%s\n", game.group);
++ fprintf(file_out,"\n");
+ fprintf(file_out,"# maxchannels [1] - How many channels should be available on server\n");
+ fprintf(file_out,"maxchannels=%d\n", game.maxchannels);
+ fprintf(file_out,"\n");
+@@ -466,6 +473,21 @@
+ strncpy(game.bindip, id_value, IPLEN-1); game.bindip[IPLEN-1]=0;
+ error=0;
+ }
++ if (!strcasecmp(id_tag,"droproot"))
++ {
++ game.droproot=atoi(id_value);
++ error=0;
++ }
++ if (!strcasecmp(id_tag,"dropuser"))
++ {
++ strncpy(game.user, id_value, USERNAMELEN-1); game.user[USERNAMELEN-1]=0;
++ error=0;
++ }
++ if (!strcasecmp(id_tag,"dropgroup"))
++ {
++ strncpy(game.group, id_value, USERNAMELEN-1); game.group[USERNAMELEN-1]=0;
++ error=0;
++ }
+
+
+ if (!strcasecmp(id_tag,"maxchannels"))
+@@ -854,6 +876,22 @@
+ }
+ fclose(file_in);
+ lvprintf(3,"Read game configuration from %s\n", FILE_CONF);
++ if (game.droproot) {
++ struct passwd *vpw;
++ struct group *vgr;
++ game.droproot = 0;
++ vpw = getpwnam(game.user);
++ if (vpw) {
++ game.userid = vpw->pw_uid;
++ vgr = getgrnam(game.group);
++ if (vgr) {
++ game.groupid = vgr->gr_gid;
++ game.droproot = 1;
++ }
++ }
++ if (!game.droproot)
++ lvprintf(2,"Drop root was requested but the specified user/group were invalid!\n");
++ }
+ return(0);
+ }
+
+diff -ru tetrinetx-1.13.16+qirc-1.40c.orig/src/main.c tetrinetx-1.13.16+qirc-1.40c/src/main.c
+--- tetrinetx-1.13.16+qirc-1.40c.orig/src/main.c 2002-07-08 23:53:49.000000000 -0400
++++ tetrinetx-1.13.16+qirc-1.40c/src/main.c 2009-06-15 00:17:22.000000000 -0400
+@@ -4878,10 +4878,13 @@
+ long int timeticks, otimeticks;
+
+ /* Initialise */
++ xx = (argc == 2 && !strcmp(argv[1],"-q"));
++ if (!xx)
+ printf("Loading Tetrix. Please wait...\n");
+ init_main();
+ init_resolver();
+ init_game();
++ if (!xx)
+ printf("Initializing security/ban list...\n");
+ init_security();
+ init_banlist(banlist, MAXBAN);
+@@ -4890,6 +4893,7 @@
+ read_banlist(FILE_BAN_COMPROMISE, combanlist, MAXBAN);
+ init_allowlist();
+ read_allowlist();
++ if (!xx)
+ printf("Initializing winlist...\n");
+ init_winlist(winlist, MAXWINLIST);
+ init_winlist(winlist2, MAXWINLIST);
+@@ -4898,16 +4902,21 @@
+ readwinlist(FILE_WINLIST2, winlist2, MAXWINLIST);
+ readwinlist(FILE_WINLIST3, winlist3, MAXWINLIST);
+ sleep(1);
++ if (!xx)
+ printf("Initialize network connection...\n");
+ init_net();
++ if (!xx)
+ printf("Gameplay ... ");
+ usleep(300000);
+ init_telnet_port();
++ if (!xx)
+ printf("Spectator ... ");
+ usleep(300000);
+ init_playback_port();
++ if (!xx)
+ printf("Ircadm ... \n");
+ init_query_port();
++ if (!xx)
+ printf("Completed!!!\n");
+
+ if (securityread() < 0)
+@@ -4933,6 +4942,14 @@
+
+ /* Write out PID */
+ writepid();
++
++ /* drop root */
++ if (game.droproot) {
++ if (setgid(game.groupid))
++ perror("Could not setgid");
++ if (setuid(game.userid))
++ perror("Could not setuid");
++ }
+
+ /* Reset time */
+ timeticks = time(NULL);
+diff -ru tetrinetx-1.13.16+qirc-1.40c.orig/src/main.h tetrinetx-1.13.16+qirc-1.40c/src/main.h
+--- tetrinetx-1.13.16+qirc-1.40c.orig/src/main.h 2001-04-29 15:00:28.000000000 -0400
++++ tetrinetx-1.13.16+qirc-1.40c/src/main.h 2009-06-15 00:17:22.000000000 -0400
+@@ -48,6 +48,7 @@
+ /* Defines */
+ #define TETVERSION "1.13" /* What Tetrinet version we are for */
+ #define SERVERBUILD "16+qirc-1.40b" /* What build we are at */
++#define USERNAMELEN 30 /* Maximum length of username/group for droproot */
+ #define NICKLEN 30 /* Maximum length of Nickname */
+ #define VERLEN 10 /* Maximum length of Tetrinet version */
+ #define UHOSTLEN 121 /* Maximum length of Hostname */
+@@ -235,6 +236,12 @@
+
+ int verbose; /* Verbosity */
+ char pidfile[PIDFILELEN+1];
++
++ int droproot; /* should we drop root when starting ? */
++ char user[USERNAMELEN+1];
++ uid_t userid;
++ char group[USERNAMELEN+1];
++ gid_t groupid;
+ };
+
+
+diff -ru tetrinetx-1.13.16+qirc-1.40c.orig/src/net.c tetrinetx-1.13.16+qirc-1.40c/src/net.c
+--- tetrinetx-1.13.16+qirc-1.40c.orig/src/net.c 2001-04-23 22:31:29.000000000 -0400
++++ tetrinetx-1.13.16+qirc-1.40c/src/net.c 2009-06-15 00:19:16.000000000 -0400
+@@ -57,21 +57,21 @@
+ p=getenv("HOSTNAME"); if (p!=NULL) {
+ strncpy(s,p, UHOSTLEN);
+ s[UHOSTLEN] = 0;
+- if (strchr(s,'.')!=NULL) return;
++ if (*s) return;
+ }
+ gethostname(s,80);
+- if (strchr(s,'.')!=NULL) return;
++ if (*s) return;
+ hp=gethostbyname(s);
+ if (hp==NULL)
+ fatal("Hostname self-lookup failed.",0);
+ strncpy(s,hp->h_name, UHOSTLEN);
+ s[UHOSTLEN] = 0;
+- if (strchr(s,'.')!=NULL) return;
++ if (*s) return;
+ if (hp->h_aliases[0] == NULL)
+ fatal("Can't determine your hostname!",0);
+ strncpy(s,hp->h_aliases[0], UHOSTLEN);
+ s[UHOSTLEN] = 0;
+- if (strchr(s,'.')==NULL)
++ if (!*s)
+ fatal("Can't determine your hostname!",0);
+ }
+
diff --git a/games-server/tetrix/tetrix-1.13.16.1.40c-r2.ebuild b/games-server/tetrix/tetrix-1.13.16.1.40c-r2.ebuild
index df2eee8e255c..8658b817d408 100644
--- a/games-server/tetrix/tetrix-1.13.16.1.40c-r2.ebuild
+++ b/games-server/tetrix/tetrix-1.13.16.1.40c-r2.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-server/tetrix/tetrix-1.13.16.1.40c-r2.ebuild,v 1.11 2007/04/28 16:04:40 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-server/tetrix/tetrix-1.13.16.1.40c-r2.ebuild,v 1.12 2009/06/15 04:24:28 mr_bones_ Exp $
+EAPI=2
inherit eutils toolchain-funcs games
MY_SV=${PV#*.*.*.}
@@ -19,18 +20,16 @@ IUSE=""
DEPEND="net-libs/adns"
-S="${WORKDIR}/${MY_P}"
+S=${WORKDIR}/${MY_P}
-src_unpack() {
- unpack ${A}
- cd ${S}
- epatch ${FILESDIR}/${PV}-droproot.patch
- epatch ${FILESDIR}/${PV}-paths.patch
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-build.patch
sed -i \
-e "s:GENTOO_CONFDIR:${GAMES_SYSCONFDIR}/${PN}:" \
-e "s:GENTOO_STATEDIR:${GAMES_STATEDIR}/${PN}:" \
-e "s:GENTOO_LOGDIR:${GAMES_LOGDIR}:" \
- src/config.h bin/game.conf
+ src/config.h bin/game.conf \
+ || die "sed failed"
}
src_compile() {
@@ -42,16 +41,16 @@ src_install() {
dodoc AUTHORS ChangeLog README README.qirc.spectators
dogamesbin src/tetrix
- insinto ${GAMES_SYSCONFDIR}/${PN}
+ insinto "${GAMES_SYSCONFDIR}"/${PN}
doins bin/*
newinitd "${FILESDIR}"/tetrix.rc tetrix
- keepdir ${GAMES_STATEDIR}/${PN}
- dodir ${GAMES_LOGDIR}
- touch ${D}/${GAMES_LOGDIR}/${PN}.log
+ keepdir "${GAMES_STATEDIR}"/${PN}
+ dodir "${GAMES_LOGDIR}"
+ touch "${D}/${GAMES_LOGDIR}"/${PN}.log
prepgamesdirs
- fowners ${GAMES_USER_DED}:${GAMES_GROUP} ${GAMES_STATEDIR}/${PN}
- fowners ${GAMES_USER_DED}:${GAMES_GROUP} ${GAMES_LOGDIR}/${PN}.log
+ fowners ${GAMES_USER_DED}:${GAMES_GROUP} "${GAMES_STATEDIR}"/${PN}
+ fowners ${GAMES_USER_DED}:${GAMES_GROUP} "${GAMES_LOGDIR}"/${PN}.log
}