sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to devel-xorg-modular grimoire by Vlad Glagolev (ec51d69df9446fa5ff9ff327f0d90131f44885bf)
- From: Vlad Glagolev <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to devel-xorg-modular grimoire by Vlad Glagolev (ec51d69df9446fa5ff9ff327f0d90131f44885bf)
- Date: Thu, 2 Jun 2011 02:07:56 -0500
GIT changes to devel-xorg-modular grimoire by Vlad Glagolev
<stealth AT sourcemage.org>:
ChangeLog | 5 ++
FUNCTIONS | 1
VERSION | 2 -
audio-drivers/oss/DOWNLOAD | 37 +--------------------
audio-drivers/oss/HISTORY | 3 +
disk/grub2/DEPENDS | 11 ------
disk/grub2/HISTORY | 9 ++++-
disk/udev/DEPENDS | 7 +--
disk/udev/HISTORY | 3 +
e-17/enna/DOWNLOAD | 43 +-----------------------
e-17/enna/HISTORY | 3 +
graphics/imagemagick/DETAILS | 4 +-
graphics/imagemagick/HISTORY | 3 +
hg_download.function | 44 ++++++++++++++++++++++++
http/surf/DOWNLOAD | 43 +-----------------------
http/surf/HISTORY | 3 +
libs/glibc/DETAILS | 4 +-
libs/glibc/HISTORY | 4 ++
libs/glibc/PRE_BUILD | 4 ++
libs/glibc/glibc-2.14-1.patch | 74
++++++++++++++++++++++++++++++++++++++++++
libs/glibc/glibc-2.14-2.patch | 39 ++++++++++++++++++++++
libs/libixp/DOWNLOAD | 42 +----------------------
libs/libixp/HISTORY | 3 +
libs/libnfo/DOWNLOAD | 43 +-----------------------
libs/libnfo/HISTORY | 3 +
libs/libplayer/DOWNLOAD | 43 +-----------------------
libs/libplayer/HISTORY | 3 +
libs/libsvdrp/DOWNLOAD | 43 +-----------------------
libs/libsvdrp/HISTORY | 3 +
libs/libvalhalla/DOWNLOAD | 43 +-----------------------
libs/libvalhalla/HISTORY | 3 +
python-pypi/mercurial/DETAILS | 4 +-
python-pypi/mercurial/HISTORY | 3 +
python-pypi/pymsnt/DOWNLOAD | 65 +-----------------------------------
python-pypi/pymsnt/HISTORY | 3 +
python-pypi/scrapy/DEPENDS | 7 +++
python-pypi/scrapy/DETAILS | 28 +++++++++++++++
python-pypi/scrapy/DOWNLOAD | 5 ++
python-pypi/scrapy/HISTORY | 3 +
python-pypi/scrapy/PREPARE | 6 +++
python-pypi/w3lib/DEPENDS | 2 +
python-pypi/w3lib/DETAILS | 22 ++++++++++++
python-pypi/w3lib/HISTORY | 2 +
security/wireshark/DETAILS | 6 +--
security/wireshark/HISTORY | 4 ++
windowmanagers/wmii/DOWNLOAD | 42 +----------------------
windowmanagers/wmii/HISTORY | 3 +
47 files changed, 339 insertions(+), 441 deletions(-)
New commits:
commit fc287d8aac09724a60adf320cbee74a1a3ae5f5c
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
mercurial: => 1.8.4
commit 34af3b54a3d359284d0bc63953f79443eef25c36
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
grub2: Doesn't actually care if lvm is installed or not, always builds
the LVM modules
commit 209f15fa01ec0cfb676f38d53439308c28664c4a
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
grub2: ./configure doesn't know --enable-gettext or
--disable-device-mapper
configure: WARNING: unrecognized options: --enable-gettext,
--disable-device-mapper
commit 883449e88277e18ae0f98f574749b163541acee0
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
grub2: gettext isn't actually optional
In file included from kern/err.c:23:
./include/grub/i18n.h:28:5: error: "ENABLE_NLS" is not defined
make: *** [kernel_img-kern_err.o] Error 1
commit 797dd318dbfd6cdb279f7c668482067bb2c0dd44
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
grub2: gettext disable -> enable for enable option
commit 05002623909fe9240ebcd985d20f2f67aae2d74b
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
grub2: Cleanup formatting
commit 1b0fd43f6074ac19a141158235de22e61840d5e4
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
grub2: lvm disble -> disable
commit 142b46482762b0941007b70178eea5d2436682a8
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
glibc 2.14
commit 4cbb529a152b0e082f54f65fcba7c4a7206f3d54
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>
VERSION: 0.58-test
commit 824b6d6794a00b177659bc8cb6632a97b0262c9c
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>
imagemagick: Updated to version 6.7.0-2
commit 18609bc5c99e0dd76b06701306bef69dbafdd05d
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
wireshark 1.4.7, SECURITY_PATCH=30
commit 2ebe798d57a967890328562f2dfecc1e8f4713f3
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>
enna: use hg_download
commit 1cb17f0765602b1f3c042e75ee75682fd6cd3844
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>
surf: use hg_download
commit 9683d2f17850952976ca89bb7b78e2b070f0a655
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>
wmii: use hg_download
commit 59747676cb89f6da95e14314d7873703d124b5d4
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>
oss: use hg_download
commit 1ba2b60533570339101e4aa8c81551973177c8e4
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>
libvalhalla: use hg_download
commit 9c2398673e6f3e783a8c61b6e8f3d6efc4219774
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>
libsvdrp: use hg_download
commit 01d86f5e6b67fb7e056375e6b5c5c3b20479d90e
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>
libplayer: use hg_download
commit 7b6f873c7feac1d7fba2e49f2877eae527579424
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>
libnfo: use hg_download
commit a852318435c40b3bc90293529fde33a7b84f712f
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>
libixp: use hg_download
commit 6befb0f9868430054a6a69ad107225783a35a091
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>
pymsnt: use hg_download
commit 18250c7436922b7a2f8994bb825a4a4dda05a309
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>
scrapy: add scm version
commit 46bbcbf55036ddddabeb7bc0cf7e2114dbd0eb66
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>
hg_download.function: hg download handler
Mostly copied from pymsnt.
commit 0f8003cceee353ec821fb0b6366dca6d29728d8a
Author: David Haley <khoralin AT gmail.com>
Commit: David Haley <khoralin AT gmail.com>
Dependency Update: Change In Spell Requirements
It was found that without 'extras' in the udev DEPENDS enabled there
were several spells that were needed for the udev spell to cast
successfully.
Spell required for udev to cast:
gperf
usbutils
PCIIDS
The spells listed above were moved out of the 'extras' IF block within the
DEPENDS file to insure they are always queried for when udev is cast.
USBIDS was removed from the DEPENDS file. usbutils appears to be
explicitly
required for udev to compile properly. Since usbutils provides USBIDS it
does not seem necassary to have both spells listed in the DEPENDS file.
commit 7fa8c55e5439e39d482e668e085a2799bff8b021
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>
new spells: w3lib & scrapy
diff --git a/ChangeLog b/ChangeLog
index 33823a4..32ff7f5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-05-31 Ismael Luceno <ismael AT sourcemage.org>
+ * python-pypi/w3lib: new spell, Library of web-relatedfunctions
+ * python-pypi/scrapy: new spell, A high-level Python Screen Scraping
framework
+ * hg_download.function: hg download handler (mostly copied from
pymsnt)
+
2011-05-31 Treeve Jelbert <treeve AT sourcemage.org>
* python-pypi/geraldo: new spell, python reporting engine
diff --git a/FUNCTIONS b/FUNCTIONS
index 6e26adc..00cab13 100755
--- a/FUNCTIONS
+++ b/FUNCTIONS
@@ -720,3 +720,4 @@ fi
. $GRIMOIRE/glselect.function
. $GRIMOIRE/bzr_download.function
+. $GRIMOIRE/hg_download.function
diff --git a/VERSION b/VERSION
index d322260..181676b 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.57-test
+0.58-test
diff --git a/audio-drivers/oss/DOWNLOAD b/audio-drivers/oss/DOWNLOAD
index fb763f9..3f3d3c6 100755
--- a/audio-drivers/oss/DOWNLOAD
+++ b/audio-drivers/oss/DOWNLOAD
@@ -1,38 +1,5 @@
-function url_hg_crack() {
-
- URL=$(url_strip_prefix "$1" hg_http)
- HG_ROOT=$(echo $URL | sed "s#\(^[^/]*[^:]*\):.*#\1#")
- local HG_MODULE_TAG=$(echo $URL | sed "s#^[^/]*[^:]*\(.*\)#\1#")
- HG_MODULE=$(echo $HG_MODULE_TAG | cut -d : -f2)
- local HG_TAGNAME=$(echo $HG_MODULE_TAG | cut -d : -f3)
- HG_TAG=${HG_TAGNAME:-tip}
-
-}
if [[ $OSS_BRANCH == scm ]]; then
-url_hg_crack ${SOURCE_URL}
-message "${MESSAGE_COLOR}Starting Mercurial checkout of" \
- "${FILE_COLOR}${SOURCE}${MESSAGE_COLOR}...${DEFAULT_COLOR}" &&
-if [[ -f $SOURCE_CACHE/${SOURCE} ]]
-then
- message "${MESSAGE_COLOR}Previous source found
unpacking...${DEFAULT_COLOR}" &&
- tar -jxf $SOURCE_CACHE/${SOURCE} &&
- cd ${HG_MODULE} &&
- message "${MESSAGE_COLOR}Running Mercurial update...${DEFAULT_COLOR}" &&
- hg pull -u -r ${HG_TAG}
- cd ..
- message "${MESSAGE_COLOR}Done...${DEFAULT_COLOR}"
+ hg_download
else
- message "${MESSAGE_COLOR}Running initial Mercurial
clone...${DEFAULT_COLOR}" &&
- hg clone -r${HG_TAG} "http://${HG_ROOT}"; ${HG_MODULE}
- message "${MESSAGE_COLOR}Done...${DEFAULT_COLOR}"
-fi &&
-message "${MESSAGE_COLOR}Generating tarball...${DEFAULT_COLOR}" &&
-tar -jcf \
- ${SOURCE} \
- ${HG_MODULE} &&
-cp ${SOURCE} ${SOURCE_CACHE}/${SOURCE} &&
-rm ${SOURCE} &&
-message "${MESSAGE_COLOR}Mercurial checkout complete...${DEFAULT_COLOR}"
-else
- acquire_src ''
+ default_download
fi
diff --git a/audio-drivers/oss/HISTORY b/audio-drivers/oss/HISTORY
index 08c0768..fb9b7f7 100644
--- a/audio-drivers/oss/HISTORY
+++ b/audio-drivers/oss/HISTORY
@@ -1,3 +1,6 @@
+2011-06-01 Ismael Luceno <ismael AT sourcemage.org>
+ * DOWNLOAD: use hg_download
+
2010-04-07 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
* DETAILS: updated stable to 4.2 build 2002
scm is 4.3 now
diff --git a/disk/grub2/DEPENDS b/disk/grub2/DEPENDS
index 0aa632f..3891283 100755
--- a/disk/grub2/DEPENDS
+++ b/disk/grub2/DEPENDS
@@ -1,4 +1,5 @@
depends automake &&
+depends gettext &&
depends gnupg &&
depends smgl-fhs &&
depends lzo &&
@@ -9,16 +10,6 @@ if [[ "${GRUB2_SVN}" = 'y' ]]; then
depends RUBY
fi &&
-optional_depends lvm \
- '--enable-device-mapper' \
- '--disble-device-mapper' \
- 'for LVM device-mapper support' &&
-
-optional_depends gettext \
- '--disable-nls' \
- '--disable-nls' \
- 'for native language support' &&
-
optional_depends freetype2 \
'--enable-grub-mkfont' \
'--disable-grub-mkfont' \
diff --git a/disk/grub2/HISTORY b/disk/grub2/HISTORY
index cf3b40d..702384e 100644
--- a/disk/grub2/HISTORY
+++ b/disk/grub2/HISTORY
@@ -1,3 +1,10 @@
+2011-06-01 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: lvm disble -> disable
+ gettext disable -> enable for enable option
+ gettext isn't actually optional
+ ./configure doesn't --enable-gettext is --disable-device-mapper
+ Doesn't actually care if lvm is installed or not, always builds the
LVM modules
+
2011-05-27 Arjan Bouter <abouter AT sourcemage.org>
* DETAILS: switched to http download
* DEPENDS: added lvm, gettext and unifont dependencies
@@ -14,7 +21,7 @@
* CONFIGURE: removed "--enable-grub-pe2elf" option, no longer in
configure
changed blabla
removed "--enable-grub-emu", no longer seems to be used
- added "--enable-mm-debug" to include memory manager debugging
+ added "--enable-mm-debug" to include memory manager debugging
* PREPARE: Commented out SVN query
* DEPENDS: addded optional dependency on SDL for grub-emu debugging
with sdl support
diff --git a/disk/udev/DEPENDS b/disk/udev/DEPENDS
index a3e4dc5..db1372e 100755
--- a/disk/udev/DEPENDS
+++ b/disk/udev/DEPENDS
@@ -1,14 +1,13 @@
depends gnupg &&
depends smgl-fhs &&
+depends gperf &&
+depends usbutils &&
+depends PCIIDS &&
if list_find "$UDEV_OPTS" "--enable-extras"; then
- depends gperf &&
depends pkgconfig &&
depends glib2 &&
depends libusb &&
- depends usbutils &&
- depends USBIDS &&
- depends PCIIDS &&
optional_depends consolekit '' '' 'seesion/seat support'
fi &&
diff --git a/disk/udev/HISTORY b/disk/udev/HISTORY
index f3e8e2d..fa93ca9 100644
--- a/disk/udev/HISTORY
+++ b/disk/udev/HISTORY
@@ -1,3 +1,6 @@
+2011-06-01 David C. Haley <khoralin AT gmail.com>
+ * DEPENDS: gperf, usbutils, PCIIDS required dependencies
+
2011-05-29 Arjan Bouter <abouter AT sourcemage.org>
* INSTALL: check for /run before creating the dir
diff --git a/e-17/enna/DOWNLOAD b/e-17/enna/DOWNLOAD
index 2141846..24a9860 100755
--- a/e-17/enna/DOWNLOAD
+++ b/e-17/enna/DOWNLOAD
@@ -1,45 +1,8 @@
#once the hg download handler hits stable sorcery this DOWNLOAD script would
#only need to be removed, SOURCE_URL is compatible with the planned hg
handler
-function my_url_hg_http_crack() {
-
- URL=$(url_strip_prefix "$1" hg_http)
- HG_ROOT=$(echo $URL | sed "s#\(^[^/]*[^:]*\):.*#\1#")
- HG_ROOT=http://$HG_ROOT
- local HG_DIRECTORY_TAG=$(echo $URL | sed "s#^[^/]*[^:]*\(.*\)#\1#")
- HG_DIRECTORY=$(echo $HG_DIRECTORY_TAG | cut -d : -f2)
- local HG_TAGNAME=$(echo $HG_DIRECTORY_TAG | cut -d : -f3)
- HG_TAG=${HG_TAGNAME:=default}
-
-}
-
if [[ "${VERSION}" != "mercurial" && "${VERSION}" != "$(date +%Y%m%d)" ]];
then
- default_download &&
- return $?
-fi &&
-
-message "${MESSAGE_COLOR}Starting Mercurial checkout of" \
- "${FILE_COLOR}${SOURCE}${MESSAGE_COLOR}...${DEFAULT_COLOR}" &&
-my_url_hg_http_crack $SOURCE_URL &&
-if [[ -f $SOURCE_CACHE/$SOURCE ]]; then
- message "${MESSAGE_COLOR}Previous source found
unpacking...${DEFAULT_COLOR}" &&
- tar -jxf $SOURCE_CACHE/$SOURCE &&
- message "${MESSAGE_COLOR}Running hg pull...${DEFAULT_COLOR}" &&
- ( cd $HG_DIRECTORY &&
- echo hg pull $HG_ROOT &&
- hg pull $HG_ROOT &&
- echo hg update $HG_TAG &&
- hg update $HG_TAG )
+ default_download
else
- message "${MESSAGE_COLOR}Running hg clone...${DEFAULT_COLOR}"
- echo hg clone $HG_ROOT $HG_DIRECTORY
- hg clone $HG_ROOT $HG_DIRECTORY &&
- ( cd $HG_DIRECTORY &&
- echo hg update $HG_TAG &&
- hg update $HG_TAG )
-fi &&
-message "${MESSAGE_COLOR}Generating tarball...${DEFAULT_COLOR}" &&
-tar -jcf $SOURCE $HG_DIRECTORY &&
-cp $SOURCE $SOURCE_CACHE/$SOURCE &&
-rm $SOURCE &&
-message "${MESSAGE_COLOR}Mercurial checkout complete...${DEFAULT_COLOR}"
+ hg_download
+fi
diff --git a/e-17/enna/HISTORY b/e-17/enna/HISTORY
index 31c3dd1..47f3643 100644
--- a/e-17/enna/HISTORY
+++ b/e-17/enna/HISTORY
@@ -1,3 +1,6 @@
+2011-06-01 Ismael Luceno <ismael AT sourcemage.org>
+ * DOWNLOAD: use hg_download
+
2010-03-03 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.com>
* DEPENDS: Updating dependencies
Removed dependency on SVN
diff --git a/graphics/imagemagick/DETAILS b/graphics/imagemagick/DETAILS
index 2bfbae1..5e16b65 100755
--- a/graphics/imagemagick/DETAILS
+++ b/graphics/imagemagick/DETAILS
@@ -1,5 +1,5 @@
SPELL=imagemagick
- VERSION=6.6.9-9
+ VERSION=6.7.0-2
SECURITY_PATCH=1
SOURCE=ImageMagick-${VERSION}.tar.bz2
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/ImageMagick-${VERSION}
@@ -8,7 +8,7 @@ SOURCE_DIRECTORY=${BUILD_DIRECTORY}/ImageMagick-${VERSION}
SOURCE_URL[2]=ftp://ftp.nluug.nl/pub/ImageMagick/$SOURCE
SOURCE_URL[3]=http://image_magick.veidrodis.com/image_magick/$SOURCE
# SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
-
SOURCE_HASH=sha512:957e1a05dbe61e4ab6ee06af66669309c8b4744aaf104efd64b0d10b12251917da72478c44d95c5bbcfed6fc0072b93b0ddcc542a904007862e6b7b240fe0ccf
+
SOURCE_HASH=sha512:710e2892eef06f2167a62a066f3ce5cd91588497277c210128d92df57487e61ead991e0475052404cc525dc52e15ba0b5a274bcc33be9c2fa74555ce9a01464c
CCACHE="off"
WEB_SITE=http://www.imagemagick.org/
ENTERED=20010922
diff --git a/graphics/imagemagick/HISTORY b/graphics/imagemagick/HISTORY
index ecb3c46..e881fbe 100644
--- a/graphics/imagemagick/HISTORY
+++ b/graphics/imagemagick/HISTORY
@@ -1,3 +1,6 @@
+2011-06-01 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated to version 6.7.0-2
+
2011-05-21 George Sherwood <gsherwood AT sourcemage.org>
* DETAILS: Updated to version 6.6.9-9
diff --git a/hg_download.function b/hg_download.function
new file mode 100755
index 0000000..7732c94
--- /dev/null
+++ b/hg_download.function
@@ -0,0 +1,44 @@
+#---------------------------------------------------------------------
+## Handler for downloading from mercurial URLs
+#---------------------------------------------------------------------
+function hg_checkout() {
+ unset URL HG_ROOT HG_MODULE HG_TAG
+ url_hg_crack $1
+ message "${MESSAGE_COLOR}Starting Mercurial checkout of" \
+ "${FILE_COLOR}$2${MESSAGE_COLOR}...${DEFAULT_COLOR}" &&
+ if [[ -f $SOURCE_CACHE/$2 ]]
+ then
+ message "${MESSAGE_COLOR}Previous source found
unpacking...${DEFAULT_COLOR}" &&
+ tar -jxf $SOURCE_CACHE/$2 &&
+ cd ${HG_MODULE} &&
+ message "${MESSAGE_COLOR}Running Mercurial update...${DEFAULT_COLOR}" &&
+ hg pull -u -r ${HG_TAG}
+ cd ..
+ message "${MESSAGE_COLOR}Done...${DEFAULT_COLOR}"
+ else
+ message "${MESSAGE_COLOR}Running initial Mercurial
clone...${DEFAULT_COLOR}" &&
+ hg clone -r${HG_TAG} "http://${HG_ROOT}"; ${HG_MODULE}
+ message "${MESSAGE_COLOR}Done...${DEFAULT_COLOR}"
+ fi &&
+ message "${MESSAGE_COLOR}Generating tarball...${DEFAULT_COLOR}" &&
+ tar -jcf $2 ${HG_MODULE} &&
+ mv $2 ${SOURCE_CACHE}/$2 &&
+ message "${MESSAGE_COLOR}Mercurial checkout complete...${DEFAULT_COLOR}"
+}
+
+function hg_download() {
+ hg_checkout "${SOURCE_URL}" "${SOURCE}"
+ if [ -n "${SOURCE2_URL}" ]
+ then
+ hg_checkout "${SOURCE2_URL}" "${SOURCE2}"
+ fi
+}
+
+function url_hg_crack() {
+ URL=$(url_strip_prefix "$1" hg_http)
+ HG_ROOT=$(echo $URL | sed "s#\(^[^/]*[^:]*\):.*#\1#")
+ local HG_MODULE_TAG=$(echo $URL | sed "s#^[^/]*[^:]*\(.*\)#\1#")
+ HG_MODULE=$(echo $HG_MODULE_TAG | cut -d : -f2)
+ local HG_TAGNAME=$(echo $HG_MODULE_TAG | cut -d : -f3)
+ HG_TAG=${HG_TAGNAME:-tip}
+}
diff --git a/http/surf/DOWNLOAD b/http/surf/DOWNLOAD
index c6c5535..3e723f3 100755
--- a/http/surf/DOWNLOAD
+++ b/http/surf/DOWNLOAD
@@ -1,45 +1,8 @@
#once the hg download handler hits stable sorcery this DOWNLOAD script would
#only need to be removed, SOURCE_URL is compatible with the planned hg
handler
-function my_url_hg_http_crack() {
-
- URL=$(url_strip_prefix "$1" hg_http)
- HG_ROOT=$(echo $URL | sed "s#\(^[^/]*[^:]*\):.*#\1#")
- HG_ROOT=http://$HG_ROOT
- local HG_DIRECTORY_TAG=$(echo $URL | sed "s#^[^/]*[^:]*\(.*\)#\1#")
- HG_DIRECTORY=$(echo $HG_DIRECTORY_TAG | cut -d : -f2)
- local HG_TAGNAME=$(echo $HG_DIRECTORY_TAG | cut -d : -f3)
- HG_TAG=${HG_TAGNAME:=default}
-
-}
-
if [[ "${VERSION}" != "scm" && "${VERSION}" != "$(date +%Y%m%d)" ]]; then
- default_download &&
- return $?
-fi &&
-
-message "${MESSAGE_COLOR}Starting Mercurial checkout of" \
- "${FILE_COLOR}${SOURCE}${MESSAGE_COLOR}...${DEFAULT_COLOR}" &&
-my_url_hg_http_crack $SOURCE_URL &&
-if [[ -f $SOURCE_CACHE/$SOURCE ]]; then
- message "${MESSAGE_COLOR}Previous source found
unpacking...${DEFAULT_COLOR}" &&
- tar -jxf $SOURCE_CACHE/$SOURCE &&
- message "${MESSAGE_COLOR}Running hg pull...${DEFAULT_COLOR}" &&
- ( cd $HG_DIRECTORY &&
- echo hg pull $HG_ROOT &&
- hg pull $HG_ROOT &&
- echo hg update $HG_TAG &&
- hg update $HG_TAG )
+ default_download
else
- message "${MESSAGE_COLOR}Running hg clone...${DEFAULT_COLOR}"
- echo hg clone $HG_ROOT $HG_DIRECTORY
- hg clone $HG_ROOT $HG_DIRECTORY &&
- ( cd $HG_DIRECTORY &&
- echo hg update $HG_TAG &&
- hg update $HG_TAG )
-fi &&
-message "${MESSAGE_COLOR}Generating tarball...${DEFAULT_COLOR}" &&
-tar -jcf $SOURCE $HG_DIRECTORY &&
-cp $SOURCE $SOURCE_CACHE/$SOURCE &&
-rm $SOURCE &&
-message "${MESSAGE_COLOR}Mercurial checkout complete...${DEFAULT_COLOR}"
+ hg_download
+fi
diff --git a/http/surf/HISTORY b/http/surf/HISTORY
index a636ad8..f500c22 100644
--- a/http/surf/HISTORY
+++ b/http/surf/HISTORY
@@ -1,3 +1,6 @@
+2011-06-01 Ismael Luceno <ismael AT sourcemage.org>
+ * DOWNLOAD: use hg_download
+
2010-07-15 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.4.1
diff --git a/libs/glibc/DETAILS b/libs/glibc/DETAILS
index 1aed58f..e957b52 100755
--- a/libs/glibc/DETAILS
+++ b/libs/glibc/DETAILS
@@ -22,7 +22,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
else
if [[ "$GLIBC_CVS" == "y" ]]; then
local GLIBC_VERSION
- GLIBC_VERSION=2.13
+ GLIBC_VERSION=2.14
if [[ "${GLIBC_CVS_AUTOUPDATE}" == "y" ]]; then
VERSION=${GLIBC_VERSION}-$(date +%Y%m%d) && FORCE_DOWNLOAD=on
else
@@ -33,7 +33,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-${GLIBC_VERSION}
SOURCE_URL=cvs://:pserver:anoncvs:anoncvs AT sources.redhat.com:/cvs/glibc:libc:$SPELL-${GLIBC_VERSION/./_}-branch
SOURCE_IGNORE=volatile
else
- VERSION=2.13
+ VERSION=2.14
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE2=$SOURCE.sig
diff --git a/libs/glibc/HISTORY b/libs/glibc/HISTORY
index 5965ca4..887b759 100644
--- a/libs/glibc/HISTORY
+++ b/libs/glibc/HISTORY
@@ -1,3 +1,7 @@
+2011-06-02 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.14
+ * PRE_BUILD, glibc-2.14-1.patch, glibc-2.14-2.patch: patches added
+
2011-05-10 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated default kernel headers to 2.6.38
diff --git a/libs/glibc/PRE_BUILD b/libs/glibc/PRE_BUILD
index 3ff8bad..b6428f4 100755
--- a/libs/glibc/PRE_BUILD
+++ b/libs/glibc/PRE_BUILD
@@ -65,6 +65,10 @@ rm -rf $GLIBC_HEADERS_DIR/include/drm &&
# Now fixup the normal glibc
#
cd $SOURCE_DIRECTORY &&
+
+patch -p1 < $SPELL_DIRECTORY/glibc-2.14-1.patch &&
+patch -p1 < $SPELL_DIRECTORY/glibc-2.14-2.patch &&
+
patch -p0 < $SCRIPT_DIRECTORY/Makefile.patch &&
patch -p1 < $SCRIPT_DIRECTORY/as-test-x.patch &&
patch -p1 < $SPELL_DIRECTORY/gcc45.patch &&
diff --git a/libs/glibc/glibc-2.14-1.patch b/libs/glibc/glibc-2.14-1.patch
new file mode 100644
index 0000000..1f3a744
--- /dev/null
+++ b/libs/glibc/glibc-2.14-1.patch
@@ -0,0 +1,74 @@
+From c8fc0c91695b1c7003c7170861274161f9224817 Mon Sep 17 00:00:00 2001
+From: Ulrich Drepper <drepper AT gmail.com>
+Date: Tue, 31 May 2011 08:45:44 -0400
+Subject: [PATCH] Don't free non-malloced memory and fix memory leak
+
+---
+ ChangeLog | 5 +++++
+ nscd/nscd_getserv_r.c | 16 ++++++++++++----
+ 2 files changed, 17 insertions(+), 4 deletions(-)
+
+diff --git a/ChangeLog b/ChangeLog
+index 3a6abda..eee3d1b 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,8 @@
++2011-05-31 Andreas Schwab <schwab AT redhat.com>
++
++ * nscd/nscd_getserv_r.c (nscd_getserv_r): Don't free non-malloced
++ memory. Use alloca_account. Fix memory leak when retrying.
++
+ 2011-05-31 Ulrich Drepper <drepper AT gmail.com>
+
+ * version.h (RELEASE): Bump for 2.14 release.
+diff --git a/nscd/nscd_getserv_r.c b/nscd/nscd_getserv_r.c
+index de96a57..f9ef056 100644
+--- a/nscd/nscd_getserv_r.c
++++ b/nscd/nscd_getserv_r.c
+@@ -124,6 +124,7 @@ nscd_getserv_r (const char *crit, size_t critlen, const
char *proto,
+ s_name = (char *) (&found->data[0].servdata + 1);
+ serv_resp = found->data[0].servdata;
+ s_proto = s_name + serv_resp.s_name_len;
++ alloca_aliases_len = 1;
+ aliases_len = (uint32_t *) (s_proto + serv_resp.s_proto_len);
+ aliases_list = ((char *) aliases_len
+ + serv_resp.s_aliases_cnt * sizeof (uint32_t));
+@@ -154,7 +155,9 @@ nscd_getserv_r (const char *crit, size_t critlen, const
char *proto,
+ + (serv_resp.s_aliases_cnt
+ * sizeof (uint32_t)));
+ if (alloca_aliases_len)
+- tmp = __alloca (serv_resp.s_aliases_cnt * sizeof (uint32_t));
++ tmp = alloca_account (serv_resp.s_aliases_cnt
++ * sizeof (uint32_t),
++ alloca_used);
+ else
+ {
+ tmp = malloc (serv_resp.s_aliases_cnt * sizeof (uint32_t));
+@@ -249,8 +252,9 @@ nscd_getserv_r (const char *crit, size_t critlen, const
char *proto,
+ + (serv_resp.s_aliases_cnt
+ * sizeof (uint32_t)));
+ if (alloca_aliases_len)
+- aliases_len = alloca (serv_resp.s_aliases_cnt
+- * sizeof (uint32_t));
++ aliases_len = alloca_account (serv_resp.s_aliases_cnt
++ * sizeof (uint32_t),
++ alloca_used);
+ else
+ {
+ aliases_len = malloc (serv_resp.s_aliases_cnt
+@@ -368,7 +372,11 @@ nscd_getserv_r (const char *crit, size_t critlen, const
char *proto,
+ }
+
+ if (retval != -1)
+- goto retry;
++ {
++ if (!alloca_aliases_len)
++ free (aliases_len);
++ goto retry;
++ }
+ }
+
+ if (!alloca_aliases_len)
+--
+1.7.3.4
+
diff --git a/libs/glibc/glibc-2.14-2.patch b/libs/glibc/glibc-2.14-2.patch
new file mode 100644
index 0000000..fb4374a
--- /dev/null
+++ b/libs/glibc/glibc-2.14-2.patch
@@ -0,0 +1,39 @@
+From 8c29731192565b9c917d6b97db78dcd302283df8 Mon Sep 17 00:00:00 2001
+From: Ulrich Drepper <drepper AT gmail.com>
+Date: Tue, 31 May 2011 14:23:01 -0400
+Subject: [PATCH] Fix typo in stack guard setup code for old kernels
+
+---
+ ChangeLog | 5 +++++
+ sysdeps/unix/sysv/linux/dl-osinfo.h | 2 +-
+ 2 files changed, 6 insertions(+), 1 deletions(-)
+
+diff --git a/ChangeLog b/ChangeLog
+index eee3d1b..2aca74a 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,8 @@
++2011-05-31 Ulrich Drepper <drepper AT gmail.com>
++
++ * sysdeps/unix/sysv/linux/dl-osinfo.h (_dl_setup_stack_chk_guard): Fix
++ typo.
++
+ 2011-05-31 Andreas Schwab <schwab AT redhat.com>
+
+ * nscd/nscd_getserv_r.c (nscd_getserv_r): Don't free non-malloced
+diff --git a/sysdeps/unix/sysv/linux/dl-osinfo.h
b/sysdeps/unix/sysv/linux/dl-osinfo.h
+index eb7fedc..28fce4f 100644
+--- a/sysdeps/unix/sysv/linux/dl-osinfo.h
++++ b/sysdeps/unix/sysv/linux/dl-osinfo.h
+@@ -81,7 +81,7 @@ _dl_setup_stack_chk_guard (void *dl_random)
+ {
+ ssize_t reslen = read_not_cancel (fd, ret.bytes + 1, filllen);
+ close_not_cancel_no_status (fd);
+- if (reslen == (ssize_) filllen)
++ if (reslen == (ssize_t) filllen)
+ return ret.num;
+ }
+ # endif
+--
+1.7.3.4
+
diff --git a/libs/libixp/DOWNLOAD b/libs/libixp/DOWNLOAD
index c163c82..c176f1e 100755
--- a/libs/libixp/DOWNLOAD
+++ b/libs/libixp/DOWNLOAD
@@ -1,44 +1,8 @@
#once the hg download handler hits stable sorcery this DOWNLOAD script would
#only need to be removed, SOURCE_URL is compatible with the planned hg
handler
-function my_url_hg_http_crack() {
-
- URL=$(url_strip_prefix "$1" hg_http)
- HG_ROOT=$(echo $URL | sed "s#\(^[^/]*[^:]*\):.*#\1#")
- HG_ROOT=http://$HG_ROOT
- local HG_DIRECTORY_TAG=$(echo $URL | sed "s#^[^/]*[^:]*\(.*\)#\1#")
- HG_DIRECTORY=$(echo $HG_DIRECTORY_TAG | cut -d : -f2)
- local HG_TAGNAME=$(echo $HG_DIRECTORY_TAG | cut -d : -f3)
- HG_TAG=${HG_TAGNAME:=default}
-
-}
if [[ $LIBIXP_HG != y ]]; then
- default_download &&
- return $?
-fi &&
-
-message "${MESSAGE_COLOR}Starting Mercurial checkout of" \
- "${FILE_COLOR}${SOURCE}${MESSAGE_COLOR}...${DEFAULT_COLOR}" &&
-my_url_hg_http_crack $SOURCE_URL &&
-if [[ -f $SOURCE_CACHE/$SOURCE ]]; then
- message "${MESSAGE_COLOR}Previous source found
unpacking...${DEFAULT_COLOR}" &&
- tar -jxf $SOURCE_CACHE/$SOURCE &&
- message "${MESSAGE_COLOR}Running hg pull...${DEFAULT_COLOR}" &&
- ( cd $HG_DIRECTORY &&
- echo hg pull $HG_ROOT &&
- hg pull $HG_ROOT &&
- echo hg update $HG_TAG &&
- hg update $HG_TAG )
+ default_download
else
- message "${MESSAGE_COLOR}Running hg clone...${DEFAULT_COLOR}"
- echo hg clone $HG_ROOT $HG_DIRECTORY
- hg clone $HG_ROOT $HG_DIRECTORY &&
- ( cd $HG_DIRECTORY &&
- echo hg update $HG_TAG &&
- hg update $HG_TAG )
-fi &&
-message "${MESSAGE_COLOR}Generating tarball...${DEFAULT_COLOR}" &&
-tar -jcf $SOURCE $HG_DIRECTORY &&
-cp $SOURCE $SOURCE_CACHE/$SOURCE &&
-rm $SOURCE &&
-message "${MESSAGE_COLOR}Mercurial checkout complete...${DEFAULT_COLOR}"
+ hg_download
+fi
diff --git a/libs/libixp/HISTORY b/libs/libixp/HISTORY
index 8f59af5..cf3d0e2 100644
--- a/libs/libixp/HISTORY
+++ b/libs/libixp/HISTORY
@@ -1,3 +1,6 @@
+2011-06-01 Ismael Luceno <ismael AT sourcemage.org>
+ * DOWNLOAD: use hg_download
+
2008-12-04 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* DOWNLOAD: use the better one from mutt
* DETAILS: fixed hg url
diff --git a/libs/libnfo/DOWNLOAD b/libs/libnfo/DOWNLOAD
index 2141846..24a9860 100755
--- a/libs/libnfo/DOWNLOAD
+++ b/libs/libnfo/DOWNLOAD
@@ -1,45 +1,8 @@
#once the hg download handler hits stable sorcery this DOWNLOAD script would
#only need to be removed, SOURCE_URL is compatible with the planned hg
handler
-function my_url_hg_http_crack() {
-
- URL=$(url_strip_prefix "$1" hg_http)
- HG_ROOT=$(echo $URL | sed "s#\(^[^/]*[^:]*\):.*#\1#")
- HG_ROOT=http://$HG_ROOT
- local HG_DIRECTORY_TAG=$(echo $URL | sed "s#^[^/]*[^:]*\(.*\)#\1#")
- HG_DIRECTORY=$(echo $HG_DIRECTORY_TAG | cut -d : -f2)
- local HG_TAGNAME=$(echo $HG_DIRECTORY_TAG | cut -d : -f3)
- HG_TAG=${HG_TAGNAME:=default}
-
-}
-
if [[ "${VERSION}" != "mercurial" && "${VERSION}" != "$(date +%Y%m%d)" ]];
then
- default_download &&
- return $?
-fi &&
-
-message "${MESSAGE_COLOR}Starting Mercurial checkout of" \
- "${FILE_COLOR}${SOURCE}${MESSAGE_COLOR}...${DEFAULT_COLOR}" &&
-my_url_hg_http_crack $SOURCE_URL &&
-if [[ -f $SOURCE_CACHE/$SOURCE ]]; then
- message "${MESSAGE_COLOR}Previous source found
unpacking...${DEFAULT_COLOR}" &&
- tar -jxf $SOURCE_CACHE/$SOURCE &&
- message "${MESSAGE_COLOR}Running hg pull...${DEFAULT_COLOR}" &&
- ( cd $HG_DIRECTORY &&
- echo hg pull $HG_ROOT &&
- hg pull $HG_ROOT &&
- echo hg update $HG_TAG &&
- hg update $HG_TAG )
+ default_download
else
- message "${MESSAGE_COLOR}Running hg clone...${DEFAULT_COLOR}"
- echo hg clone $HG_ROOT $HG_DIRECTORY
- hg clone $HG_ROOT $HG_DIRECTORY &&
- ( cd $HG_DIRECTORY &&
- echo hg update $HG_TAG &&
- hg update $HG_TAG )
-fi &&
-message "${MESSAGE_COLOR}Generating tarball...${DEFAULT_COLOR}" &&
-tar -jcf $SOURCE $HG_DIRECTORY &&
-cp $SOURCE $SOURCE_CACHE/$SOURCE &&
-rm $SOURCE &&
-message "${MESSAGE_COLOR}Mercurial checkout complete...${DEFAULT_COLOR}"
+ hg_download
+fi
diff --git a/libs/libnfo/HISTORY b/libs/libnfo/HISTORY
index 0cbb055..0abead6 100644
--- a/libs/libnfo/HISTORY
+++ b/libs/libnfo/HISTORY
@@ -1,3 +1,6 @@
+2011-06-01 Ismael Luceno <ismael AT sourcemage.org>
+ * DOWNLOAD: use hg_download
+
2010-03-03 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
* DOWNLOAD: fixing version test 'scm -> mercurial'
diff --git a/libs/libplayer/DOWNLOAD b/libs/libplayer/DOWNLOAD
index 2141846..24a9860 100755
--- a/libs/libplayer/DOWNLOAD
+++ b/libs/libplayer/DOWNLOAD
@@ -1,45 +1,8 @@
#once the hg download handler hits stable sorcery this DOWNLOAD script would
#only need to be removed, SOURCE_URL is compatible with the planned hg
handler
-function my_url_hg_http_crack() {
-
- URL=$(url_strip_prefix "$1" hg_http)
- HG_ROOT=$(echo $URL | sed "s#\(^[^/]*[^:]*\):.*#\1#")
- HG_ROOT=http://$HG_ROOT
- local HG_DIRECTORY_TAG=$(echo $URL | sed "s#^[^/]*[^:]*\(.*\)#\1#")
- HG_DIRECTORY=$(echo $HG_DIRECTORY_TAG | cut -d : -f2)
- local HG_TAGNAME=$(echo $HG_DIRECTORY_TAG | cut -d : -f3)
- HG_TAG=${HG_TAGNAME:=default}
-
-}
-
if [[ "${VERSION}" != "mercurial" && "${VERSION}" != "$(date +%Y%m%d)" ]];
then
- default_download &&
- return $?
-fi &&
-
-message "${MESSAGE_COLOR}Starting Mercurial checkout of" \
- "${FILE_COLOR}${SOURCE}${MESSAGE_COLOR}...${DEFAULT_COLOR}" &&
-my_url_hg_http_crack $SOURCE_URL &&
-if [[ -f $SOURCE_CACHE/$SOURCE ]]; then
- message "${MESSAGE_COLOR}Previous source found
unpacking...${DEFAULT_COLOR}" &&
- tar -jxf $SOURCE_CACHE/$SOURCE &&
- message "${MESSAGE_COLOR}Running hg pull...${DEFAULT_COLOR}" &&
- ( cd $HG_DIRECTORY &&
- echo hg pull $HG_ROOT &&
- hg pull $HG_ROOT &&
- echo hg update $HG_TAG &&
- hg update $HG_TAG )
+ default_download
else
- message "${MESSAGE_COLOR}Running hg clone...${DEFAULT_COLOR}"
- echo hg clone $HG_ROOT $HG_DIRECTORY
- hg clone $HG_ROOT $HG_DIRECTORY &&
- ( cd $HG_DIRECTORY &&
- echo hg update $HG_TAG &&
- hg update $HG_TAG )
-fi &&
-message "${MESSAGE_COLOR}Generating tarball...${DEFAULT_COLOR}" &&
-tar -jcf $SOURCE $HG_DIRECTORY &&
-cp $SOURCE $SOURCE_CACHE/$SOURCE &&
-rm $SOURCE &&
-message "${MESSAGE_COLOR}Mercurial checkout complete...${DEFAULT_COLOR}"
+ hg_download
+fi
diff --git a/libs/libplayer/HISTORY b/libs/libplayer/HISTORY
index 37e2b1d..fb696ab 100644
--- a/libs/libplayer/HISTORY
+++ b/libs/libplayer/HISTORY
@@ -1,3 +1,6 @@
+2011-06-01 Ismael Luceno <ismael AT sourcemage.org>
+ * DOWNLOAD: use hg_download
+
2010-03-03 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
* CONFIGURE : file added, for player selection
* DEPENDS : adding support for player selection, vlc dep added
diff --git a/libs/libsvdrp/DOWNLOAD b/libs/libsvdrp/DOWNLOAD
index c6c5535..3e723f3 100755
--- a/libs/libsvdrp/DOWNLOAD
+++ b/libs/libsvdrp/DOWNLOAD
@@ -1,45 +1,8 @@
#once the hg download handler hits stable sorcery this DOWNLOAD script would
#only need to be removed, SOURCE_URL is compatible with the planned hg
handler
-function my_url_hg_http_crack() {
-
- URL=$(url_strip_prefix "$1" hg_http)
- HG_ROOT=$(echo $URL | sed "s#\(^[^/]*[^:]*\):.*#\1#")
- HG_ROOT=http://$HG_ROOT
- local HG_DIRECTORY_TAG=$(echo $URL | sed "s#^[^/]*[^:]*\(.*\)#\1#")
- HG_DIRECTORY=$(echo $HG_DIRECTORY_TAG | cut -d : -f2)
- local HG_TAGNAME=$(echo $HG_DIRECTORY_TAG | cut -d : -f3)
- HG_TAG=${HG_TAGNAME:=default}
-
-}
-
if [[ "${VERSION}" != "scm" && "${VERSION}" != "$(date +%Y%m%d)" ]]; then
- default_download &&
- return $?
-fi &&
-
-message "${MESSAGE_COLOR}Starting Mercurial checkout of" \
- "${FILE_COLOR}${SOURCE}${MESSAGE_COLOR}...${DEFAULT_COLOR}" &&
-my_url_hg_http_crack $SOURCE_URL &&
-if [[ -f $SOURCE_CACHE/$SOURCE ]]; then
- message "${MESSAGE_COLOR}Previous source found
unpacking...${DEFAULT_COLOR}" &&
- tar -jxf $SOURCE_CACHE/$SOURCE &&
- message "${MESSAGE_COLOR}Running hg pull...${DEFAULT_COLOR}" &&
- ( cd $HG_DIRECTORY &&
- echo hg pull $HG_ROOT &&
- hg pull $HG_ROOT &&
- echo hg update $HG_TAG &&
- hg update $HG_TAG )
+ default_download
else
- message "${MESSAGE_COLOR}Running hg clone...${DEFAULT_COLOR}"
- echo hg clone $HG_ROOT $HG_DIRECTORY
- hg clone $HG_ROOT $HG_DIRECTORY &&
- ( cd $HG_DIRECTORY &&
- echo hg update $HG_TAG &&
- hg update $HG_TAG )
-fi &&
-message "${MESSAGE_COLOR}Generating tarball...${DEFAULT_COLOR}" &&
-tar -jcf $SOURCE $HG_DIRECTORY &&
-cp $SOURCE $SOURCE_CACHE/$SOURCE &&
-rm $SOURCE &&
-message "${MESSAGE_COLOR}Mercurial checkout complete...${DEFAULT_COLOR}"
+ hg_download
+fi
diff --git a/libs/libsvdrp/HISTORY b/libs/libsvdrp/HISTORY
index 2f61638..6e3cc53 100644
--- a/libs/libsvdrp/HISTORY
+++ b/libs/libsvdrp/HISTORY
@@ -1,2 +1,5 @@
+2011-06-01 Ismael Luceno <ismael AT sourcemage.org>
+ * DOWNLOAD: use hg_download
+
2009-12-08 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
* DEPENDS, DETAILS, DOWNLOAD, PREPARE, PRE_BUIL: Created
diff --git a/libs/libvalhalla/DOWNLOAD b/libs/libvalhalla/DOWNLOAD
index 2141846..24a9860 100755
--- a/libs/libvalhalla/DOWNLOAD
+++ b/libs/libvalhalla/DOWNLOAD
@@ -1,45 +1,8 @@
#once the hg download handler hits stable sorcery this DOWNLOAD script would
#only need to be removed, SOURCE_URL is compatible with the planned hg
handler
-function my_url_hg_http_crack() {
-
- URL=$(url_strip_prefix "$1" hg_http)
- HG_ROOT=$(echo $URL | sed "s#\(^[^/]*[^:]*\):.*#\1#")
- HG_ROOT=http://$HG_ROOT
- local HG_DIRECTORY_TAG=$(echo $URL | sed "s#^[^/]*[^:]*\(.*\)#\1#")
- HG_DIRECTORY=$(echo $HG_DIRECTORY_TAG | cut -d : -f2)
- local HG_TAGNAME=$(echo $HG_DIRECTORY_TAG | cut -d : -f3)
- HG_TAG=${HG_TAGNAME:=default}
-
-}
-
if [[ "${VERSION}" != "mercurial" && "${VERSION}" != "$(date +%Y%m%d)" ]];
then
- default_download &&
- return $?
-fi &&
-
-message "${MESSAGE_COLOR}Starting Mercurial checkout of" \
- "${FILE_COLOR}${SOURCE}${MESSAGE_COLOR}...${DEFAULT_COLOR}" &&
-my_url_hg_http_crack $SOURCE_URL &&
-if [[ -f $SOURCE_CACHE/$SOURCE ]]; then
- message "${MESSAGE_COLOR}Previous source found
unpacking...${DEFAULT_COLOR}" &&
- tar -jxf $SOURCE_CACHE/$SOURCE &&
- message "${MESSAGE_COLOR}Running hg pull...${DEFAULT_COLOR}" &&
- ( cd $HG_DIRECTORY &&
- echo hg pull $HG_ROOT &&
- hg pull $HG_ROOT &&
- echo hg update $HG_TAG &&
- hg update $HG_TAG )
+ default_download
else
- message "${MESSAGE_COLOR}Running hg clone...${DEFAULT_COLOR}"
- echo hg clone $HG_ROOT $HG_DIRECTORY
- hg clone $HG_ROOT $HG_DIRECTORY &&
- ( cd $HG_DIRECTORY &&
- echo hg update $HG_TAG &&
- hg update $HG_TAG )
-fi &&
-message "${MESSAGE_COLOR}Generating tarball...${DEFAULT_COLOR}" &&
-tar -jcf $SOURCE $HG_DIRECTORY &&
-cp $SOURCE $SOURCE_CACHE/$SOURCE &&
-rm $SOURCE &&
-message "${MESSAGE_COLOR}Mercurial checkout complete...${DEFAULT_COLOR}"
+ hg_download
+fi
diff --git a/libs/libvalhalla/HISTORY b/libs/libvalhalla/HISTORY
index dbfa5fe..d7dc593 100644
--- a/libs/libvalhalla/HISTORY
+++ b/libs/libvalhalla/HISTORY
@@ -1,3 +1,6 @@
+2011-06-01 Ismael Luceno <ismael AT sourcemage.org>
+ * DOWNLOAD: use hg_download
+
2010-03-03 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
* DOWNLOAD: fixing version test 'scm -> mercurial'
diff --git a/python-pypi/mercurial/DETAILS b/python-pypi/mercurial/DETAILS
index 2a5b467..9d48973 100755
--- a/python-pypi/mercurial/DETAILS
+++ b/python-pypi/mercurial/DETAILS
@@ -1,6 +1,6 @@
SPELL=mercurial
- VERSION=1.8.3
-
SOURCE_HASH=sha512:c78de7260bfaea0e9e8e78a9630371c3e5d0e5efb67bcce417be66e4b164c42a6d9168f930458c24b705b44af767a0d3df4be080687d4f0670a5476d2997c5d9
+ VERSION=1.8.4
+
SOURCE_HASH=sha512:e5f7fe54f36d27e2cb42b527a93a71dc604ddaa31b554ea28b29febc7be13a01fd3877b29adc97c04603cca7b2dce3b466a5cd4ad9f8a50ce5fc8bec53e6e355
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=http://www.selenic.com/mercurial/release/$SOURCE
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/python-pypi/mercurial/HISTORY b/python-pypi/mercurial/HISTORY
index d90f396..4da2f9f 100644
--- a/python-pypi/mercurial/HISTORY
+++ b/python-pypi/mercurial/HISTORY
@@ -1,3 +1,6 @@
+2011-06-02 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.8.4
+
2011-05-02 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: updated to 1.8.3
diff --git a/python-pypi/pymsnt/DOWNLOAD b/python-pypi/pymsnt/DOWNLOAD
index ce3191a..89c3683 100755
--- a/python-pypi/pymsnt/DOWNLOAD
+++ b/python-pypi/pymsnt/DOWNLOAD
@@ -1,66 +1,5 @@
-set +x
-function url_hg_crack() {
-
- URL=$(url_strip_prefix "$1" hg_http)
- HG_ROOT=$(echo $URL | sed "s#\(^[^/]*[^:]*\):.*#\1#")
- local HG_MODULE_TAG=$(echo $URL | sed "s#^[^/]*[^:]*\(.*\)#\1#")
- HG_MODULE=$(echo $HG_MODULE_TAG | cut -d : -f2)
- local HG_TAGNAME=$(echo $HG_MODULE_TAG | cut -d : -f3)
- HG_TAG=${HG_TAGNAME:-tip}
-
-}
-
if [[ $PYMSNT_SCM == y ]]; then
-url_hg_crack ${SOURCE_URL}
-message "${MESSAGE_COLOR}Starting Mercurial checkout of" \
- "${FILE_COLOR}${SOURCE}${MESSAGE_COLOR}...${DEFAULT_COLOR}" &&
-if [[ -f $SOURCE_CACHE/${SOURCE} ]]
-then
- message "${MESSAGE_COLOR}Previous source found
unpacking...${DEFAULT_COLOR}" &&
- tar -jxf $SOURCE_CACHE/${SOURCE} &&
- cd ${HG_MODULE} &&
- message "${MESSAGE_COLOR}Running Mercurial update...${DEFAULT_COLOR}" &&
- hg pull -u -r ${HG_TAG}
- cd ..
- message "${MESSAGE_COLOR}Done...${DEFAULT_COLOR}"
+ hg_download
else
- message "${MESSAGE_COLOR}Running initial Mercurial
clone...${DEFAULT_COLOR}" &&
- hg clone -r${HG_TAG} "http://${HG_ROOT}"; ${HG_MODULE}
- message "${MESSAGE_COLOR}Done...${DEFAULT_COLOR}"
-fi &&
-message "${MESSAGE_COLOR}Generating tarball...${DEFAULT_COLOR}" &&
-tar -jcf \
- ${SOURCE} \
- ${HG_MODULE} &&
-cp ${SOURCE} ${SOURCE_CACHE}/${SOURCE} &&
-rm ${SOURCE} &&
-message "${MESSAGE_COLOR}Mercurial checkout complete...${DEFAULT_COLOR}" &&
-# cleaning for the next one
-unset URL HG_ROOT HG_MODULE HG_TAG &&
-url_hg_crack ${SOURCE2_URL} &&
-message "${MESSAGE_COLOR}Starting Mercurial checkout of" \
- "${FILE_COLOR}${SOURCE2}${MESSAGE_COLOR}...${DEFAULT_COLOR}" &&
-if [[ -f $SOURCE_CACHE/${SOURCE2} ]]
-then
- message "${MESSAGE_COLOR}Previous source found
unpacking...${DEFAULT_COLOR}" &&
- tar -jxf $SOURCE_CACHE/${SOURCE2} &&
- cd ${HG_MODULE} &&
- message "${MESSAGE_COLOR}Running Mercurial update...${DEFAULT_COLOR}" &&
- hg pull -u -r ${HG_TAG}
- cd ..
- message "${MESSAGE_COLOR}Done...${DEFAULT_COLOR}"
-else
- message "${MESSAGE_COLOR}Running initial Mercurial
clone...${DEFAULT_COLOR}" &&
- hg clone -r${HG_TAG} "http://${HG_ROOT}"; ${HG_MODULE}
- message "${MESSAGE_COLOR}Done...${DEFAULT_COLOR}"
-fi &&
-message "${MESSAGE_COLOR}Generating tarball...${DEFAULT_COLOR}" &&
-tar -jcf \
- ${SOURCE2} \
- ${HG_MODULE} &&
-cp ${SOURCE2} ${SOURCE_CACHE}/${SOURCE2} &&
-rm ${SOURCE2} &&
-message "${MESSAGE_COLOR}Mercurial checkout complete...${DEFAULT_COLOR}"
-else
- acquire_src ''
+ default_download
fi
diff --git a/python-pypi/pymsnt/HISTORY b/python-pypi/pymsnt/HISTORY
index 2e29a77..2504fbc 100644
--- a/python-pypi/pymsnt/HISTORY
+++ b/python-pypi/pymsnt/HISTORY
@@ -1,3 +1,6 @@
+2011-06-01 Ismael Luceno <ismael AT sourcemage.org>
+ * DOWNLOAD: use hg_download
+
2009-01-03 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* PRE_BUILD: added for SCM version
* DETAILS: SCM version
diff --git a/python-pypi/scrapy/DEPENDS b/python-pypi/scrapy/DEPENDS
new file mode 100755
index 0000000..ff17518
--- /dev/null
+++ b/python-pypi/scrapy/DEPENDS
@@ -0,0 +1,7 @@
+depends python &&
+depends SETUPTOOLS &&
+depends twisted &&
+depends lxml &&
+depends simplejson &&
+depends w3lib &&
+depends pyopenssl
diff --git a/python-pypi/scrapy/DETAILS b/python-pypi/scrapy/DETAILS
new file mode 100755
index 0000000..cf6b611
--- /dev/null
+++ b/python-pypi/scrapy/DETAILS
@@ -0,0 +1,28 @@
+ SPELL=scrapy
+ SPELLX=Scrapy
+if [[ $SCRAPY_SCM == y ]]; then
+ if [[ "$SCRAPY_SCM_AUTOUPDATE" == "y" ]]; then
+ VERSION=$(date +%Y%m%d)
+ else
+ VERSION=scm
+ fi
+ SOURCE_IGNORE=volatile
+ SOURCE_URL[0]=hg_http://hg.scrapy.org/scrapy:$SPELL-scm
+ SOURCE=$SPELL-scm.tar.bz2
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-scm"
+else
+ VERSION=0.12.0.2542
+
SOURCE_HASH=sha512:b9346a3f723e241df5a6164d5f938f4c39e83fff7c275d450f6bea0de9686ccf6be26ce6b27e0ae9e7917495010ecb29c12f49091e26c858e51883cd4cab1507
+ SOURCE=$SPELLX-$VERSION.tar.gz
+ SOURCE_URL[0]=http://pypi.python.org/packages/source/S/$SPELLX/$SOURCE
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
+fi
+ WEB_SITE=http://scrapy.org/
+ LICENSE[0]=BSD
+ UPDATED=20110531
+ SHORT='A high-level Python Screen Scraping framework'
+cat << EOF
+Scrapy is a high level scraping and web crawling framework for writing
spiders
+to crawl and parse web pages for all kinds of purposes, from information
+retrieval to monitoring or testing web sites.
+EOF
diff --git a/python-pypi/scrapy/DOWNLOAD b/python-pypi/scrapy/DOWNLOAD
new file mode 100644
index 0000000..a11b9dc
--- /dev/null
+++ b/python-pypi/scrapy/DOWNLOAD
@@ -0,0 +1,5 @@
+if [[ "$SCRAPY_SCM" == "y" ]]; then
+ hg_download
+else
+ default_download
+fi
diff --git a/python-pypi/scrapy/HISTORY b/python-pypi/scrapy/HISTORY
new file mode 100644
index 0000000..3bbba7c
--- /dev/null
+++ b/python-pypi/scrapy/HISTORY
@@ -0,0 +1,3 @@
+2011-05-31 Ismael Luceno <ismael AT sourcemage.org>
+ * DEPENDS, DETAILS: spell created
+ * DETAILS, DOWNLOAD, PREPARE: add scm version
diff --git a/python-pypi/scrapy/PREPARE b/python-pypi/scrapy/PREPARE
new file mode 100755
index 0000000..bde3381
--- /dev/null
+++ b/python-pypi/scrapy/PREPARE
@@ -0,0 +1,6 @@
+config_query SCRAPY_SCM "Do you want to use SCM version?" n
+if [[ "$SCRAPY_SCM" == "y" ]]; then
+ config_query SCRAPY_SCM_AUTOUPDATE \
+ "Automaticaly update the spell on sorcery queue/system-update?" \
+ "n"
+fi
diff --git a/python-pypi/w3lib/DEPENDS b/python-pypi/w3lib/DEPENDS
new file mode 100755
index 0000000..84a0acc
--- /dev/null
+++ b/python-pypi/w3lib/DEPENDS
@@ -0,0 +1,2 @@
+depends python &&
+depends SETUPTOOLS
diff --git a/python-pypi/w3lib/DETAILS b/python-pypi/w3lib/DETAILS
new file mode 100755
index 0000000..df50dad
--- /dev/null
+++ b/python-pypi/w3lib/DETAILS
@@ -0,0 +1,22 @@
+ SPELL=w3lib
+ VERSION=1.0
+
SOURCE_HASH=sha512:007c6c08708c97be542937c598731dea07449e67ec90c5ce66aec5dce9286681ab04c007ed180fa1b7274ae74ecb8dc3c6520e422debee6f0420d9817f30bc03
+ SOURCE=$SPELL-$VERSION.tar.gz
+ SOURCE_URL[0]=http://pypi.python.org/packages/source/w/$SPELL/$SOURCE
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+ WEB_SITE=http://github.com/scrapy/w3lib
+ LICENSE[0]=BSD
+ UPDATED=20110531
+ SHORT='Library of web-related functions'
+cat << EOF
+This is a Python library of web-related functions, such as:
+* remove comments, or tags from HTML snippets
+* extract base url from HTML snippets
+* translate entites on HTML strings
+* encoding mulitpart/form-data
+* convert raw HTTP headers to dicts and vice-versa
+* construct HTTP auth header
+* RFC-compliant url joining
+* sanitize urls (like browsers do)
+* extract arguments from urls
+EOF
diff --git a/python-pypi/w3lib/HISTORY b/python-pypi/w3lib/HISTORY
new file mode 100644
index 0000000..6b244bf
--- /dev/null
+++ b/python-pypi/w3lib/HISTORY
@@ -0,0 +1,2 @@
+2011-05-31 Ismael Luceno <ismael AT sourcemage.org>
+ * DEPENDS, DETAILS: spell created
diff --git a/security/wireshark/DETAILS b/security/wireshark/DETAILS
index c478ab1..2b5032b 100755
--- a/security/wireshark/DETAILS
+++ b/security/wireshark/DETAILS
@@ -1,11 +1,11 @@
SPELL=wireshark
- VERSION=1.4.6
- SECURITY_PATCH=29
+ VERSION=1.4.7
+ SECURITY_PATCH=30
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
SOURCE_URL[1]=http://www.wireshark.org/download/src/$SOURCE
-
SOURCE_HASH=sha512:53fe11064adaf11e455b3555967f41b3b82483f26ef3b8bba3f925424374d3d9a161824d8e3bdab6490c43610856454f3f87addc3496a9c6fcd7fde3f5aeedc7
+
SOURCE_HASH=sha512:6d6f0497760f73673685fc6c8a601cde5198ef62d49b524292d1bfa36bea0671b922f303331e266ce0fc3852e0e77b35b105d7257da81c141ec577b23261412f
WEB_SITE=http://www.wireshark.org/
ENTERED=20020116
LICENSE[0]=GPL
diff --git a/security/wireshark/HISTORY b/security/wireshark/HISTORY
index 627d423..ac7cece 100644
--- a/security/wireshark/HISTORY
+++ b/security/wireshark/HISTORY
@@ -1,3 +1,7 @@
+2011-06-01 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.4.7, SECURITY_PATCH=30
+ http://www.wireshark.org/security/wnpa-sec-2011-08.html
+
2011-04-19 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.4.6
diff --git a/windowmanagers/wmii/DOWNLOAD b/windowmanagers/wmii/DOWNLOAD
index 4fce9e7..8f67500 100755
--- a/windowmanagers/wmii/DOWNLOAD
+++ b/windowmanagers/wmii/DOWNLOAD
@@ -1,44 +1,8 @@
#once the hg download handler hits stable sorcery this DOWNLOAD script would
#only need to be removed, SOURCE_URL is compatible with the planned hg
handler
-function my_url_hg_http_crack() {
-
- URL=$(url_strip_prefix "$1" hg_http)
- HG_ROOT=$(echo $URL | sed "s#\(^[^/]*[^:]*\):.*#\1#")
- HG_ROOT=http://$HG_ROOT
- local HG_DIRECTORY_TAG=$(echo $URL | sed "s#^[^/]*[^:]*\(.*\)#\1#")
- HG_DIRECTORY=$(echo $HG_DIRECTORY_TAG | cut -d : -f2)
- local HG_TAGNAME=$(echo $HG_DIRECTORY_TAG | cut -d : -f3)
- HG_TAG=${HG_TAGNAME:=default}
-
-}
if [[ $WMII_RELEASE != "SCM version" ]]; then
- default_download &&
- return $?
-fi &&
-
-message "${MESSAGE_COLOR}Starting Mercurial checkout of" \
- "${FILE_COLOR}${SOURCE}${MESSAGE_COLOR}...${DEFAULT_COLOR}" &&
-my_url_hg_http_crack $SOURCE_URL &&
-if [[ -f $SOURCE_CACHE/$SOURCE ]]; then
- message "${MESSAGE_COLOR}Previous source found
unpacking...${DEFAULT_COLOR}" &&
- tar -jxf $SOURCE_CACHE/$SOURCE &&
- message "${MESSAGE_COLOR}Running hg pull...${DEFAULT_COLOR}" &&
- ( cd $HG_DIRECTORY &&
- echo hg pull $HG_ROOT &&
- hg pull $HG_ROOT &&
- echo hg update $HG_TAG &&
- hg update $HG_TAG )
+ default_download
else
- message "${MESSAGE_COLOR}Running hg clone...${DEFAULT_COLOR}"
- echo hg clone $HG_ROOT $HG_DIRECTORY
- hg clone $HG_ROOT $HG_DIRECTORY &&
- ( cd $HG_DIRECTORY &&
- echo hg update $HG_TAG &&
- hg update $HG_TAG )
-fi &&
-message "${MESSAGE_COLOR}Generating tarball...${DEFAULT_COLOR}" &&
-tar -jcf $SOURCE $HG_DIRECTORY &&
-cp $SOURCE $SOURCE_CACHE/$SOURCE &&
-rm $SOURCE &&
-message "${MESSAGE_COLOR}Mercurial checkout complete...${DEFAULT_COLOR}"
+ hg_download
+fi
diff --git a/windowmanagers/wmii/HISTORY b/windowmanagers/wmii/HISTORY
index 17dd2b0..7fba733 100644
--- a/windowmanagers/wmii/HISTORY
+++ b/windowmanagers/wmii/HISTORY
@@ -1,3 +1,6 @@
+2011-06-01 Ismael Luceno <ismael AT sourcemage.org>
+ * DOWNLOAD: use hg_download
+
2011-05-20 Sukneet Basuta <sukneet AT sourcemage.org>
* DETAILS: fixed checking for SCM version
- [SM-Commit] GIT changes to devel-xorg-modular grimoire by Vlad Glagolev (ec51d69df9446fa5ff9ff327f0d90131f44885bf), Vlad Glagolev, 06/02/2011
Archive powered by MHonArc 2.6.24.