sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to stable-0.59 grimoire by Vlad Glagolev (6f1a880c2bf262d1962c2876117d8711022d3351)
- From: Vlad Glagolev <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to stable-0.59 grimoire by Vlad Glagolev (6f1a880c2bf262d1962c2876117d8711022d3351)
- Date: Sun, 28 Aug 2011 15:04:19 -0500
GIT changes to stable-0.59 grimoire by Vlad Glagolev <stealth AT sourcemage.org>:
ChangeLog | 11 +++++++++++
VERSION | 2 +-
apache.gpg |binary
devel/binutils/DETAILS | 10 +++++-----
devel/binutils/HISTORY | 4 ++++
devel/python/python.gpg |binary
doc/man/man.gpg |binary
editors/mp/mp.gpg |binary
gnu-verified.gpg |binary
gnu.gpg |binary
gnustep-libs/gnustep.gpg |binary
gurus.gpg |binary
libs/libevent/libevent.gpg |binary
mail/dspam/dspam.gpg |binary
mobile/wifi-radar/wifi-radar.gpg |binary
net/stunnel/stunnel.gpg |binary
net/tor.gpg |binary
python-pypi/bzr/bzr.gpg |binary
ruby-raa/ruby-gpgme/Daiki_Ueno.gpg |binary
shell-term-fm/mc/CONFIGURE | 4 ++++
shell-term-fm/mc/DEPENDS | 6 ++++++
shell-term-fm/mc/DETAILS | 1 +
shell-term-fm/mc/HISTORY | 6 ++++++
telephony/telepathy.gpg |binary
utils/installwatch/DETAILS | 2 +-
utils/installwatch/HISTORY | 4 ++++
utils/installwatch/PRE_BUILD | 1 +
utils/installwatch/installwatch-relpath.patch | 15 +++++++++++++++
utils/ipv6calc/peter-bieringer.gpg |binary
29 files changed, 59 insertions(+), 7 deletions(-)
New commits:
commit 6f1a880c2bf262d1962c2876117d8711022d3351
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
VERSION: 0.59-2
commit 55eee435cc136d61dd114593b191fd498ca04c49
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
mc: added SOURCE_HINTS=no-check-certificate otherwise download fails with
aria
(cherry picked from commit 2d552cfd6bfd2fedb848dfd2819e13e20e9f61e5)
commit a7143dc8a9251d6fae7f2c388c766039400e71e4
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
mc: added option to select low-level search engine
(cherry picked from commit 1d9fe2626304f6d25b513774aa306a8f2ee5e2da)
commit da039c2c4cdadc0691f24d78af698a32ce316667
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
binutils: => 2.21.1a
(cherry picked from commit 309111b6e0882c3813f4feac518b66fcca2e273c)
commit 0874f8f942070770cc967cab73084e3a3b385f22
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
gnu.gpg: added public key 4AE55E93 (Tristan Gingold
<gingold AT adacore.com>), required for binutils
(cherry picked from commit 7c2f26a2a06367a87005e481fbf15146085b0d01)
Conflicts (solved):
ChangeLog
commit 7cd7b0504785bfbe455d877036fd6749b9664cab
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
ChangeLog: fixed date from yesterday
(cherry picked from commit 27f547ef8ef0ef43eb9e189b8986fbbf4cdfa7c0)
Conflicts (solved):
ChangeLog
commit 23fbcc9eb81dbb07540c570a46c2fe7b984c9bbf
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
gpg keyrings: removed jpeg photos from keyrings
Modified keyrings:
apache.gpg
devel/python/python.gpg
doc/man/man.gpg
editors/mp/mp.gpg
gnu-verified.gpg
gnu.gpg
gnustep-libs/gnustep.gpg
gurus.gpg
libs/libevent/libevent.gpg
mail/dspam/dspam.gpg
mobile/wifi-radar/wifi-radar.gpg
net/stunnel/stunnel.gpg
net/tor.gpg
python-pypi/bzr/bzr.gpg
ruby-raa/ruby-gpgme/Daiki_Ueno.gpg
telephony/telepathy.gpg
utils/ipv6calc/peter-bieringer.gpg
(cherry picked from commit 530cfbdcf27ca57050f087983d3db84afa903f80)
Conflicts (solved):
ChangeLog
commit dce79999f6443503ff7e7d9e53267c0ef04f6282
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
gurus.gpg: add my new key
(cherry picked from commit d0da881ef861a983ff350d9a9e86f2e670d90d4d)
commit 9dee415c3c5ca530cbc9c7e933c1aae44de4e9a6
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
installwatch: patch a memory handling bug
Relative path handling in installwatch contained a bug in which the
directory size was used in a malloc for the expanded path string,
instead of a saner PATH_MAX value. (fixes #94)
(cherry picked from commit 2f8dc141adb19a4e27e4c6dd9227ac4a2e89b6c2)
diff --git a/ChangeLog b/ChangeLog
index 6bcea7c..a5352c4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2011-08-28 Vlad Glagolev <stealth AT sourcemage.org>
+ * gnu.gpg: added public key 4AE55E93 (Tristan Gingold
+ <gingold AT adacore.com>), required for binutils
+
+2011-08-23 Bor Kraljič <pyrobor AT ver.si>
+ * apache.gpg, devel/python/python.gpg, doc/man/man.gpg,
editors/mp/mp.gpg,
+ gnu-verified.gpg, gnu.gpg, gnustep-libs/gnustep.gpg, gurus.gpg,
libs/libevent/libevent.gpg,
+ mail/dspam/dspam.gpg, mobile/wifi-radar/wifi-radar.gpg,
net/stunnel/stunnel.gpg, net/tor.gpg,
+ python-pypi/bzr/bzr.gpg, ruby-raa/ruby-gpgme/Daiki_Ueno.gpg,
telephony/telepathy.gpg,
+ utils/ipv6calc/peter-bieringer.gpg: removed jpeg photos from
keyrings
+
2011-08-04 Ladislav Hagara <hgr AT vabo.cz>
* libs/libfreenect: new spell, drivers and libraries for the Xbox
Kinect
diff --git a/VERSION b/VERSION
index c53da5a..69efde9 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.59-1
+0.59-2
diff --git a/apache.gpg b/apache.gpg
index f729f8a..8cc9399 100644
Binary files a/apache.gpg and b/apache.gpg differ
diff --git a/devel/binutils/DETAILS b/devel/binutils/DETAILS
index 1279615..ae80873 100755
--- a/devel/binutils/DETAILS
+++ b/devel/binutils/DETAILS
@@ -1,18 +1,18 @@
SPELL=binutils
- VERSION=2.21.1
+ VERSION=2.21.1a
+ VERSIONX=2.21.1
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.sig
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSIONX"
SOURCE_URL[0]=$GNU_URL/$SPELL/$SOURCE
SOURCE2_URL[0]=$GNU_URL/$SPELL/$SOURCE2
-
SOURCE_HASH=sha512:31f34457b525f2cbde85f7cc169a41b37a6552e05011e3fc6180d015bc1043c842e0ed0ef261061ec7d5db8807b0e86f3ca9ba9d6cb449ff3314e8254cac3d21
-# SOURCE_GPG=gnu-verified.gpg:$SOURCE2
+ SOURCE_GPG=gnu.gpg:$SOURCE2:UPSTREAM_KEY
SOURCE2_IGNORE=signature
LICENSE[0]=GPL
WEB_SITE=http://sourceware.org/binutils/
ENTERED=20010922
KEYWORDS="devel"
- SHORT="binutils is an essential collection of binary utilities."
+ SHORT="essential collection of binary utilities"
cat << EOF
binutils - Collection of binary utilities
ld -the GNU linker
diff --git a/devel/binutils/HISTORY b/devel/binutils/HISTORY
index d41e9fb..a14ba83 100644
--- a/devel/binutils/HISTORY
+++ b/devel/binutils/HISTORY
@@ -1,3 +1,7 @@
+2011-08-28 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.21.1a; quoting paths; switched to
upstream
+ gpg checking
+
2011-06-27 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.21.1
diff --git a/devel/python/python.gpg b/devel/python/python.gpg
index 2d20848..f3a0474 100644
Binary files a/devel/python/python.gpg and b/devel/python/python.gpg differ
diff --git a/doc/man/man.gpg b/doc/man/man.gpg
index 157fd92..a1eced8 100644
Binary files a/doc/man/man.gpg and b/doc/man/man.gpg differ
diff --git a/editors/mp/mp.gpg b/editors/mp/mp.gpg
index ce32dab..5f024b8 100644
Binary files a/editors/mp/mp.gpg and b/editors/mp/mp.gpg differ
diff --git a/gnu-verified.gpg b/gnu-verified.gpg
index 86410eb..7717655 100644
Binary files a/gnu-verified.gpg and b/gnu-verified.gpg differ
diff --git a/gnu.gpg b/gnu.gpg
index 84d5138..53bcb92 100644
Binary files a/gnu.gpg and b/gnu.gpg differ
diff --git a/gnustep-libs/gnustep.gpg b/gnustep-libs/gnustep.gpg
index 17bbdbe..d652c34 100644
Binary files a/gnustep-libs/gnustep.gpg and b/gnustep-libs/gnustep.gpg differ
diff --git a/gurus.gpg b/gurus.gpg
index 58cce0b..b223acc 100644
Binary files a/gurus.gpg and b/gurus.gpg differ
diff --git a/libs/libevent/libevent.gpg b/libs/libevent/libevent.gpg
index c739b16..a6d86da 100644
Binary files a/libs/libevent/libevent.gpg and b/libs/libevent/libevent.gpg
differ
diff --git a/mail/dspam/dspam.gpg b/mail/dspam/dspam.gpg
index f07ff15..a6feab8 100644
Binary files a/mail/dspam/dspam.gpg and b/mail/dspam/dspam.gpg differ
diff --git a/mobile/wifi-radar/wifi-radar.gpg
b/mobile/wifi-radar/wifi-radar.gpg
index 4bc9973..e72a6da 100644
Binary files a/mobile/wifi-radar/wifi-radar.gpg and
b/mobile/wifi-radar/wifi-radar.gpg differ
diff --git a/net/stunnel/stunnel.gpg b/net/stunnel/stunnel.gpg
index cf29a52..68a29a6 100644
Binary files a/net/stunnel/stunnel.gpg and b/net/stunnel/stunnel.gpg differ
diff --git a/net/tor.gpg b/net/tor.gpg
index 285d6bf..b64da97 100644
Binary files a/net/tor.gpg and b/net/tor.gpg differ
diff --git a/python-pypi/bzr/bzr.gpg b/python-pypi/bzr/bzr.gpg
index e696756..36edfb9 100644
Binary files a/python-pypi/bzr/bzr.gpg and b/python-pypi/bzr/bzr.gpg differ
diff --git a/ruby-raa/ruby-gpgme/Daiki_Ueno.gpg
b/ruby-raa/ruby-gpgme/Daiki_Ueno.gpg
index ee939fa..57af4c4 100644
Binary files a/ruby-raa/ruby-gpgme/Daiki_Ueno.gpg and
b/ruby-raa/ruby-gpgme/Daiki_Ueno.gpg differ
diff --git a/shell-term-fm/mc/CONFIGURE b/shell-term-fm/mc/CONFIGURE
index 0324c87..bd53804 100755
--- a/shell-term-fm/mc/CONFIGURE
+++ b/shell-term-fm/mc/CONFIGURE
@@ -2,6 +2,10 @@ config_query_list MC_SCREEN "Which screen library to use?" \
ncurses \
slang &&
+config_query_list MC_SEARCH "Select low-level search engine" \
+ glib \
+ pcre &&
+
config_query_option MC_CHARSET "Enable charset selection and conversion?" y \
"--enable-charset" \
"--disable-charset"
diff --git a/shell-term-fm/mc/DEPENDS b/shell-term-fm/mc/DEPENDS
index 279c46f..788c1cc 100755
--- a/shell-term-fm/mc/DEPENDS
+++ b/shell-term-fm/mc/DEPENDS
@@ -2,6 +2,12 @@ depends glib2 &&
depends $MC_SCREEN "--with-screen=$MC_SCREEN" &&
+if [[ $MC_SEARCH == pcre ]]; then
+ depends $MC_SEARCH "--with-search-engine=$MC_SEARCH"
+else
+ depends glib2 "--with-search-engine=$MC_SEARCH"
+fi &&
+
optional_depends gpm \
"--with-gpm-mouse" \
"--without-gpm-mouse" \
diff --git a/shell-term-fm/mc/DETAILS b/shell-term-fm/mc/DETAILS
index 6ac8642..af02ff6 100755
--- a/shell-term-fm/mc/DETAILS
+++ b/shell-term-fm/mc/DETAILS
@@ -6,6 +6,7 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://www.midnight-commander.org/
ENTERED=20010922
SOURCE_HASH=sha512:9b0f2addb168a5152803f234aad16a67351873a8565852a69d5b68cb3292c0d8e4267b83d29d928101d1cc5fa913b6490d03f567ad4e3a8302e796326ddc2f9f
+ SOURCE_HINTS=no-check-certificate
LICENSE[0]=GPL
KEYWORDS="console"
SHORT="Unix file manager and shell"
diff --git a/shell-term-fm/mc/HISTORY b/shell-term-fm/mc/HISTORY
index 3aea352..de834b3 100644
--- a/shell-term-fm/mc/HISTORY
+++ b/shell-term-fm/mc/HISTORY
@@ -1,3 +1,9 @@
+2011-08-20 Bor Kraljič <pyrobor AT ver.si>
+ * DETAILS: added SOURCE_HINTS=no-check-certificate otherwise download
fails with aria
+
+2011-08-11 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS, CONFIGURE: added option to select low-level search engine
+
2011-07-27 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 4.7.5.3, gz -> bz2
diff --git a/telephony/telepathy.gpg b/telephony/telepathy.gpg
index 011ee89..4deb21a 100644
Binary files a/telephony/telepathy.gpg and b/telephony/telepathy.gpg differ
diff --git a/utils/installwatch/DETAILS b/utils/installwatch/DETAILS
index 09a3776..d5aec02 100755
--- a/utils/installwatch/DETAILS
+++ b/utils/installwatch/DETAILS
@@ -1,6 +1,6 @@
SPELL=installwatch
VERSION=2010-12-12
- PATCHLEVEL=1
+ PATCHLEVEL=2
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_HASH=sha512:eda74e4a8b1707b7b5992e222baa8873b6248c0c9ef4475c521bef4dc3ba5374713ba09fc0acdaa369c67930865924994f4c15deb7b6b0e39cce5eeb6d24e50f
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL"
diff --git a/utils/installwatch/HISTORY b/utils/installwatch/HISTORY
index 31aa875..3923f54 100644
--- a/utils/installwatch/HISTORY
+++ b/utils/installwatch/HISTORY
@@ -1,3 +1,7 @@
+2011-08-28 Remko van der Vossen <wich AT sourcemage.org>
+ * DETAILS, PRE_BUILD, installwatch-relpath.patch: added patch to fix
+ incorrect memory handling in relative path handling.
+
2011-02-05 Ladislav Hagara <hgr AT vabo.cz>
* PRE_BUILD, installwatch-glibc-2.13.patch: added patch
diff --git a/utils/installwatch/PRE_BUILD b/utils/installwatch/PRE_BUILD
index c6a146c..742685b 100755
--- a/utils/installwatch/PRE_BUILD
+++ b/utils/installwatch/PRE_BUILD
@@ -3,6 +3,7 @@ cd $SOURCE_DIRECTORY &&
patch Makefile < $SPELL_DIRECTORY/ld_preload.patch &&
patch -p 1 < $SPELL_DIRECTORY/installwatch-glibc-2.13.patch &&
+patch -p 1 < $SPELL_DIRECTORY/installwatch-relpath.patch &&
sed -i "s:PREFIX=/usr/local:PREFIX=/usr:" Makefile &&
# due to the compatibility with stable sorcery
diff --git a/utils/installwatch/installwatch-relpath.patch
b/utils/installwatch/installwatch-relpath.patch
new file mode 100644
index 0000000..b0f4d11
--- /dev/null
+++ b/utils/installwatch/installwatch-relpath.patch
@@ -0,0 +1,15 @@
+diff -Naur installwatch.orig/installwatch.c installwatch/installwatch.c
+--- installwatch.orig/installwatch.c 2010-02-14 04:19:42.000000000 +0100
++++ installwatch/installwatch.c 2011-08-28 20:44:02.000000000 +0200
+@@ -1711,9 +1711,9 @@
+ snprintf(proc_path, PROC_PATH_LEN, "/proc/self/fd/%d", dirfd);
+ if(true_stat(proc_path, &s) == -1)
+ goto out;
+- if(!(newpath = malloc(s.st_size+strlen(relpath)+2)))
++ if(!(newpath = malloc(PATH_MAX+strlen(relpath)+2)))
+ goto out;
+- if((l = true_readlink(proc_path, newpath, s.st_size)) == -1)
++ if((l = true_readlink(proc_path, newpath, PATH_MAX)) == -1)
+ goto free_out;
+ newpath[l] = '/';
+ strcpy(newpath + l + 1, relpath);
diff --git a/utils/ipv6calc/peter-bieringer.gpg
b/utils/ipv6calc/peter-bieringer.gpg
index f6d588a..e99b739 100644
Binary files a/utils/ipv6calc/peter-bieringer.gpg and
b/utils/ipv6calc/peter-bieringer.gpg differ
- [SM-Commit] GIT changes to stable-0.59 grimoire by Vlad Glagolev (6f1a880c2bf262d1962c2876117d8711022d3351), Vlad Glagolev, 08/28/2011
Archive powered by MHonArc 2.6.24.