Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-rc-0.41 grimoire by Eric Sandall (06f3c8c65f8a51d2a2902075d4032ad917b0a881)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to stable-rc-0.41 grimoire by Eric Sandall (06f3c8c65f8a51d2a2902075d4032ad917b0a881)

Chronological Thread  
    < Chronological >       < Thread >
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to stable-rc-0.41 grimoire by Eric Sandall (06f3c8c65f8a51d2a2902075d4032ad917b0a881)
  • Date: Sat, 6 Feb 2010 20:07:07 -0600
GIT changes to stable-rc-0.41 grimoire by Eric Sandall
<sandalle AT sourcemage.org>:

dev/null |binary
gnome2-libs/gtk-doc/DETAILS | 1
gnome2-libs/gtk-doc/HISTORY | 4 +
gnome2-libs/gtk-doc/PRE_BUILD | 3 +
gnome2-libs/gtk-doc/fixxref.patch | 80
+++++++++++++++++++++++++++++++++++++
kernels/ndiswrapper/BUILD | 2
kernels/ndiswrapper/FINAL | 2
kernels/ndiswrapper/HISTORY | 5 ++
kernels/ndiswrapper/INSTALL | 2
kernels/ndiswrapper/PRE_BUILD | 2
libs/gmime/DETAILS | 3 -
libs/gmime/HISTORY | 3 +
libs/gmime/gmime-2.4.14.tar.gz.sig | 0
libs/gmime/gmime-2.4.15.tar.gz.sig |binary
utils/coreutils/DETAILS | 2
utils/coreutils/HISTORY | 9 ----
xorg-lib/libxtst/DEPENDS | 3 -
xorg-lib/libxtst/HISTORY | 3 +
18 files changed, 108 insertions(+), 16 deletions(-)

New commits:
commit 06f3c8c65f8a51d2a2902075d4032ad917b0a881
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Eric Sandall <sandalle AT sourcemage.org>

gtk-doc: added patch from gtk-doc git #15562
(cherry picked from commit db96916b235a73f9a4e7f259e347a961e7f1673b)

commit 6716482a72a19d5f6075c4ba1a75595fb6854642
Author: Tommy Boatman <tboatman AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

libxtst: added dependecy for libxi (bug 15561)
(cherry picked from commit f86983f06a94e630177d47bf7b511ee64ebe2b4f)

commit 13b6d0d440091fe427810c9ed5082eac674d9224
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

Revert "coreutils: => 8.2, fixed (2009-12-01) weird bug in rm program,
introduced in 8.1"

This reverts commit 96bfa3846ea9db48c0a0804e3b1c988178fb77e3.

coreutils 8.2 breaks installwatch tracking symlinks: Bug #15559
(cherry picked from commit f9728d83fd76884487d3abc89fcea7777d47e28c)
(cherry picked from commit 96c0c822ff6104b356c815e7fbdc430fa0a5e870)

commit ae869225811f5dd6b2ccc03f4094743cb9158c9a
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

Revert "coreutils 8.3"

This reverts commit 7f99d4fd35214d0bf6e3ba303df6e7f836672d6b.

coreutils 8.3 breaks installwatch tracking symlinks: Bug #15559
(cherry picked from commit 79e30337b776bf186745d9e2649899d5b9ac3fe3)
(cherry picked from commit c68374157ab9cc538832bad7de24aa42011adb50)

commit b471b88b340560c972c8fb1b974cb9b34ba5316a
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

Revert "coreutils 8.4"

This reverts commit 147c3fb63126fb0a28723532b51da74ef77207d7.

coreutils 8.4 breaks installwatch tracking symlinks: Bug #15559
(cherry picked from commit 682f4c6a5156ac393b058216fc75c54c20a24333)
(cherry picked from commit 38442b280d6f4f77c06bf3af469fecafd292de36)

commit 17055dd914cbca0b2dd9f59de91b9c9836279b41
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Eric Sandall <sandalle AT sourcemage.org>

gmime 2.4.15, SECURITY_PATCH=1, possible buffer overflows
(cherry picked from commit d1d1b97b00cb6c0508407b2b533004469fc66106)

commit 38ba1106665de7ecce7be79a6813594a9e9bbe6a
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

ndiswrapper: Needs KBUILD to find the kernel
(cherry picked from commit c66b590d06668b47c599c7719e0330f49b975498)

commit 84f3344407e8fa6e62a8e6e0b9b387e9aad663ae
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

ndiswrapper: Only create/remove ndiswrapper-svn if NDIS_SVN = y
(cherry picked from commit 9d256c7b32b7c33af53def2b1bd15b4069298747)

diff --git a/gnome2-libs/gtk-doc/DETAILS b/gnome2-libs/gtk-doc/DETAILS
index 1ceac30..dd44823 100755
--- a/gnome2-libs/gtk-doc/DETAILS
+++ b/gnome2-libs/gtk-doc/DETAILS
@@ -1,5 +1,6 @@
SPELL=gtk-doc
VERSION=1.13
+ PATCHLEVEL=1
BRANCH=`echo $VERSION | cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-libs/gtk-doc/HISTORY b/gnome2-libs/gtk-doc/HISTORY
index a67c469..2b80478 100644
--- a/gnome2-libs/gtk-doc/HISTORY
+++ b/gnome2-libs/gtk-doc/HISTORY
@@ -1,3 +1,7 @@
+2010-02-05 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: PATCHLEVEL=1
+ * PRE_BUILD, fixxref.patch: added patch from gtk-doc git #15562
+
2010-01-03 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.13

diff --git a/gnome2-libs/gtk-doc/PRE_BUILD b/gnome2-libs/gtk-doc/PRE_BUILD
new file mode 100755
index 0000000..4315ee2
--- /dev/null
+++ b/gnome2-libs/gtk-doc/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p1 < $SPELL_DIRECTORY/fixxref.patch
diff --git a/gnome2-libs/gtk-doc/fixxref.patch
b/gnome2-libs/gtk-doc/fixxref.patch
new file mode 100644
index 0000000..6b5a09b
--- /dev/null
+++ b/gnome2-libs/gtk-doc/fixxref.patch
@@ -0,0 +1,80 @@
+From b39bb84dfb5f16c8b2977105bd5876b7b8d58a11 Mon Sep 17 00:00:00 2001
+From: Vincent Untz <vuntz AT gnome.org>
+Date: Tue, 22 Dec 2009 11:54:31 +0000
+Subject: fixxref: make it work again without --module argument, Fixes #605211
+
+This restores a compatible behavior with previous versions of gtk-doc,
+which is required by many tarballs.
+---
+diff --git a/gtkdoc-fixxref.in b/gtkdoc-fixxref.in
+index 8f166ef..5a703ad 100755
+--- a/gtkdoc-fixxref.in
++++ b/gtkdoc-fixxref.in
+@@ -168,36 +168,38 @@ foreach my $dir (@EXTRA_DIRS) {
+ }
+ }
+
+-open (INPUT, "$MODULE-sections.txt")
+- || die "Can't open $MODULE-sections.txt: $!";
+-my $subsection = "";
+-while (<INPUT>) {
+- if (m/^#/) {
+- next;
+-
+- } elsif (m/^<SECTION>/) {
+- $subsection = "";
+- } elsif (m/^<SUBSECTION\s*(.*)>/i) {
+- $subsection = $1;
+- } elsif (m/^<SUBSECTION>/) {
+- next;
+- } elsif (m/^<TITLE>(.*)<\/TITLE>/) {
+- next;
+- } elsif (m/^<FILE>(.*)<\/FILE>/) {
+- next;
+- } elsif (m/^<INCLUDE>(.*)<\/INCLUDE>/) {
+- next;
+- } elsif (m/^<\/SECTION>/) {
+- next;
+- } elsif (m/^(\S+)/) {
+- my $symbol=CreateValidSGMLID($1);
+-
+- if ($subsection eq "Standard" || $subsection eq "Private") {
+- $NoLinks{$symbol} = 1;
++if (defined($MODULE)) {
++ open (INPUT, "$MODULE-sections.txt")
++ || die "Can't open $MODULE-sections.txt: $!";
++ my $subsection = "";
++ while (<INPUT>) {
++ if (m/^#/) {
++ next;
++
++ } elsif (m/^<SECTION>/) {
++ $subsection = "";
++ } elsif (m/^<SUBSECTION\s*(.*)>/i) {
++ $subsection = $1;
++ } elsif (m/^<SUBSECTION>/) {
++ next;
++ } elsif (m/^<TITLE>(.*)<\/TITLE>/) {
++ next;
++ } elsif (m/^<FILE>(.*)<\/FILE>/) {
++ next;
++ } elsif (m/^<INCLUDE>(.*)<\/INCLUDE>/) {
++ next;
++ } elsif (m/^<\/SECTION>/) {
++ next;
++ } elsif (m/^(\S+)/) {
++ my $symbol=CreateValidSGMLID($1);
++
++ if ($subsection eq "Standard" || $subsection eq "Private") {
++ $NoLinks{$symbol} = 1;
++ }
+ }
+ }
++ close (INPUT);
+ }
+-close (INPUT);
+
+ &FixCrossReferences ($MODULE_DIR);
+
+--
+cgit v0.8.3.1
diff --git a/kernels/ndiswrapper/BUILD b/kernels/ndiswrapper/BUILD
index b294f15..4627280 100755
--- a/kernels/ndiswrapper/BUILD
+++ b/kernels/ndiswrapper/BUILD
@@ -1 +1 @@
-make KVERS=$(get_kernel_version)
+make KVERS=$(get_kernel_version)
KBUILD=$INSTALL_ROOT/usr/src/linux-$(get_kernel_version)
diff --git a/kernels/ndiswrapper/FINAL b/kernels/ndiswrapper/FINAL
index 90fd9b3..b6f82ba 100755
--- a/kernels/ndiswrapper/FINAL
+++ b/kernels/ndiswrapper/FINAL
@@ -1 +1 @@
-rmdir $BUILD_DIRECTORY/ndiswrapper-svn
+[[ "$$NDIS_SVN" == "y" ]] && rmdir $BUILD_DIRECTORY/ndiswrapper-svn || true
diff --git a/kernels/ndiswrapper/HISTORY b/kernels/ndiswrapper/HISTORY
index 1cb3419..43dd37d 100644
--- a/kernels/ndiswrapper/HISTORY
+++ b/kernels/ndiswrapper/HISTORY
@@ -1,3 +1,8 @@
+2010-02-01 Eric Sandall <sandalle AT sourcemage.org>
+ * PRE_BUILD: Only create ndiswrapper-svn if NDIS_SVN = y
+ * BUILD,INSTALL: Needs KBUILD to find the kernel
+ * FINAL: Only remove ndiswrapper-svn if NDIS_SVN = y, always success
+
2009-01-22 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.54

diff --git a/kernels/ndiswrapper/INSTALL b/kernels/ndiswrapper/INSTALL
index 9a3312c..f84615e 100755
--- a/kernels/ndiswrapper/INSTALL
+++ b/kernels/ndiswrapper/INSTALL
@@ -1,2 +1,2 @@
-make KVERS=$(get_kernel_version) mandir=${INSTALL_ROOT}/usr/share/man
install &&
+make KVERS=$(get_kernel_version)
KBUILD=$INSTALL_ROOT/usr/src/linux-$(get_kernel_version)
mandir=${INSTALL_ROOT}/usr/share/man install &&
mkdir -p /etc/ndiswrapper
diff --git a/kernels/ndiswrapper/PRE_BUILD b/kernels/ndiswrapper/PRE_BUILD
index 6c8e209..1ec2ffd 100755
--- a/kernels/ndiswrapper/PRE_BUILD
+++ b/kernels/ndiswrapper/PRE_BUILD
@@ -1,2 +1,2 @@
-mkdir $BUILD_DIRECTORY/ndiswrapper-svn &&
+[[ "$$NDIS_SVN" == "y" ]] && mkdir $BUILD_DIRECTORY/ndiswrapper-svn
default_pre_build
diff --git a/libs/gmime/DETAILS b/libs/gmime/DETAILS
index ce6068c..6c687bf 100755
--- a/libs/gmime/DETAILS
+++ b/libs/gmime/DETAILS
@@ -2,7 +2,8 @@
if [[ "$GMIME_22BRANCH" == "y" ]]; then
VERSION=2.2.23
else
- VERSION=2.4.14
+ VERSION=2.4.15
+ SECURITY_PATCH=1
fi
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.gz
diff --git a/libs/gmime/HISTORY b/libs/gmime/HISTORY
index f3b1a4f..d2bbdc5 100644
--- a/libs/gmime/HISTORY
+++ b/libs/gmime/HISTORY
@@ -1,3 +1,6 @@
+2010-02-02 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.4.15, SECURITY_PATCH=1, possible buffer overflows
+
2010-02-01 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.4.14

diff --git a/libs/gmime/gmime-2.4.14.tar.gz.sig
b/libs/gmime/gmime-2.4.14.tar.gz.sig
deleted file mode 100644
index ec7a539..0000000
Binary files a/libs/gmime/gmime-2.4.14.tar.gz.sig and /dev/null differ
diff --git a/libs/gmime/gmime-2.4.15.tar.gz.sig
b/libs/gmime/gmime-2.4.15.tar.gz.sig
new file mode 100644
index 0000000..07e56a4
Binary files /dev/null and b/libs/gmime/gmime-2.4.15.tar.gz.sig differ
diff --git a/utils/coreutils/DETAILS b/utils/coreutils/DETAILS
index 7335544..f6f42be 100755
--- a/utils/coreutils/DETAILS
+++ b/utils/coreutils/DETAILS
@@ -1,5 +1,5 @@
SPELL=coreutils
- VERSION=8.4
+ VERSION=7.6
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/utils/coreutils/HISTORY b/utils/coreutils/HISTORY
index 3c07abd..a278eef 100644
--- a/utils/coreutils/HISTORY
+++ b/utils/coreutils/HISTORY
@@ -1,12 +1,3 @@
-2010-01-13 Ladislav Hagara <hgr AT vabo.cz>
- * DETAILS: 8.4
-
-2010-01-08 Ladislav Hagara <hgr AT vabo.cz>
- * DETAILS: 8.3
-
-2009-12-12 Vlad Glagolev <stealth AT sourcemage.org>
- * DETAILS: updated spell to 8.2
-
2009-09-11 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 7.6

diff --git a/xorg-lib/libxtst/DEPENDS b/xorg-lib/libxtst/DEPENDS
index de708a5..b6a3d73 100755
--- a/xorg-lib/libxtst/DEPENDS
+++ b/xorg-lib/libxtst/DEPENDS
@@ -6,4 +6,5 @@ depends recordproto &&
depends xextproto &&
depends inputproto &&
depends libx11 &&
-depends libxext
+depends libxext &&
+depends libxi
diff --git a/xorg-lib/libxtst/HISTORY b/xorg-lib/libxtst/HISTORY
index dbd9f9f..e21250b 100644
--- a/xorg-lib/libxtst/HISTORY
+++ b/xorg-lib/libxtst/HISTORY
@@ -1,3 +1,6 @@
+2010-02-03 Tommy Boatman <tboatman AT sourcemage.org>
+ * DEPENDS: added libxi as dependency (bug 15561)
+
2009-10-04 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.1.0



  • [SM-Commit] GIT changes to stable-rc-0.41 grimoire by Eric Sandall (06f3c8c65f8a51d2a2902075d4032ad917b0a881), Eric Sandall, 02/06/2010

Archive powered by MHonArc 2.6.24.

Top of Page