[SCM] triplea packaging branch, master, updated. debian/1.5.2.1-1-4-gd547d70

2012-12-11 Thread Scott Howard
The following commit has been merged in the master branch:
commit 899d84b2f18a094e6ef2dc1819606baacb089597
Merge: aad90a867289cf980d471cd2d4e205ea079bc351 
58e0877981778342b80b58e89252cf6e92714d60
Author: Scott Howard showard...@gmail.com
Date:   Wed Dec 5 21:03:26 2012 -0500

Merge tag 'upstream/1.6.1.2'

Upstream version 1.6.1.2


-- 
triplea packaging

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


[SCM] triplea packaging branch, master, updated. debian/1.5.2.1-1-4-gd547d70

2012-12-11 Thread Scott Howard
The following commit has been merged in the master branch:
commit d547d70091646f94b495748b2aa08daba5713e12
Author: Scott Howard showard...@gmail.com
Date:   Wed Dec 5 21:50:48 2012 -0500

New upstream release. Refreshed patches, compile_jar.patch removed 
(accepted upstream)

diff --git a/debian/changelog b/debian/changelog
index 8616bf8..56f5af1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,13 @@
+triplea (1.6.1.2-1) experimental; urgency=low
+
+  * New upstream release.
+  * Refreshed patches, compile_jar.patch removed (accepted upstream)
+
+ -- Scott Howard show...@debian.org  Wed, 05 Dec 2012 21:15:14 -0500
+
 triplea (1.5.2.1-1) unstable; urgency=low
 
-  * New upstream release
+  * New upstream release.
 
  -- Scott Howard show...@debian.org  Sun, 10 Jun 2012 09:29:40 -0400
 
diff --git a/debian/patches/compile_jar.patch b/debian/patches/compile_jar.patch
deleted file mode 100644
index ad2fa3e..000
--- a/debian/patches/compile_jar.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-Description: Fixes build so it outputs a usable jar.
-Author: Scott Howard show...@debian.org
-
-Index: triplea/build.xml
-===
 triplea.orig/build.xml 2012-06-10 11:09:26.827684953 -0400
-+++ triplea/build.xml  2012-06-10 11:10:17.615686160 -0400
-@@ -15,6 +15,7 @@
- 
-   !-- this path does not have junit on it --
-   path id=src.classpath
-+  pathelement path=lib\gnumail.jar/
- pathelement path=lib\mailapi.jar/
- pathelement path=lib\smtp.jar/
- pathelement path=lib\activation.jar/
-@@ -50,7 +51,7 @@
-   /target
- 
-   !-- Compile --
--  target name=compile description=Compile the source files and copy 
over the resource files
-+  target name=compile_orig description=Compile the source files and 
copy over the resource files
- 
-   !-- we require jdk 1.5 or greater --
-   fail message=jdk 1.5 or greater required, you are currently 
using: ${ant.java.version}
-@@ -295,6 +296,10 @@
-   !-- zip --
-   target name=zip depends=compile description=create a zip file for 
all end users
-   mkdir dir=release /
-+  /target
-+  !-- Debian compile --
-+  target name=compile depends=compile_orig description=compile 
classes into .jar
-+  mkdir dir=release /
- 
-   mkdir dir=bin/
-   delete file=bin/triplea.jar /
-@@ -318,16 +323,16 @@
-   /manifest
-   /jar
-   delete dir=deleteme/
--
-+!--
-   zip 
zipfile=release/triplea_${triplea.version}_all_platforms.zip compress=true
--
-+--
-   !--zipfileset dir=lib/ 
prefix=triplea_${triplea.version}/lib/
-   include name=**/*.jar /
-   include name=**/*.zip /
- 
-   exclude name=**/junit.jar /
-   /zipfileset --
--
-+!--
-   zipfileset dir=doc/ 
prefix=triplea_${triplea.version}/doc/
-   include name=**/*.* /
-   /zipfileset
-@@ -378,6 +383,7 @@
- 
- 
-   /zip
-+--
-   /target
- 
-   !-- zip --
diff --git a/debian/patches/launcher_scripts.patch 
b/debian/patches/launcher_scripts.patch
index d8b8438..627d875 100644
--- a/debian/patches/launcher_scripts.patch
+++ b/debian/patches/launcher_scripts.patch
@@ -3,8 +3,8 @@ Author: Scott Howard show...@debian.org
 
 Index: triplea/run-server.sh
 ===
 triplea.orig/run-server.sh 2012-06-10 11:09:26.807684953 -0400
-+++ triplea/run-server.sh  2012-06-10 11:12:49.107689761 -0400
+--- triplea.orig/run-server.sh 2012-06-10 15:09:39.0 -0400
 triplea/run-server.sh  2012-12-05 21:24:54.560929551 -0500
 @@ -1,2 +1,3 @@
 -cd $(dirname $0)
 +#!/bin/sh
@@ -12,8 +12,8 @@ Index: triplea/run-server.sh
  java -server  -Xmx192m -classpath bin/triplea.jar:lib/derby_10_1_2.jar 
-Dtriplea.lobby.port=3303 -Dtriplea.lobby.console=true  
games.strategy.engine.lobby.server.LobbyServer 
 Index: triplea/triplea_unix.sh
 ===
 triplea.orig/triplea_unix.sh   2012-06-10 11:09:26.787684952 -0400
-+++ triplea/triplea_unix.sh2012-06-10 11:15:47.811694008 -0400
+--- triplea.orig/triplea_unix.sh   2012-12-05 21:03:27.164935807 -0500
 triplea/triplea_unix.sh2012-12-05 21:24:54.560929551 -0500
 @@ -7,8 +7,7 @@
  exit
  fi
@@ -23,4 +23,4 @@ Index: triplea/triplea_unix.sh
 +cd /usr/share/triplea
  
  
- java -Xmx512m -cp bin/patch.jar:bin/triplea.jar 
games.strategy.engine.framework.GameRunner
+ java -Xmx640m -cp bin/patch.jar:bin/triplea.jar 
games.strategy.engine.framework.GameRunner
diff --git a/debian/patches/macwrappers.patch b/debian/patches/macwrappers.patch
index 901eb1a..7ed8f45 100644
--- 

[SCM] triplea packaging branch, pristine-tar, updated. 2adb74250e363ece859011af2590f4f5ab7cc046

2012-12-11 Thread Scott Howard
The following commit has been merged in the pristine-tar branch:
commit 2adb74250e363ece859011af2590f4f5ab7cc046
Author: Scott Howard showard...@gmail.com
Date:   Wed Dec 5 21:03:26 2012 -0500

pristine-tar data for triplea_1.6.1.2.orig.tar.gz

diff --git a/triplea_1.6.1.2.orig.tar.gz.delta 
b/triplea_1.6.1.2.orig.tar.gz.delta
new file mode 100644
index 000..0aa5410
Binary files /dev/null and b/triplea_1.6.1.2.orig.tar.gz.delta differ
diff --git a/triplea_1.6.1.2.orig.tar.gz.id b/triplea_1.6.1.2.orig.tar.gz.id
new file mode 100644
index 000..85c60ea
--- /dev/null
+++ b/triplea_1.6.1.2.orig.tar.gz.id
@@ -0,0 +1 @@
+5fbd40fa217171f838fd1d55846fe14f80dfea00

-- 
triplea packaging

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


[SCM] triplea packaging branch, master, updated. debian/1.5.2.1-1-4-gd547d70

2012-12-11 Thread Scott Howard
The following commit has been merged in the master branch:
commit aad90a867289cf980d471cd2d4e205ea079bc351
Author: Scott Howard showard...@gmail.com
Date:   Wed Sep 5 14:21:02 2012 -0400

added new rulebook pdf

diff --git a/debian/triplea.install b/debian/triplea.install
index 2fb616e..831f3c4 100644
--- a/debian/triplea.install
+++ b/debian/triplea.install
@@ -7,6 +7,7 @@ maps/* usr/share/triplea/maps
 data/* usr/share/triplea/data
 sounds/* usr/share/triplea/sounds
 readme.html usr/share/doc/triplea
+TripleaA_RuleBook.pdf usr/share/doc/triplea
 triplea usr/games
 debian/icons/* usr/share/icons/hicolor
 debian/triplea.desktop usr/share/applications

-- 
triplea packaging

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


[SCM] triplea packaging annotated tag, debian/1.6.1.2-1, created. debian/1.6.1.2-1

2012-12-11 Thread Scott Howard
The annotated tag, debian/1.6.1.2-1 has been created
at  5b947ba9c9afbaa73515e3aa3e4a160340dae0d9 (tag)
   tagging  d547d70091646f94b495748b2aa08daba5713e12 (commit)
  replaces  debian/1.5.2.1-1
 tagged by  Scott Howard
on  Wed Dec 5 21:59:06 2012 -0500

- Shortlog 
Debian release 1.6.1.2-1

Scott Howard (4):
  added new rulebook pdf
  Imported Upstream version 1.6.1.2
  Merge tag 'upstream/1.6.1.2'
  New upstream release. Refreshed patches, compile_jar.patch removed 
(accepted upstream)

---

-- 
triplea packaging

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


[SCM] triplea packaging annotated tag, upstream/1.6.1.2, created. upstream/1.6.1.2

2012-12-11 Thread Scott Howard
The annotated tag, upstream/1.6.1.2 has been created
at  fe61860dab3a3aca508462e154751d6f277e112f (tag)
   tagging  58e0877981778342b80b58e89252cf6e92714d60 (commit)
  replaces  upstream/1.5.2.1
 tagged by  Scott Howard
on  Wed Dec 5 21:03:26 2012 -0500

- Shortlog 
Upstream version 1.6.1.2

Scott Howard (1):
  Imported Upstream version 1.6.1.2

---

-- 
triplea packaging

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


[SCM] 100% pure-Java implementation of Ruby branch, master, updated. debian/1.5.6-4-1-g269541e

2012-12-11 Thread Martin Quinson
The following commit has been merged in the master branch:
commit 269541e69d0471aaf41bcf8006feb5f434aa3be5
Author: Martin Quinson martin.quin...@loria.fr
Date:   Tue Dec 11 00:25:40 2012 +0100

New patch to drop MurmurHash and use SipHash instead to fix CVE-2012-5370

diff --git a/debian/changelog b/debian/changelog
index cf38d87..3bf73b9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+jruby (1.5.6-5) UNRELEASED; urgency=low
+
+  * Team upload.
+  * Add patch for CVE-2012-5370: Use SipHash instead of MurmurHash
+(that is vulnerable to DoS attacks). (Closes: #694694)
+
+ -- Martin Quinson mquin...@debian.org  Tue, 11 Dec 2012 00:07:45 +0100
+
 jruby (1.5.6-4) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/patches/0009-CVE-2012-5370.patch 
b/debian/patches/0009-CVE-2012-5370.patch
new file mode 100644
index 000..677a058
--- /dev/null
+++ b/debian/patches/0009-CVE-2012-5370.patch
@@ -0,0 +1,325 @@
+Drop the MurmurHash to compute hashes, as it is vulnerable to a DoS:
+A specially-crafted set of keys could trigger Murmur hash function
+collisions, which degrade hash table items insert performance by
+changing hash table operations complexity from an expected/average
+O(n) to the worst case O(n^2). Reporters were able to find colliding
+strings efficiently using equivalent substrings.
+
+Use SipHash instead, as it was done in the C implementation of Ruby.
+
+Index: jruby-1.5.6/src/org/jruby/util/MurmurHash.java
+===
+--- jruby-1.5.6.orig/src/org/jruby/util/MurmurHash.java2012-12-10 
23:38:21.827577622 +0100
 /dev/null  1970-01-01 00:00:00.0 +
+@@ -1,62 +0,0 @@
+-package org.jruby.util;
+-
+-public class MurmurHash {
+-// Based on Murmurhash 2.0 Java port at 
http://dmy999.com/article/50/murmurhash-2-java-port
+-// 2011-12-05: Modified by Hiroshi Nakamura n...@ruby-lang.org
+-// - signature change to use offset
+-//   hash(byte[] data, int seed) to hash(byte[] src, int offset, int 
length, int seed)
+-// - extract 'm' and 'r' as murmurhash2.0 constants
+-
+-// Ported by Derek Young from the C version (specifically the 
endian-neutral
+-// version) from:
+-//   http://murmurhash.googlepages.com/
+-//
+-// released to the public domain - dmy...@gmail.com
+-
+-// 'm' and 'r' are mixing constants generated offline.
+-// They're not really 'magic', they just happen to work well.
+-private static final int MURMUR2_MAGIC = 0x5bd1e995;
+-// CRuby 1.9 uses 16 but original C++ implementation uses 24 with above 
Magic.
+-private static final int MURMUR2_R = 24;
+-
+-@SuppressWarnings(fallthrough)
+-public static int hash32(byte[] src, int offset, int length, int seed) {
+-// Initialize the hash to a 'random' value
+-int h = seed ^ length;
+-
+-int i = offset;
+-int len = length;
+-while (len = 4) {
+-int k = src[i + 0]  0xFF;
+-k |= (src[i + 1]  0xFF)  8;
+-k |= (src[i + 2]  0xFF)  16;
+-k |= (src[i + 3]  0xFF)  24;
+-
+-k *= MURMUR2_MAGIC;
+-k ^= k  MURMUR2_R;
+-k *= MURMUR2_MAGIC;
+-
+-h *= MURMUR2_MAGIC;
+-h ^= k;
+-
+-i += 4;
+-len -= 4;
+-}
+-
+-switch (len) {
+-case 3:
+-h ^= (src[i + 2]  0xFF)  16;
+-case 2:
+-h ^= (src[i + 1]  0xFF)  8;
+-case 1:
+-h ^= (src[i + 0]  0xFF);
+-h *= MURMUR2_MAGIC;
+-}
+-
+-h ^= h  13;
+-h *= MURMUR2_MAGIC;
+-h ^= h  15;
+-
+-return h;
+-}
+-}
+Index: jruby-1.5.6/src/org/jruby/RubyString.java
+===
+--- jruby-1.5.6.orig/src/org/jruby/RubyString.java 2012-12-10 
23:38:21.827577622 +0100
 jruby-1.5.6/src/org/jruby/RubyString.java  2012-12-10 23:43:27.737909143 
+0100
+@@ -91,7 +91,7 @@
+ import org.jruby.runtime.marshal.UnmarshalStream;
+ import org.jruby.util.ByteList;
+ import org.jruby.util.ConvertBytes;
+-import org.jruby.util.MurmurHash;
++import org.jruby.util.SipHash;
+ import org.jruby.util.Numeric;
+ import org.jruby.util.Pack;
+ import org.jruby.util.Sprintf;
+@@ -1025,7 +1025,7 @@
+ }
+ 
+ private int strHashCode(Ruby runtime) {
+-int hash = MurmurHash.hash32(value.getUnsafeBytes(), 
value.getBegin(), value.getRealSize(), runtime.getHashSeed());
++int hash = SipHash.hash32(value.getUnsafeBytes(), value.getBegin(), 
value.getRealSize(), runtime.getHashSeed());
+ if (runtime.is1_9()) {
+ hash ^= (value.getEncoding().isAsciiCompatible()  
scanForCodeRange() == CR_7BIT ? 0 : value.getEncoding().getIndex());
+ }
+Index: jruby-1.5.6/src/org/jruby/util/SipHash.java
+===
+--- /dev/null  1970-01-01 

spam related white list

2012-12-11 Thread Torsten Werner
Hi,

I've added these senders to the white list for pkg-java-maintainers und
pkg-java-commits to ease the moderater's job:
^.+@alioth.debian.org
^.+@debian.org
^.+@canonical.com
^.+@kubuntu.org
^.+@ubuntu.com

And I have whitelisted the [SCM] subject for pkg-java-commits if I got the
syntax correctly.

Keep up the good work!
Torsten
___
pkg-java-commits mailing list
pkg-java-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[SCM] 100% pure-Java implementation of Ruby branch, master, updated. debian/1.5.6-4-3-g8d20c64

2012-12-11 Thread Martin Quinson
The following commit has been merged in the master branch:
commit 8d20c649d57dc729dfbb9aaa3228a09fa9440344
Author: Martin Quinson martin.quin...@loria.fr
Date:   Tue Dec 11 20:54:46 2012 +0100

also ignore quilt metadata

diff --git a/.gitignore b/.gitignore
index 3ed3dd2..5d326df 100644
--- a/.gitignore
+++ b/.gitignore
@@ -48,4 +48,5 @@ jruby-findbugs.html
 test/testapp/testapp
 glob_test
 spaces test
-.DS_Store
\ No newline at end of file
+.DS_Store
+.pc

-- 
100% pure-Java implementation of Ruby

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


[SCM] 100% pure-Java implementation of Ruby branch, master, updated. debian/1.5.6-4-3-g8d20c64

2012-12-11 Thread Martin Quinson
The following commit has been merged in the master branch:
commit 7768f59d2bb281b2fa65241b68d34407ff187ee7
Author: Martin Quinson martin.quin...@loria.fr
Date:   Tue Dec 11 20:54:05 2012 +0100

adapt my patch by using PerlHash instead of SipHash, as it is done upstream

diff --git a/debian/changelog b/debian/changelog
index 3bf73b9..0255bd8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 jruby (1.5.6-5) UNRELEASED; urgency=low
 
   * Team upload.
-  * Add patch for CVE-2012-5370: Use SipHash instead of MurmurHash
+  * Add patch for CVE-2012-5370: Use PerlHash instead of MurmurHash
 (that is vulnerable to DoS attacks). (Closes: #694694)
+[Patch adapted from 5e4aab28 upstream]
 
  -- Martin Quinson mquin...@debian.org  Tue, 11 Dec 2012 00:07:45 +0100
 
diff --git a/debian/patches/0009-CVE-2012-5370.patch 
b/debian/patches/0009-CVE-2012-5370.patch
index 677a058..6f725f8 100644
--- a/debian/patches/0009-CVE-2012-5370.patch
+++ b/debian/patches/0009-CVE-2012-5370.patch
@@ -5,11 +5,14 @@ changing hash table operations complexity from an 
expected/average
 O(n) to the worst case O(n^2). Reporters were able to find colliding
 strings efficiently using equivalent substrings.
 
-Use SipHash instead, as it was done in the C implementation of Ruby.
+Use PerlHash instead, as it was done upstream (see commit
+5e4aab28b26fd127112b76fabfac9a33b64caf77 of git://jruby.org/jruby.git)
+instead of the SipHash that is used in the C implementation of Ruby,
+for performance reasons.
 
-Index: jruby-1.5.6/src/org/jruby/util/MurmurHash.java
+Index: jruby/src/org/jruby/util/MurmurHash.java
 ===
 jruby-1.5.6.orig/src/org/jruby/util/MurmurHash.java2012-12-10 
23:38:21.827577622 +0100
+--- jruby.orig/src/org/jruby/util/MurmurHash.java  2012-12-11 
20:29:23.666433052 +0100
 +++ /dev/null  1970-01-01 00:00:00.0 +
 @@ -1,62 +0,0 @@
 -package org.jruby.util;
@@ -74,16 +77,16 @@ Index: jruby-1.5.6/src/org/jruby/util/MurmurHash.java
 -return h;
 -}
 -}
-Index: jruby-1.5.6/src/org/jruby/RubyString.java
+Index: jruby/src/org/jruby/RubyString.java
 ===
 jruby-1.5.6.orig/src/org/jruby/RubyString.java 2012-12-10 
23:38:21.827577622 +0100
-+++ jruby-1.5.6/src/org/jruby/RubyString.java  2012-12-10 23:43:27.737909143 
+0100
+--- jruby.orig/src/org/jruby/RubyString.java   2012-12-11 20:29:23.650433034 
+0100
 jruby/src/org/jruby/RubyString.java2012-12-11 20:49:48.895686092 
+0100
 @@ -91,7 +91,7 @@
  import org.jruby.runtime.marshal.UnmarshalStream;
  import org.jruby.util.ByteList;
  import org.jruby.util.ConvertBytes;
 -import org.jruby.util.MurmurHash;
-+import org.jruby.util.SipHash;
++import org.jruby.util.PerlHash;
  import org.jruby.util.Numeric;
  import org.jruby.util.Pack;
  import org.jruby.util.Sprintf;
@@ -92,234 +95,36 @@ Index: jruby-1.5.6/src/org/jruby/RubyString.java
  
  private int strHashCode(Ruby runtime) {
 -int hash = MurmurHash.hash32(value.getUnsafeBytes(), 
value.getBegin(), value.getRealSize(), runtime.getHashSeed());
-+int hash = SipHash.hash32(value.getUnsafeBytes(), value.getBegin(), 
value.getRealSize(), runtime.getHashSeed());
++int hash = PerlHash.hash32(runtime.getHashSeed(), 
value.getUnsafeBytes(), value.getBegin(), value.getRealSize());
  if (runtime.is1_9()) {
  hash ^= (value.getEncoding().isAsciiCompatible()  
scanForCodeRange() == CR_7BIT ? 0 : value.getEncoding().getIndex());
  }
-Index: jruby-1.5.6/src/org/jruby/util/SipHash.java
+Index: jruby/src/org/jruby/util/PerlHash.java
 ===
 --- /dev/null  1970-01-01 00:00:00.0 +
-+++ jruby-1.5.6/src/org/jruby/util/SipHash.java2012-12-10 
23:51:14.867456445 +0100
-@@ -0,0 +1,190 @@
 jruby/src/org/jruby/util/PerlHash.java 2012-12-11 20:42:32.429215037 
+0100
+@@ -0,0 +1,24 @@
 +package org.jruby.util;
 +
 +/**
-+ * Original author: a href=mailto:martin.boss...@googlemail.com;Martin 
Bosslet/a
-+ * Original license: 
-+ *   Copyright (c) 2012 Martin Boßlet
-+ *   
-+ *   Permission is hereby granted, free of charge, to any person obtaining
-+ *   a copy of this software and associated documentation files (the
-+ *   Software), to deal in the Software without restriction, including
-+ *   without limitation the rights to use, copy, modify, merge, publish,
-+ *   distribute, sublicense, and/or sell copies of the Software, and to
-+ *   permit persons to whom the Software is furnished to do so, subject to
-+ *   the following conditions:
-+ *   
-+ *   The above copyright notice and this permission notice shall be
-+ *   included in all copies or substantial portions of the Software.
-+ *   
-+ *   THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND,
-+ *   EXPRESS OR IMPLIED, INCLUDING BUT NOT 

[SCM] 100% pure-Java implementation of Ruby branch, master, updated. debian/1.5.6-4-4-g5dc487b

2012-12-11 Thread Martin Quinson
The following commit has been merged in the master branch:
commit 5dc487bd1f7d435fef40a39fdf99a982740f6157
Author: Martin Quinson martin.quin...@loria.fr
Date:   Tue Dec 11 21:14:05 2012 +0100

upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 0255bd8..bf2a996 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-jruby (1.5.6-5) UNRELEASED; urgency=low
+jruby (1.5.6-5) unstable; urgency=low
 
   * Team upload.
   * Add patch for CVE-2012-5370: Use PerlHash instead of MurmurHash

-- 
100% pure-Java implementation of Ruby

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


[SCM] 100% pure-Java implementation of Ruby branch, master, updated. debian/1.5.6-4-5-g448d298

2012-12-11 Thread Martin Quinson
The following commit has been merged in the master branch:
commit 448d29894a58e81b9a11d38efa88826d3f8cde46
Author: Martin Quinson martin.quin...@loria.fr
Date:   Tue Dec 11 21:23:08 2012 +0100

set urgency to medium

diff --git a/debian/changelog b/debian/changelog
index bf2a996..d2c804a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-jruby (1.5.6-5) unstable; urgency=low
+jruby (1.5.6-5) unstable; urgency=medium
 
   * Team upload.
   * Add patch for CVE-2012-5370: Use PerlHash instead of MurmurHash
 (that is vulnerable to DoS attacks). (Closes: #694694)
 [Patch adapted from 5e4aab28 upstream]
 
- -- Martin Quinson mquin...@debian.org  Tue, 11 Dec 2012 00:07:45 +0100
+ -- Martin Quinson mquin...@debian.org  Tue, 11 Dec 2012 21:22:36 +0100
 
 jruby (1.5.6-4) unstable; urgency=medium
 

-- 
100% pure-Java implementation of Ruby

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


[SCM] 100% pure-Java implementation of Ruby annotated tag, debian/1.5.6-5, created. debian/1.5.6-5

2012-12-11 Thread Martin Quinson
The annotated tag, debian/1.5.6-5 has been created
at  413d69a13223c6be6f00a994c51fba1b9ef19e5b (tag)
   tagging  448d29894a58e81b9a11d38efa88826d3f8cde46 (commit)
  replaces  debian/1.5.6-4
 tagged by  Martin Quinson
on  Tue Dec 11 21:29:18 2012 +0100

- Shortlog 
Debian release 1.5.6-5
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.12 (GNU/Linux)

iQIcBAABCAAGBQJQx5eeAAoJEJi9lyRPc76nL78P/ikP06bd5mr3Hvc8PHJk76+2
zS1avPKIsjidUDLku30jsCW7ZmuA6m9KyjK2CZfX7JoRak4A329PJsvy4LlNe3Ka
OW639wQH8Bn4Cryc7cw8UlwQJvlsxT6yLjpcfs2zb2ScpuVMezVrUzuMHGnBZ4WC
xvCANuRvq6M5/kQpm2pLp7mqb5Bg9i9zFl+Mnhfjwz9ZbWC8cxqXMe0yMGf7VfIa
h+3pCvw5JfxgyTKMQt4cfe9FBfD5uCbh889o5CuCdyjVgiedXR6YwqfSxRwxSF4F
5O3wpTpzVGvtFz/vB14A5gWRbQPHqQrdPL9Lm54vDvqUIXu24Z4WXh4G3g6mepye
QLo1v7Q5Fs8v/Vd9oL79x0IpGfI/DcZEUBg85eUgLOP0uzx1Tm2DmD6FQ4/9bnwa
Q1v5Qik04KZ97vebvxb42BLJGTO4pmw/GQKtACvBqKKp00kMbdHHxnqjG1sK6Ade
xFdithzYs4SMYvx0KF+xYAnwaJonclneHMLTTUzmgpuM9O0U65b1FZvWpJk4lo4S
G3LGZkMf/ypE2Z6EG25cntNqCNUmU8QF+KNpVU4onIY5ZPyh7WjMW/ksZ0cUzyVl
GLnhF6hraTdujmy0abuSEE2n0jNtwwlGsQZTM3RaXXCxq3RQ8HAGC48eFduNb895
NsPIcbAeRvqtu8FB5Cnt
=eoXi
-END PGP SIGNATURE-

Martin Quinson (5):
  New patch to drop MurmurHash and use SipHash instead to fix CVE-2012-5370
  adapt my patch by using PerlHash instead of SipHash, as it is done 
upstream
  also ignore quilt metadata
  upload to unstable
  set urgency to medium

---

-- 
100% pure-Java implementation of Ruby

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