Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-rc-0.60 grimoire by Vlad Glagolev (c88ee8eb08a3c72f566760c8d4fb86928cad1ecf)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to stable-rc-0.60 grimoire by Vlad Glagolev (c88ee8eb08a3c72f566760c8d4fb86928cad1ecf)
  • Date: Mon, 10 Oct 2011 09:02:41 -0500

GIT changes to stable-rc-0.60 grimoire by Vlad Glagolev
<stealth AT sourcemage.org>:

disk/mdadm/HISTORY | 3 +++
disk/mdadm/PRE_BUILD | 3 ++-
disk/mdadm/linux-3.0.patch | 45
+++++++++++++++++++++++++++++++++++++++++++++
mail/exim/DETAILS | 4 ++--
mail/exim/HISTORY | 3 +++
video/vlc/DETAILS | 4 ++--
video/vlc/HISTORY | 3 +++
7 files changed, 60 insertions(+), 5 deletions(-)

New commits:
commit c88ee8eb08a3c72f566760c8d4fb86928cad1ecf
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

exim: => 4.77
(cherry picked from commit 622ab6c48da7b63389d7604bd841016113de5499)

commit 250afb93ac8bcf0616b94c6028e9522acbcccc13
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

vlc 1.1.12, SECURITY_PATCH=21, VideoLAN-SA-1107
(cherry picked from commit 08dcdba2556890666c408408d1c1596b8f843a8b)

commit c14a055bb127dd1c72c0b628ae680994877a48d0
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

mdadm: added upstream patch for kernel 3.0 support (issue #230)
(cherry picked from commit b261ceccb4eaa5730f785bceb643528ccea467eb)

diff --git a/disk/mdadm/HISTORY b/disk/mdadm/HISTORY
index d4ce62d..84e72fe 100644
--- a/disk/mdadm/HISTORY
+++ b/disk/mdadm/HISTORY
@@ -1,3 +1,6 @@
+2011-10-05 Bor Kraljič <pyrobor AT ver.si>
+ * linux-3.0.patch: added upstream patch for kernel 3.0 support (issue
#230)
+
2011-03-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* PRE_BUILD: remove compiler warnings/errors to fix build with
gcc 4.6
diff --git a/disk/mdadm/PRE_BUILD b/disk/mdadm/PRE_BUILD
index 1dc3479..c4886fd 100755
--- a/disk/mdadm/PRE_BUILD
+++ b/disk/mdadm/PRE_BUILD
@@ -2,4 +2,5 @@ default_pre_build &&
cd ${SOURCE_DIRECTORY} &&
sedit 's:-Wall::' Makefile &&
sedit 's:-Wextra::' Makefile &&
-sedit 's:-Werror::' Makefile
+sedit 's:-Werror::' Makefile &&
+patch -p1 -d $SOURCE_DIRECTORY < $SPELL_DIRECTORY/linux-3.0.patch
diff --git a/disk/mdadm/linux-3.0.patch b/disk/mdadm/linux-3.0.patch
new file mode 100644
index 0000000..b8111b6
--- /dev/null
+++ b/disk/mdadm/linux-3.0.patch
@@ -0,0 +1,45 @@
+From f161d047eed634b3380262767f955eb888502e88 Mon Sep 17 00:00:00 2001
+From: NeilBrown <neilb AT suse.de>
+Date: Fri, 17 Jun 2011 22:49:24 +1000
+Subject: [PATCH] util: correctly parse shorter linux version numbers.
+
+The next version of Linux might be 3.0. If it is, get_linux_version
+will fail.
+So make it more robust.
+
+Reported-by: Namhyung Kim <namhyung AT gmail.com>
+Reported-by: Milan Broz <mbroz AT redhat.com>
+Signed-off-by: NeilBrown <neilb AT suse.de>
+---
+ util.c | 10 +++++-----
+ 1 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/util.c b/util.c
+index 10bbe56..55d171a 100644
+--- a/util.c
++++ b/util.c
+@@ -146,16 +146,16 @@ int get_linux_version()
+ {
+ struct utsname name;
+ char *cp;
+- int a,b,c;
++ int a = 0, b = 0,c = 0;
+ if (uname(&name) <0)
+ return -1;
+
+ cp = name.release;
+ a = strtoul(cp, &cp, 10);
+- if (*cp != '.') return -1;
+- b = strtoul(cp+1, &cp, 10);
+- if (*cp != '.') return -1;
+- c = strtoul(cp+1, NULL, 10);
++ if (*cp == '.')
++ b = strtoul(cp+1, &cp, 10);
++ if (*cp == '.')
++ c = strtoul(cp+1, &cp, 10);
+
+ return (a*1000000)+(b*1000)+c;
+ }
+--
+1.7.6.3
+
diff --git a/mail/exim/DETAILS b/mail/exim/DETAILS
index 19ffa7b..5da4a8e 100755
--- a/mail/exim/DETAILS
+++ b/mail/exim/DETAILS
@@ -1,6 +1,6 @@
SPELL=exim
- VERSION=4.76
- SECURITY_PATCH=5
+ VERSION=4.77
+ SECURITY_PATCH=6
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_GPG="exim.gpg:$SOURCE2:VERIFIED_UPSTREAM_KEY"
diff --git a/mail/exim/HISTORY b/mail/exim/HISTORY
index 964b12a..9022940 100644
--- a/mail/exim/HISTORY
+++ b/mail/exim/HISTORY
@@ -1,3 +1,6 @@
+2011-10-10 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 4.77; SECURITY_PATCH++
+
2011-05-09 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 4.76 (security: CVE-2011-1764)
* DEPENDS: killed xorg-libs, see #14699
diff --git a/video/vlc/DETAILS b/video/vlc/DETAILS
index e0d8f51..464d846 100755
--- a/video/vlc/DETAILS
+++ b/video/vlc/DETAILS
@@ -1,5 +1,5 @@
SPELL=vlc
- VERSION=1.1.11
+ VERSION=1.1.12
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE2_IGNORE=signature
@@ -12,7 +12,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
LICENSE[0]=GPL
ENTERED=20011113
KEYWORDS="player video"
- SECURITY_PATCH=20
+ SECURITY_PATCH=21
SHORT="multimedia player"
cat << EOF
VLC (initially VideoLAN Client) is a highly portable multimedia player for
diff --git a/video/vlc/HISTORY b/video/vlc/HISTORY
index 318e8ab..7f1a58f 100644
--- a/video/vlc/HISTORY
+++ b/video/vlc/HISTORY
@@ -1,3 +1,6 @@
+2011-10-07 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.1.12, SECURITY_PATCH=21, VideoLAN-SA-1107
+
2011-08-19 Bor Kraljič <pyrobor AT ver.si>
* BUILD, DEPENDS, CONFIGURE: fixed unrecognized options (issue #30)




  • [SM-Commit] GIT changes to stable-rc-0.60 grimoire by Vlad Glagolev (c88ee8eb08a3c72f566760c8d4fb86928cad1ecf), Vlad Glagolev, 10/10/2011

Archive powered by MHonArc 2.6.24.

Top of Page