[springlobby] branch master updated (0f4bbf5 - 7f42fa0)

2015-04-17 Thread Markus Koschany
This is an automated email from the git hooks/post-receive script.

apo-guest pushed a change to branch master
in repository springlobby.

  from  0f4bbf5   Remove springsettings.6 man page.
   new  ccb3b05   Remove BSL-1.0 standalone license paragraph.
   new  7f42fa0   BSD-2-clause applies to complete src/lsl directory

The 2 revisions listed above as new are entirely new to this
repository and will be described in separate emails.  The revisions
listed as adds were already present in the repository and have only
been added to this reference.


Summary of changes:
 debian/copyright | 40 +---
 1 file changed, 1 insertion(+), 39 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/springlobby.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits


[wesnoth] 01/01: Pull af61f9fd from upstream to fix CVE-2015-0844

2015-04-17 Thread Gerfried Fuchs
This is an automated email from the git hooks/post-receive script.

rhonda pushed a commit to branch squeeze
in repository wesnoth.

commit f17e501c8aca07d623996f930ecb588a4de1f64e
Author: Rhonda D'Vine rho...@debian.org
Date:   Fri Apr 17 15:11:05 2015 +0200

Pull af61f9fd from upstream to fix CVE-2015-0844
---
 debian/changelog   |  7 +++
 debian/control |  2 +-
 debian/control.in  |  2 +-
 .../af61f9fdd15cd439da9e2fe5fa39d174c923eaae.patch | 53 ++
 debian/patches/series  |  1 +
 5 files changed, 63 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 44105d0..4496416 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+wesnoth-1.8 (1:1.8.5-1+deb6u1) squeeze-lts; urgency=high
+
+  * Pull af61f9fd from upstream to fix Private file disclosure through
+get_wml_location() (CVE-2015-0844)
+
+ -- Rhonda D'Vine rho...@debian.org  Fri, 17 Apr 2015 14:26:30 +0200
+
 wesnoth-1.8 (1:1.8.5-1) unstable; urgency=low
 
   * New upstream stable release.
diff --git a/debian/control b/debian/control
index a341bfb..eaa0f81 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends: debhelper (= 7), quilt, libsdl-image1.2-dev, 
libfreetype6-dev,
   libboost-iostreams-dev, libboost-test-dev, libboost-regex-dev,
   libboost-serialization-dev, libpango1.0-dev, automake, liblua5.1-0-dev
 Standards-Version: 3.9.1
-Uploaders: Gerfried Fuchs rho...@debian.at
+Uploaders: Rhonda D'Vine rho...@debian.org
 Homepage: http://wesnoth.org/
 Vcs-Git: git://git.debian.org/git/pkg-games/wesnoth.git
 Vcs-Browser: http://git.debian.org/?p=pkg-games/wesnoth.git;a=summary
diff --git a/debian/control.in b/debian/control.in
index 9fa259f..f7fcae8 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -8,7 +8,7 @@ Build-Depends: debhelper (= 7), quilt, libsdl-image1.2-dev, 
libfreetype6-dev,
   libboost-iostreams-dev, libboost-test-dev, libboost-regex-dev,
   libboost-serialization-dev, libpango1.0-dev, automake, liblua5.1-0-dev
 Standards-Version: 3.9.1
-Uploaders: Gerfried Fuchs rho...@debian.at
+Uploaders: Rhonda D'Vine rho...@debian.org
 Homepage: http://wesnoth.org/
 Vcs-Git: git://git.debian.org/git/pkg-games/wesnoth.git
 Vcs-Browser: http://git.debian.org/?p=pkg-games/wesnoth.git;a=summary
diff --git a/debian/patches/af61f9fdd15cd439da9e2fe5fa39d174c923eaae.patch 
b/debian/patches/af61f9fdd15cd439da9e2fe5fa39d174c923eaae.patch
new file mode 100644
index 000..e8077db
--- /dev/null
+++ b/debian/patches/af61f9fdd15cd439da9e2fe5fa39d174c923eaae.patch
@@ -0,0 +1,53 @@
+From af61f9fdd15cd439da9e2fe5fa39d174c923eaae Mon Sep 17 00:00:00 2001
+From: Ignacio R. Morelle shad...@wesnoth.org
+Date: Fri, 16 May 2014 01:45:18 -0400
+Subject: [PATCH] fs: Use game data path to resolve ./ in the absence of a
+ current_dir
+
+Fixes a file content disclosure bug (#22042) affecting functionality
+relying on the get_wml_location() function and not passing a non-empty
+value for the current_dir parameter.
+
+See https://gna.org/bugs/?22042 for details.
+
+This is a candidate for the 1.10 and 1.12 branches.
+
+(Backported from master, commit 314425ab0e57b32909d324f7d4bf213d62cbd3b5.)
+---
+ changelog  |  1 +
+ src/filesystem.cpp | 14 --
+ 2 files changed, 13 insertions(+), 2 deletions(-)
+
+--- a/src/filesystem.cpp
 b/src/filesystem.cpp
+@@ -1063,8 +1063,18 @@ std::string get_wml_location(const std::
+   else if (filename.size() = 2  filename[0] == '.'  filename[1] == 
'/')
+   {
+   // If the filename begins with a ./, look in the same 
directory
+-  // as the file currrently being preprocessed.
+-  result = current_dir + filename.substr(2);
++  // as the file currently being preprocessed.
++
++  if (!current_dir.empty())
++  {
++  result = current_dir;
++  }
++  else
++  {
++  result = game_config::path;
++  }
++
++  result += filename.substr(2);
+   }
+   else if (!game_config::path.empty())
+   result = game_config::path + /data/ + filename;
+--- a/changelog
 b/changelog
+@@ -24,6 +24,7 @@ Version 1.8.5:
+* Fix bug #15960 again, making Cancel a separate action and not just
+  a duplicate of OK.
+* Fix crash when doing teleport+attack to a fogged village
++   * Fix bug #22042: filesystem content disclosure issue affecting Lua APIs
+ 
+ Version 1.8.4:
+  * AI:
diff --git a/debian/patches/series b/debian/patches/series
index 57b6465..9b0fc18 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 02wesnoth-nolog-desktop-file
 03wesnothd-name
+af61f9fdd15cd439da9e2fe5fa39d174c923eaae.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on 

[wesnoth] branch squeeze created (now f17e501)

2015-04-17 Thread Gerfried Fuchs
This is an automated email from the git hooks/post-receive script.

rhonda pushed a change to branch squeeze
in repository wesnoth.

at  f17e501   Pull af61f9fd from upstream to fix CVE-2015-0844

This branch includes the following new commits:

   new  f17e501   Pull af61f9fd from upstream to fix CVE-2015-0844

The 1 revisions listed above as new are entirely new to this
repository and will be described in separate emails.  The revisions
listed as adds were already present in the repository and have only
been added to this reference.


-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/wesnoth.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits


[springlobby] 01/02: Remove BSL-1.0 standalone license paragraph.

2015-04-17 Thread Markus Koschany
This is an automated email from the git hooks/post-receive script.

apo-guest pushed a commit to branch master
in repository springlobby.

commit ccb3b053da7ffbf525257be4998c9a1d0a8b8b0f
Author: Markus Koschany a...@gambaru.de
Date:   Thu Apr 16 20:24:42 2015 +0200

Remove BSL-1.0 standalone license paragraph.
---
 debian/copyright | 25 -
 1 file changed, 25 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index a4d602f..d1815d0 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -270,31 +270,6 @@ License: wxWidgets-license
 Comment:
  The wxWidgets license is identical to the wxWindows license.
 
-License: BSL-1.0
- Boost Software License - Version 1.0 - August 17th, 2003
- .
- Permission is hereby granted, free of charge, to any person or organization
- obtaining a copy of the software and accompanying documentation covered by
- this license (the Software) to use, reproduce, display, distribute,
- execute, and transmit the Software, and to prepare derivative works of the
- Software, and to permit third-parties to whom the Software is furnished to
- do so, all subject to the following:
- .
- The copyright notices in the Software and this entire statement, including
- the above license grant, this restriction and the following disclaimer,
- must be included in all copies of the Software, in whole or in part, and
- all derivative works of the Software, unless such copies or derivative
- works are solely in the form of machine-executable object code generated by
- a source language processor.
- .
- THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
- SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
- FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
- ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- DEALINGS IN THE SOFTWARE.
-
 License: CeCILL-v2.0
  .
CeCILL FREE SOFTWARE LICENSE AGREEMENT

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/springlobby.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits


[wesnoth] annotated tag debian/1.8.5-1+deb6u1 created (now 42632f2)

2015-04-17 Thread Gerfried Fuchs
This is an automated email from the git hooks/post-receive script.

rhonda pushed a change to annotated tag debian/1.8.5-1+deb6u1
in repository wesnoth.

at  42632f2   (tag)
   tagging  f17e501c8aca07d623996f930ecb588a4de1f64e (commit)
  replaces  debian/1.8.5-1
 tagged by  Rhonda D'Vine
on  Fri Apr 17 19:41:15 2015 +0200

- Log -
Uploaded to squeeze-lts
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQEcBAABCAAGBQJVMUY0AAoJEDH85+fdB5RhDs4H+we+rFz4P+oEBNIj4OLOg2n6
C2qi8/tqhHafq484t0KvFD3pXzyn6lSmGj7XtNBEs8BzlMOx0fdmdA1dWWwm6bJ2
ttaF0T8GksmDwBp/rKJFv/+lNUuvI96z9tugzTTYv8aVC3aKRIwmAiGMvliOQN5b
r5YyMUJ+D1EXs8RstnNTSZMDqGhVqokmNsimmXANXBk8MJDIr7lenMxB81I5n+J1
k9WjlbnyyhuZw/OE31Dv7yjBPnaltB//FXymbyYvh740jgKhfOKP3qp0Lbyg9ln6
xBdW615KlOGfEu8Fbx38bLgbWgqvYrq0VqoiT9zBvPSrB+IEsMbffddH5Q5rz20=
=jOgi
-END PGP SIGNATURE-

Rhonda D'Vine (1):
  Pull af61f9fd from upstream to fix CVE-2015-0844

---

No new revisions were added by this update.

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/wesnoth.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits


[freeciv] 01/03: Suggest freeciv instead of obsolete freeciv-client

2015-04-17 Thread Markus Koschany
This is an automated email from the git hooks/post-receive script.

apo-guest pushed a commit to branch experimental
in repository freeciv.

commit 42e2ab2e530dc2751e1450f96bfb7d331615487e
Author: Markus Koschany a...@gambaru.de
Date:   Fri Apr 17 23:14:26 2015 +0200

Suggest freeciv instead of obsolete freeciv-client
---
 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index 26d7981..22e8b72 100644
--- a/debian/control
+++ b/debian/control
@@ -147,7 +147,7 @@ Depends:
  ${misc:Depends},
  ${shlibs:Depends}
 Suggests:
- freeciv-client
+ freeciv
 Description: Civilization turn based strategy game (server files)
  Freeciv is a free clone of the turn based strategy game Civilization.
  In this game, each player becomes leader of a civilisation, fighting to

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/freeciv.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits


[freeciv] 02/03: Improve DEP-3 header.

2015-04-17 Thread Markus Koschany
This is an automated email from the git hooks/post-receive script.

apo-guest pushed a commit to branch experimental
in repository freeciv.

commit 4e2bb2c90a0940344582a3bf69eedc6ebeaff34a
Author: Markus Koschany a...@gambaru.de
Date:   Fri Apr 17 23:17:49 2015 +0200

Improve DEP-3 header.
---
 debian/patches/themes_sdl_use_system_fonts.patch | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/debian/patches/themes_sdl_use_system_fonts.patch 
b/debian/patches/themes_sdl_use_system_fonts.patch
index fbb56fd..1d2ba5d 100644
--- a/debian/patches/themes_sdl_use_system_fonts.patch
+++ b/debian/patches/themes_sdl_use_system_fonts.patch
@@ -2,6 +2,9 @@ From: Debian Games Team 
pkg-games-de...@lists.alioth.debian.org
 Date: Sun, 19 Oct 2014 22:30:23 +0200
 Subject: themes_sdl_use_system_fonts
 
+Use Debian's system fonts.
+
+Forwarded: not-needed
 ---
  data/themes/gui-sdl/human/theme.themespec | 8 
  1 file changed, 4 insertions(+), 4 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/freeciv.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits


[freeciv] branch experimental updated (a619c6b - 75017fc)

2015-04-17 Thread Markus Koschany
This is an automated email from the git hooks/post-receive script.

apo-guest pushed a change to branch experimental
in repository freeciv.

  from  a619c6b   Revert freeciv: remove freeciv-data dependency already 
provided by freeciv-client-gtk
   new  42e2ab2   Suggest freeciv instead of obsolete freeciv-client
   new  4e2bb2c   Improve DEP-3 header.
   new  75017fc   Mention freeciv-client replacement.

The 3 revisions listed above as new are entirely new to this
repository and will be described in separate emails.  The revisions
listed as adds were already present in the repository and have only
been added to this reference.


Summary of changes:
 debian/changelog | 1 +
 debian/control   | 2 +-
 debian/patches/themes_sdl_use_system_fonts.patch | 3 +++
 3 files changed, 5 insertions(+), 1 deletion(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/freeciv.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits


[freeciv] 03/03: Mention freeciv-client replacement.

2015-04-17 Thread Markus Koschany
This is an automated email from the git hooks/post-receive script.

apo-guest pushed a commit to branch experimental
in repository freeciv.

commit 75017fc26c0935e3506d3d985e7459fbab060bc2
Author: Markus Koschany a...@gambaru.de
Date:   Fri Apr 17 23:22:28 2015 +0200

Mention freeciv-client replacement.
---
 debian/changelog | 1 +
 1 file changed, 1 insertion(+)

diff --git a/debian/changelog b/debian/changelog
index 873a4cc..8716842 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ freeciv (2.5.0-2) UNRELEASED; urgency=medium
   * debian/control:
  - Remove all Provides fields.
  - Replace virtual freeciv-sound package with freeciv-sound-standard.
+ - Replace virtual freeciv-client package with freeciv.
   * freeciv-client-sdl: Suggest freeciv-client-extras.
 
  -- Markus Koschany a...@gambaru.de  Mon, 13 Apr 2015 19:54:16 +0200

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/freeciv.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits