Codebase list dopewars / debian/1.5.12-10
Switch to 3.0 (quilt) source format * Switch to 3.0 (quilt) source format * Remove dpatch * Convert patches to DEP-3 Francois Marier 14 years ago
11 changed file(s) with 62 addition(s) and 71 deletion(s). Raw diff Collapse all Expand all
+0
-8
debian/README.source less more
0 README.source
1 -------------
2
3 The Debian package uses dpatch(1) for the modifications of the upstream source.
4 If you want to change something it is best to use the quilt approach as documented
5 in /usr/share/doc/dpatch/README.source.gz
6
7 -- Francois Marier <francois@debian.org> Sat, 07 Nov 2009 16:47:18 +1300
+5
-1
debian/changelog less more
22 * Bump Standards-Version to 3.8.4
33 * Add dependency on ${misc:Depends}
44
5 -- Francois Marier <francois@debian.org> Thu, 11 Feb 2010 09:08:59 +1300
5 * Switch to 3.0 (quilt) source format
6 * Remove dpatch
7 * Convert patches to DEP-3
8
9 -- Francois Marier <francois@debian.org> Thu, 11 Feb 2010 09:28:22 +1300
610
711 dopewars (1.5.12-9) unstable; urgency=high
812
+1
-1
debian/control less more
00 Source: dopewars
11 Section: games
22 Priority: extra
3 Build-Depends: libgtk2.0-dev, libglib2.0-dev, pkg-config, libncurses5-dev, debhelper (>= 7), libsdl1.2-dev, libesd0-dev, autotools-dev, libaudiofile-dev, chrpath, dpatch
3 Build-Depends: libgtk2.0-dev, libglib2.0-dev, pkg-config, libncurses5-dev, debhelper (>= 7), libsdl1.2-dev, libesd0-dev, autotools-dev, libaudiofile-dev, chrpath
44 Maintainer: Debian Games Team <pkg-games-devel@lists.alioth.debian.org>
55 Uploaders: Francois Marier <francois@debian.org>
66 Standards-Version: 3.8.4
+0
-2
debian/patches/00list less more
0 buy_sell_quantities.dpatch
1 CVE-2009-3591.dpatch
+0
-22
debian/patches/CVE-2009-3591.dpatch less more
0 #! /bin/sh /usr/share/dpatch/dpatch-run
1 ## CVE-2009-3591.dpatch by Francois Marier <francois@debian.org>
2 ##
3 ## All lines beginning with `## DP:' are a description of the patch.
4 ## DP: http://dopewars.svn.sourceforge.net/viewvc/dopewars/dopewars/trunk/src/serverside.c?r1=1023&r2=1033&pathrev=1033
5
6 @DPATCH@
7 --- a/src/serverside.c 2008/08/20 16:33:30 1023
8 +++ b/src/serverside.c 2009/10/05 04:11:32 1033
9 @@ -504,6 +504,12 @@
10 break;
11 case C_REQUESTJET:
12 i = atoi(Data);
13 + /* Make sure value is within range */
14 + if (i < 0 || i >= NumLocation) {
15 + dopelog(3, LF_SERVER, _("%s: DENIED jet to invalid location %s"),
16 + GetPlayerName(Play), Data);
17 + break;
18 + }
19 if (Play->EventNum == E_FIGHT || Play->EventNum == E_FIGHTASK) {
20 if (CanRunHere(Play)) {
21 break;
+20
-0
debian/patches/CVE-2009-3591.patch less more
0 Author: Ben Webb <benwebb@users.sf.net>
1 Description: Fix for a Denial of Service against the server
2 Origin: upstream, http://dopewars.svn.sourceforge.net/viewvc/dopewars/dopewars/trunk/src/serverside.c?r1=1023&r2=1033&pathrev=1033
3 Bug-Debian: http://bugs.debian.org/550913
4
5 --- a/src/serverside.c 2008/08/20 16:33:30 1023
6 +++ b/src/serverside.c 2009/10/05 04:11:32 1033
7 @@ -504,6 +504,12 @@
8 break;
9 case C_REQUESTJET:
10 i = atoi(Data);
11 + /* Make sure value is within range */
12 + if (i < 0 || i >= NumLocation) {
13 + dopelog(3, LF_SERVER, _("%s: DENIED jet to invalid location %s"),
14 + GetPlayerName(Play), Data);
15 + break;
16 + }
17 if (Play->EventNum == E_FIGHT || Play->EventNum == E_FIGHTASK) {
18 if (CanRunHere(Play)) {
19 break;
+0
-31
debian/patches/buy_sell_quantities.dpatch less more
0 #! /bin/sh /usr/share/dpatch/dpatch-run
1 ## buy_sell_quantities.dpatch by Francois Marier <francois@debian.org>
2 ##
3 ## All lines beginning with `## DP:' are a description of the patch.
4 ## DP: http://sourceforge.net/tracker/?func=detail&aid=2787591&group_id=11128&atid=111128
5
6 @DPATCH@
7 --- a/src/gui_client/gtk_client.c
8 +++ b/src/gui_client/gtk_client.c
9 @@ -1570,8 +1570,8 @@ static void UpdateDealDialog(void)
10 MaxDrug = CanDrop;
11 }
12
13 - spin_adj = (GtkAdjustment *)gtk_adjustment_new(MaxDrug, 1.0, MaxDrug,
14 - 1.0, 10.0, 10.0);
15 + spin_adj = (GtkAdjustment *)gtk_adjustment_new(MaxDrug, 0.0, MaxDrug,
16 + 1.0, 10.0, 0.0);
17 gtk_spin_button_set_adjustment(GTK_SPIN_BUTTON(DealDialog.amount),
18 spin_adj);
19 gtk_spin_button_set_value(GTK_SPIN_BUTTON(DealDialog.amount), MaxDrug);
20 @@ -1745,8 +1745,8 @@ void DealDrugs(GtkWidget *widget, gpointer data)
21 }
22 label = gtk_label_new(text->str);
23 gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
24 - spin_adj = (GtkAdjustment *)gtk_adjustment_new(1.0, 1.0, 2.0,
25 - 1.0, 10.0, 10.0);
26 + spin_adj = (GtkAdjustment *)gtk_adjustment_new(1.0, 0.0, 2.0,
27 + 1.0, 10.0, 0.0);
28 spinner = DealDialog.amount = gtk_spin_button_new(spin_adj, 1.0, 0);
29 gtk_signal_connect(GTK_OBJECT(spinner), "activate",
30 GTK_SIGNAL_FUNC(DealOKCallback), data);
+30
-0
debian/patches/buy_sell_quantities.patch less more
0 Author: Francois Marier <francois@debian.org>
1 Description: Fix buy/sell quantity selectors
2 Bug: http://sourceforge.net/tracker/?func=detail&aid=2787591&group_id=11128&atid=111128
3 Bug-Debian: http://bugs.debian.org/526235
4 Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/dopewars/+bug/372498
5
6 --- a/src/gui_client/gtk_client.c
7 +++ b/src/gui_client/gtk_client.c
8 @@ -1570,8 +1570,8 @@ static void UpdateDealDialog(void)
9 MaxDrug = CanDrop;
10 }
11
12 - spin_adj = (GtkAdjustment *)gtk_adjustment_new(MaxDrug, 1.0, MaxDrug,
13 - 1.0, 10.0, 10.0);
14 + spin_adj = (GtkAdjustment *)gtk_adjustment_new(MaxDrug, 0.0, MaxDrug,
15 + 1.0, 10.0, 0.0);
16 gtk_spin_button_set_adjustment(GTK_SPIN_BUTTON(DealDialog.amount),
17 spin_adj);
18 gtk_spin_button_set_value(GTK_SPIN_BUTTON(DealDialog.amount), MaxDrug);
19 @@ -1745,8 +1745,8 @@ void DealDrugs(GtkWidget *widget, gpointer data)
20 }
21 label = gtk_label_new(text->str);
22 gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
23 - spin_adj = (GtkAdjustment *)gtk_adjustment_new(1.0, 1.0, 2.0,
24 - 1.0, 10.0, 10.0);
25 + spin_adj = (GtkAdjustment *)gtk_adjustment_new(1.0, 0.0, 2.0,
26 + 1.0, 10.0, 0.0);
27 spinner = DealDialog.amount = gtk_spin_button_new(spin_adj, 1.0, 0);
28 gtk_signal_connect(GTK_OBJECT(spinner), "activate",
29 GTK_SIGNAL_FUNC(DealOKCallback), data);
+2
-0
debian/patches/series less more
0 buy_sell_quantities.patch
1 CVE-2009-3591.patch
+3
-6
debian/rules less more
55 #export DH_VERBOSE=1
66
77 export SED=sed # work-around for broken libtool
8
9 include /usr/share/dpatch/dpatch.make
108
119 # Stuff taken from autotools-dev
1210 export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
2725
2826 touch build-stamp
2927
30 clean: clean1 unpatch
31 clean1:
28 clean:
3229 dh_testdir
3330 dh_testroot
3431 rm -f build-stamp
4643 -test -r /usr/share/misc/config.guess && \
4744 cp -f /usr/share/misc/config.guess config.guess
4845
49 install: patch-stamp build
46 install: build
5047 dh_testdir
5148 dh_testroot
5249 dh_prep
9087 dh_builddeb
9188
9289 binary: binary-indep binary-arch
93 .PHONY: build clean binary-indep binary-arch binary install patch unpatch clean1
90 .PHONY: build clean binary-indep binary-arch binary install
+1
-0
debian/source/format less more
0 3.0 (quilt)