commit 0202740af55f54cdfb1fb7b9c70213f55fe5f957
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
mongodb: => 2.0.0
commit e669c8e2936b5c674242c5b219e1221e29646b9b
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>
kdenetwork4: qca2 is mandatory dependency (fixes #222)
commit 2df1bfcd7603acd116db7c3151d545944e14998a
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>
kdelibs4: request soprano with REDLAND RAPTOR DBUS VIRTUOSO support
(issue #223)
commit db7583489500f005614e66fb91cc357dc3c90dd7
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>
soprano: added SUB_DEPENDS and cleaned DEPENDS
* DEPENDS: only optional dependencies will do since we have SUB_DEPENDS
now
* {,PRE_}SUB_DEPENDS: added option to request REDLAND RAPTOR DBUS
VIRTUOSO support
* PREPARE: removed query for kde4 (we will now request support)
commit 09c1d71393aba964db8a48c12de941dc8f23f98c
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>
kdelibs4: added dependencies from KDE_DEPENDS
commit ca1087e389028922adbb2380a7e15567e2ab93a5
Author: Andraž 'ruskie' Levstik <ruskie+2054d253 AT codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie+2054d253 AT codemages.net>
dovecot: updated to 2.0.14 and pigeonhole to 0.2.4
commit 7610399c4598d0ef143d5918f81b623744172f12
Author: Andraž 'ruskie' Levstik <ruskie+2054d253 AT codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie+2054d253 AT codemages.net>
loudmouth: fixed ssl dependency
commit ed3c0da70a7eb338734742374bd9f037246445c0
Author: Andraž 'ruskie' Levstik <ruskie+2054d253 AT codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie+2054d253 AT codemages.net>
monit: update to 5.3
commit 009d0d068dde8eb63489094dfac580f335b3215f
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>
xfce/exo: updated spell to 0.6.2
commit 4ba0243a911be7ac5cb7093e434be2db01ee0372
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>
xfce/thunar: updated spell to 1.3.0
commit bb22244811c706138c2bc365e200ffb66528a3df
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>
FUNCTIONS: Replace prepare_scm_queries with prepare_select_branch
commit 3fb51a7602804226a60e8389011824f00446dd20
Author: Robert Figura <template AT sourcemage.org>
Commit: Robert Figura <template AT sourcemage.org>
revert broken python api changes (bug 197)
commit c3e14d6cffda2b8cd8fee82ad3691f9c8559a5d9
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>
pidgin-encryption: fixed SOURCE_URL for svn version (fixes #218)
commit a3b86098704e700db57b47b4bf3f2e6feefbe9d0
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>
pidgin-encryption: updated spell to 3.1
commit bc8e746843d86c74276fa379b8855e91883d006f
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>
qt4: updated sha512 only doc/ was changed (fixes #198)
commit cf23d7ed3a2f1ed87fa18329e4af79f824c561a1
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>
gnuplot: added lua and cairo as optional dependency
DETAILS,PREPARE,BUILD: removed support for lua 3rd party addon (fixes
#138)
commit ab306eb47972ffbebc0a9ad05807129ac0aa8eb7
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>
nevow: updated spell to 0.10.0 (fixes #96)
Fixed SOURCE, SOURCE_URL & WEB_SITE
commit 65bf27fde92f66bbb797266a4e26fc347cd5e446
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>
FUNCTIONS: Simplify get_up_spell_name
commit 5abd1dd16d8c9a007d743fe5415670d6e7c39f4a
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>
qbittorrent: updated spell to 2.8.5
commit 4b47f9376460846fa463e5f3de0f214b592a21ed
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>
rb-libtorrent: updated spell to 0.15.7
commit aed44bb033d1b2724ef0d0d86df7abbb11e15374
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>
libmemcached: updated spell to 0.52
commit 357bcbc5ae6f38d022b137d8d18e464f08935940
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>
bluedevil: updated spell to 1.2
commit d3f5fcec4734aa81a76ecb04373fec26d0c73865
Author: Julien ROZO <julien AT rozo.org>
Commit: Julien ROZO <julien AT rozo.org>
xine-lib: fixed issue #133
--with-external-vcdnav is now longer a recognized configure switch
It has been replaced with --with-internal-vcdlibs not to use external
libs from vcdimager-unstable
commit 7a7f98646cb784f1d8bc23858bfab686826c9bf2
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
feh 1.16.1
commit 14b971f7f43eff56f31bb4dcc3b2dcf5d755732a
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
camelot: => 11.09.10
commit e117d7645b84d3f8c2ce675073ecf36dbebcb511
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
x11vnc: => 0.9.13
commit a0b6b08836b48ce9c0dc83b66a0123ab78f4ae1e
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>
FUNCTIONS: added function prepare_scm_queries & get_up_spell_name
commit 6bff199d9802f726efceee27b812b11c51f8840b
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>
audio-players/qmmp: new spell: Qt4-based Multimedia Player
commit b9a8280c12ea76d2561ae28752bbe6b03095d2e2
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
apache22: => 2.2.21 (security)
commit 44747fd27ce9aa3e8835a81ad5956b349ecbdeac
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
added public key B55D9977 (William A. Rowe, Jr. <wrowe AT rowe-clan.net>)
commit c0b37ddaa9013c8fd1a93ecfb5ea498c635670b4
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
mongodb: => 1.8.3
commit 6e7a2779dc9ac2c36cda7b6d60be2a756c91c2fc
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
poppler-data: => 0.4.5
commit 9ff1ad2dc5f94f84fe8f79273febba0f1ebb6f90
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
mongodb: fixed indentation
commit 5243a2708c13d90f5ce46b4045be5ae2695fa14d
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
spidermonkey: added required zip dep
commit 59b7186f649882e3c834b963f942c5aaac869f75
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
django: => 1.3.1 (security)
commit 24da04334c58f553607e948f2f0c9781bce15c8c
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>
gcc: fixed the source numbers for java in PRE_BUILD (fixes #115)
commit f20a108d7244f8e8dff5daf53e3e8d8bb8b2b187
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
mc 4.7.5.4
commit 65d8386f8e15fa65593bd5be87e45bcb4494b289
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>
udev: use the latest version of {,PRE}SUB_DEPENDS for REPAIR not some
ancient
commit efde6206a20c8129de53a4eedbd4958fc43dd0ac
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>
dvdauthor: updated spell to 0.7.0 (fixed SOURCE_DIRECTORY)
commit 7194e6ae3f1a52ca1ff50fc1ede9d3165e808de1
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>
commit d80623c8da2e641186551c7041a70f87a5aa99b8
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
libestr: => 0.1.2
commit cc63f37dd513f23a650c565cc08c49c6f59e0e90
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
rsyslog: fix time machine
commit d57092dd0817488c122d36ec49ce92eb22cdf1e3
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
librsvg2: => 2.34.1 (security)
(cherry picked from commit 34119322eff0c15212fa4ab32f5a006ccdfbd52a)
commit 54da316ca6c4d4eef7946c385e8928b817f4c4c4
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
librsvg2 2.34.0
(cherry picked from commit 11ee7d5e63e17e4fe884acaa95147cd87ddee2de)
commit baceed642317789b5856bd9f8a2bd908d3c8276d
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
apache22: fixed build with external apr-util
commit 55aa52f8ce5bd5f2fbeb88949111561bdc012507
Author: Andraž 'ruskie' Levstik <ruskie+2054d253 AT codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie+2054d253 AT codemages.net>
oss: switched scm to sourceforge
diff --git a/ChangeLog b/ChangeLog
index 183188d..de7af09 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2011-09-16 Vlad Glagolev <stealth AT sourcemage.org>
+ * utils/pv: new spell, terminal-based tool for monitoring the progress
+ of data through a pipeline
+
+2011-09-14 Robert Figura <template AT sourcemage.org>
+ * python-pypi/pyqscintilla: new spell: install qscintilla bindings
for python
+
+2011-09-13 Bor Kraljič <pyrobor AT ver.si>
+ * audio-players/qmmp: new spell: Qt4-based Multimedia Player
+ * FUNCTIONS: added function prepare_scm_queries & get_up_spell_name
+
+2011-09-13 Vlad Glagolev <stealth AT sourcemage.org>
+ * apache.gpg: added public key B55D9977 (William A. Rowe, Jr.
+ <wrowe AT rowe-clan.net>)
+
2011-09-08 Bor Kraljič <pyrobor AT ver.si>
* kde4-look/plasma-wifi: removed, doesn't buid (plasmoids can now be
installed as user)
* kde4-look/plasmoid-atips: removed, doesn't buid (plasmoids can now
be installed as user)
diff --git a/FUNCTIONS b/FUNCTIONS
index 2b2bedc..0eb70eb 100755
--- a/FUNCTIONS
+++ b/FUNCTIONS
@@ -663,13 +663,45 @@ function default_kde3_build() {
}
+
+#---
+## Select SCM branch. If no parameter is given, it assumes a single scm
branch.
+##
+## Saves selected branch in ${SPELL}_BRANCH, and auto-update setting on
+## ${SPELL}_AUTOUPDATE.
+##
+## Usage:
+## . ${GRIMOIRE}/FUNCTIONS &&
+## prepare_select_branch [branch] ...
+#---
+function prepare_select_branch() {
+ local spell=$(get_up_spell_name) &&
+ local branch="$spell"_BRANCH &&
+
+ if [[ $# > 1 ]]; then
+ config_query_list $branch "Select one of the available branches:" "$@"
+ else
+ eval $branch=\""${1:-scm}"\"
+ fi &&
+
+ if [[ "${!branch/-*}" = scm ]]; then
+ config_query "$spell"_AUTOUPDATE 'Automatically update on every system
update?' n
+ fi
+}
+
+#---
+## Get uppercase spell name with _ instead of -
+#---
+function get_up_spell_name() {
+ echo ${1:-$SPELL} | tr "a-z-" "A-Z_"
+}
+
# Move SPELL_OPTS to OPTS
# basicly generic OPTS="$SPELL_OPTS $OPTS"
function prepare_opts() {
# this is here so that config_query_option can be used without
# extra junk
- local up_spell_name=$(echo $SPELL | tr "a-z" "A-Z") &&
- local up_spell_name=$(echo $up_spell_name | tr "-" "_") &&
+ local up_spell_name=$(get_up_spell_name) &&
local tempopts="${up_spell_name}_OPTS" &&
OPTS="${!tempopts} $OPTS"
}
diff --git a/apache.gpg b/apache.gpg
index 7c7efad..67d54cc 100644
Binary files a/apache.gpg and b/apache.gpg differ
diff --git a/archive/bacula/BUILD b/archive/bacula/BUILD
index ba4ab71..bbfa292 100755
--- a/archive/bacula/BUILD
+++ b/archive/bacula/BUILD
@@ -6,7 +6,7 @@ OPTS="--with-scriptdir=$INSTALL_ROOT/etc/bacula \
--with-working-dir=$INSTALL_ROOT/var/bacula \
$OPTS" &&
-if [[ $BACULA_SCM == y ]]; then
+if [[ $BACULA_BRANCH == scm ]]; then
cd bacula
fi &&
-if [[ $BACULA_SCM == y ]]; then
+if [[ $BACULA_BRANCH == scm ]]; then
depends git
fi &&
diff --git a/archive/bacula/DETAILS b/archive/bacula/DETAILS
index c33a539..edf3ab7 100755
--- a/archive/bacula/DETAILS
+++ b/archive/bacula/DETAILS
@@ -1,6 +1,6 @@
SPELL=bacula
-if [[ $BACULA_SCM == y ]]; then
- if [[ $BACULA_SCM_AUTOUPDATE == y ]]; then
+if [[ $BACULA_BRANCH == scm ]]; then
+ if [[ $BACULA_AUTOUPDATE == y ]]; then
VERSION=$(date +%Y%m%d)
else
VERSION=scm
diff --git a/archive/bacula/HISTORY b/archive/bacula/HISTORY
index 5a04b50..ecd8152 100644
--- a/archive/bacula/HISTORY
+++ b/archive/bacula/HISTORY
@@ -1,3 +1,6 @@
+2011-09-15 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD, DEPENDS, DETAILS, PREPARE: Use prepare_select_branch
+
2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS: changed dependency on g++ to dependency on gcc with
sub-depends on CXX (scripted)
diff --git a/archive/bacula/PREPARE b/archive/bacula/PREPARE
index f9b16ec..98d27e4 100755
--- a/archive/bacula/PREPARE
+++ b/archive/bacula/PREPARE
@@ -1,5 +1,2 @@
-config_query BACULA_SCM 'Build scm version ?' n &&
-
-if [[ $BACULA_SCM == y ]]; then
- config_query BACULA_SCM_AUTOUPDATE 'Update on every system update?' n
-fi
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm
diff --git a/audio-drivers/oss/DETAILS b/audio-drivers/oss/DETAILS
index 628497a..c771b4f 100755
--- a/audio-drivers/oss/DETAILS
+++ b/audio-drivers/oss/DETAILS
@@ -6,7 +6,7 @@ else
VERSION="4.3-scm"
fi
SOURCE=$SPELL-$VERSION.tar.bz2
- SOURCE_URL[0]=hg_http://mercurial.opensound.com/:$SPELL-scm
+
SOURCE_URL[0]=hg_http://opensound.hg.sourceforge.net:8000/hgroot/opensound/opensound:$SPELL-scm
SOURCE_IGNORE=volatile
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-scm"
elif [[ $OSS_BRANCH == test ]]; then
diff --git a/audio-drivers/oss/HISTORY b/audio-drivers/oss/HISTORY
index 3999ae8..b3a897b 100644
--- a/audio-drivers/oss/HISTORY
+++ b/audio-drivers/oss/HISTORY
@@ -1,6 +1,9 @@
2011-07-25 Bor Kraljič <pyrobor AT ver.si>
* DOWNLOAD: source $GRIMOIRE/hg_download.function before using
hg_download
+2011-06-11 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
+ * DETAILS: switched scm to sf
+
2011-06-01 Ismael Luceno <ismael AT sourcemage.org>
* DOWNLOAD: use hg_download
diff --git a/audio-drivers/pyalsa/DETAILS b/audio-drivers/pyalsa/DETAILS
index e981906..d79506a 100755
--- a/audio-drivers/pyalsa/DETAILS
+++ b/audio-drivers/pyalsa/DETAILS
@@ -1,6 +1,6 @@
SPELL=pyalsa
-if [[ $PYALSA_GIT == y ]]; then
- if [[ $PYALSA_GIT_AUTOUPDATE == y ]]; then
+if [[ $PYALSA_BRANCH == scm ]]; then
+ if [[ $PYALSA_AUTOUPDATE == y ]]; then
VERSION=$(date +%Y%m%d)
else
VERSION=git
diff --git a/audio-drivers/pyalsa/HISTORY b/audio-drivers/pyalsa/HISTORY
index 0ef09ac..18ada58 100644
--- a/audio-drivers/pyalsa/HISTORY
+++ b/audio-drivers/pyalsa/HISTORY
@@ -1,3 +1,6 @@
+2011-09-15 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS, PREPARE: Use prepare_select_branch
+
2011-02-08 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.0.24
diff --git a/audio-drivers/pyalsa/PREPARE b/audio-drivers/pyalsa/PREPARE
index 6ab056e..98d27e4 100755
--- a/audio-drivers/pyalsa/PREPARE
+++ b/audio-drivers/pyalsa/PREPARE
@@ -1,6 +1,2 @@
-config_query PYALSA_GIT "Build latest version from development tree?" n &&
-
-if [[ $PYALSA_GIT == y ]]; then
- config_query PYALSA_GIT_AUTOUPDATE \
- "Automatically update on every system update?" n
-fi
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm
diff --git a/audio-libs/openal-soft/DEPENDS b/audio-libs/openal-soft/DEPENDS
index 74b4c42..795e004 100755
--- a/audio-libs/openal-soft/DEPENDS
+++ b/audio-libs/openal-soft/DEPENDS
@@ -1,3 +1,5 @@
depends cmake &&
-optional_depends portaudio19 "" "" "for a portaudio backend" &&
-optional_depends pulseaudio "" "" "for a pulseaudio backend"
+optional_depends portaudio19 "-DPORTAUDIO=ON" "-DPORTAUDIO=OFF" \
+ "for a portaudio backend" &&
+optional_depends pulseaudio "-DPULSEAUDIO=ON" "-DPULSEAUDIO=OFF" \
+ "for a pulseaudio backend"
diff --git a/audio-libs/openal-soft/HISTORY b/audio-libs/openal-soft/HISTORY
index b2e2161..d2fdb56 100644
--- a/audio-libs/openal-soft/HISTORY
+++ b/audio-libs/openal-soft/HISTORY
@@ -1,3 +1,6 @@
+2011-09-18 Bor Kraljič <pyrobor AT ver.si>
+ * DEPENDS: added flags for disabling optional dependency
+
2010-04-08 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.12.854
diff --git a/audio-players/qmmp/BUILD b/audio-players/qmmp/BUILD
new file mode 100755
index 0000000..2113434
--- /dev/null
+++ b/audio-players/qmmp/BUILD
@@ -0,0 +1 @@
+qt4_cmake_build
diff --git a/audio-players/qmmp/DEPENDS b/audio-players/qmmp/DEPENDS
new file mode 100755
index 0000000..cd22645
--- /dev/null
+++ b/audio-players/qmmp/DEPENDS
@@ -0,0 +1,4 @@
+depends qt4 &&
+depends taglib &&
+depends curl &&
+depends cmake
diff --git a/audio-players/qmmp/DETAILS b/audio-players/qmmp/DETAILS
new file mode 100755
index 0000000..81927b0
--- /dev/null
+++ b/audio-players/qmmp/DETAILS
@@ -0,0 +1,15 @@
+ SPELL=qmmp
+ VERSION=0.5.2
+ SOURCE="${SPELL}-${VERSION}.tar.bz2"
+ SOURCE_URL[0]=http://${SPELL}.ylsoftware.com/files/${SOURCE}
+
SOURCE_HASH=sha512:be42fdbf69afc5f76164a843f2747b5fbc496cef0b3ae1eac2bb0c34014ea743403a0f3bc1e4bb7fe1f2d6e160ed8a18f08b95fa802b36ffb41dff597d71fe12
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE="http://qmmp.ylsoftware.com/"
+ LICENSE[0]="GPL"
+ ENTERED=20110913
+ KEYWORDS=""
+ SHORT="Qt-based Multimedia Player"
+cat << EOF
+This program is an audio-player, written with help of Qt library. The user
+interface is similar to winamp or xmms.
+EOF
diff --git a/audio-players/qmmp/HISTORY b/audio-players/qmmp/HISTORY
new file mode 100644
index 0000000..1598135
--- /dev/null
+++ b/audio-players/qmmp/HISTORY
@@ -0,0 +1,3 @@
+2011-09-13 Bor Kraljič <pyrobor AT ver.si>
+ * DEPENDS, DETAILS, BUILD: spell created
+
diff --git a/chat-im/choqok/DETAILS b/chat-im/choqok/DETAILS
index a291d18..7fc0ab3 100755
--- a/chat-im/choqok/DETAILS
+++ b/chat-im/choqok/DETAILS
@@ -11,10 +11,10 @@ if [ "$CHOQOK_SCM" = y ]; then
FORCE_DOWNLOAD=on
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-git"
else
- VERSION=0.9.98
- SOURCE="${SPELL}_${VERSION}.tar.bz2"
- SOURCE_URL[0]=http://${SPELL}.gnufolks.org/pkgs/${SOURCE}
-
SOURCE_HASH=sha512:cdf1d6fc00f729cedf9817724ef5fee857d71ef140bcb4a7169cfb4d5ce49afd992750a4aac8069b8d293a36eb3a738ad5b99dc036f3bb8e3b353daa432fd70b
+ VERSION=1.1
+ SOURCE="${SPELL}-${VERSION}.tar.bz2"
+
SOURCE_URL[0]=http://downloads.sourceforge.net/project/$SPELL/Choqok/$SOURCE
+
SOURCE_HASH=sha512:496247424fc099a9f8a61abd145a0876f42a9af50cee97f507b4258d97a4fb0092fdc65213954aa5629a5dbfc28e6e3a3c2150c4234202223a88f7c64cd14d43
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
fi
WEB_SITE="http://choqok.gnufolks.org"
diff --git a/chat-im/choqok/HISTORY b/chat-im/choqok/HISTORY
index eda3765..4c61460 100644
--- a/chat-im/choqok/HISTORY
+++ b/chat-im/choqok/HISTORY
@@ -1,3 +1,7 @@
+2011-09-15 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Fixed SOURCE_URL[0]
+ updated spell to 1.1
+
2011-01-12 Ismael Luceno <ismael AT sourcemage.org>
* PREPARE, DETAILS: add scm version
* DEPENDS: depends on kdelibs4
diff --git a/chat-im/pidgin-encryption/DEPENDS
b/chat-im/pidgin-encryption/DEPENDS
index 0aae5a9..9b72396 100755
--- a/chat-im/pidgin-encryption/DEPENDS
+++ b/chat-im/pidgin-encryption/DEPENDS
@@ -2,5 +2,5 @@ depends pidgin &&
depends nss &&
if [ "$PE_CVS" == "y" ]
-then depends CVS
+then depends subversion
fi
diff --git a/chat-im/pidgin-encryption/DETAILS
b/chat-im/pidgin-encryption/DETAILS
index 16d4d3f..33d6550 100755
--- a/chat-im/pidgin-encryption/DETAILS
+++ b/chat-im/pidgin-encryption/DETAILS
@@ -2,11 +2,12 @@
if [ "$PE_CVS" == "y" ]; then
VERSION=cvs
SOURCE=$SPELL-$VERSION.tar.bz2
-
SOURCE_URL[0]=svn://:pserver:anonymous AT pidgin-encrypt.cvs.sourceforge.net:/svnroot/pidgin-encrypt/trunk:encrypt
+
SOURCE_URL[0]=svn_https://pidgin-encrypt.svn.sourceforge.net:/svnroot/pidgin-encrypt/trunk:encrypt
+
FORCE_DOWNLOAD=1
SOURCE_IGNORE=volatile
else
- VERSION=3.0
+ VERSION=3.1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=$SOURCEFORGE_URL/pidgin-encrypt/$SOURCE
SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
@@ -16,7 +17,6 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
LICENSE[0]=GPL
CCACHE=off
ENTERED=20040627
- PATCHLEVEL=1
KEYWORDS="im chat pidgin encryption"
SHORT="uses NSS to provide RSA encryption as a Gaim plugin."
cat << EOF
diff --git a/chat-im/pidgin-encryption/HISTORY
b/chat-im/pidgin-encryption/HISTORY
index a82dfe6..8b914ce 100644
--- a/chat-im/pidgin-encryption/HISTORY
+++ b/chat-im/pidgin-encryption/HISTORY
@@ -1,3 +1,8 @@
+2011-09-13 Bor Kraljič <pyrobor AT ver.si>
+ * DETAILS: updated spell to 3.1
+ fixed SOURCE_URL for svn version (fixes #218)
+ * DEPENDS: changed CVS -> subversion
+
2007-10-15 Lalo Martins <lalo AT sourcemage.org>
* DETAILS, CONFIGURE: updating urls, and cvs->svn
diff --git a/chat-im/pidgin-encryption/pidgin-encryption-3.0.tar.gz.sig
b/chat-im/pidgin-encryption/pidgin-encryption-3.0.tar.gz.sig
deleted file mode 100644
index 544b2fc..0000000
Binary files a/chat-im/pidgin-encryption/pidgin-encryption-3.0.tar.gz.sig and
/dev/null differ
diff --git a/chat-im/pidgin-encryption/pidgin-encryption-3.1.tar.gz.sig
b/chat-im/pidgin-encryption/pidgin-encryption-3.1.tar.gz.sig
new file mode 100644
index 0000000..4a9d38c
Binary files /dev/null and
b/chat-im/pidgin-encryption/pidgin-encryption-3.1.tar.gz.sig differ
diff --git a/chat-irc/irssi/DEPENDS b/chat-irc/irssi/DEPENDS
index ef7bead..41b2b8e 100755
--- a/chat-irc/irssi/DEPENDS
+++ b/chat-irc/irssi/DEPENDS
@@ -17,6 +17,6 @@ optional_depends "dante" \
"--without-socks" \
"for SOCKS support" &&
-if [[ $IRSSI_SVN == y ]]; then
+if [[ $IRSSI_BRANCH == scm ]]; then
depends subversion
fi
diff --git a/chat-irc/irssi/DETAILS b/chat-irc/irssi/DETAILS
index 1e105ee..384e122 100755
--- a/chat-irc/irssi/DETAILS
+++ b/chat-irc/irssi/DETAILS
@@ -1,12 +1,10 @@
SPELL=irssi
-if [[ $IRSSI_SVN == y ]]; then
- if [[ $IRSSI_SVN_AUTOUPDATE == y ]]; then
+if [[ $IRSSI_BRANCH == scm ]]; then
+ if [[ $IRSSI_AUTOUPDATE == y ]]; then
VERSION=$(date +%Y%m%d)
else
VERSION=svn
fi
- SOURCE=$SPELL-$VERSION.tar.bz2
-SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
FORCE_DOWNLOAD=ON
SOURCE_HINTS=old_svn_compat
SOURCE_URL[0]=svn://svn.irssi.org/repos/irssi/trunk:irssi-svn
@@ -14,14 +12,14 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
else
VERSION=0.8.15
SECURITY_PATCH=1
- SOURCE=$SPELL-$VERSION.tar.bz2
-SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://www.irssi.org/files/$SOURCE
SOURCE2=$SOURCE.sig
SOURCE2_URL[0]=http://www.irssi.org/files/$SOURCE2
SOURCE2_IGNORE=signature
SOURCE_GPG=irssi.gpg:$SOURCE.sig:VERIFIED_UPSTREAM_KEY
fi
+ SOURCE=$SPELL-$VERSION.tar.bz2
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://www.irssi.org
ENTERED=20011126
LICENSE[0]=GPL
diff --git a/chat-irc/irssi/HISTORY b/chat-irc/irssi/HISTORY
index b4e7751..757ec6d 100644
--- a/chat-irc/irssi/HISTORY
+++ b/chat-irc/irssi/HISTORY
@@ -1,3 +1,6 @@
+2011-09-14 Ismael Luceno <ismael AT sourcemage.org>
+ * DEPENDS, PRE_BUILD, PREPARE, DETAILS: Use prepare_select_branch
+
2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS: changed dependency on g++ to dependency on gcc with
sub-depends on CXX (scripted)
diff --git a/chat-irc/irssi/PREPARE b/chat-irc/irssi/PREPARE
index 0c7a8c7..98d27e4 100755
--- a/chat-irc/irssi/PREPARE
+++ b/chat-irc/irssi/PREPARE
@@ -1,6 +1,2 @@
-config_query IRSSI_SVN "Build SVN version?" n &&
-
-if [[ $IRSSI_SVN == "y" ]]; then
- config_query IRSSI_SVN_AUTOUPDATE \
- "Automaticaly update the spell on sorcery
queue/system-update?" n
-fi
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm
diff --git a/chat-irc/irssi/PRE_BUILD b/chat-irc/irssi/PRE_BUILD
index b51ec91..50eea5f 100755
--- a/chat-irc/irssi/PRE_BUILD
+++ b/chat-irc/irssi/PRE_BUILD
@@ -1,6 +1,6 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&
-if [[ $IRSSI_SVN == y ]]; then
+if [[ $IRSSI_BRANCH == scm ]]; then
NOCONFIGURE=yes ./autogen.sh
fi
diff --git a/chat-libs/loudmouth/DEPENDS b/chat-libs/loudmouth/DEPENDS
index fe2bd08..94ed4d8 100755
--- a/chat-libs/loudmouth/DEPENDS
+++ b/chat-libs/loudmouth/DEPENDS
@@ -1,6 +1,6 @@
depends glib2 &&
depends libidn &&
-optional_depends "gnutls" \
- "" \
- "--without-ssl" \
+optional_depends "openssl" \
+ "--with-ssl=openssl" \
+ "--with-ssl=no" \
"for SSL support"
diff --git a/chat-libs/loudmouth/HISTORY b/chat-libs/loudmouth/HISTORY
index f529c61..e6427ef 100644
--- a/chat-libs/loudmouth/HISTORY
+++ b/chat-libs/loudmouth/HISTORY
@@ -1,3 +1,6 @@
+2011-09-14 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
+ * DEPENDS: fix ssl dependency
+
2009-08-08 Peng Chang (Charles) <chp AT sourcemage.org>
* PRE_BUILD: the macro for testing strndup is changed
* BUILD: added make_single
diff --git a/crypto/bcrypt/DETAILS b/crypto/bcrypt/DETAILS
index 01043ee..b6a2043 100755
--- a/crypto/bcrypt/DETAILS
+++ b/crypto/bcrypt/DETAILS
@@ -10,5 +10,9 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
KEYWORDS="crypto"
SHORT="bcrypt - a cross platform file encryption utility"
cat << EOF
-Bcrypt is a cross platform file encryption utility. Encrypted files are
portable across all supported operating systems and processors. Passphrases
must be between 8 and 56 characters and are hashed internally to a 448 bit
key. However, all characters supplied are significant. The stronger your
passphrase, the more secure your data.
+Bcrypt is a cross platform file encryption utility. Encrypted files are
+portable across all supported operating systems and processors. Passphrases
+must be between 8 and 56 characters and are hashed internally to a 448 bit
+key. However, all characters supplied are significant. The stronger your
+passphrase, the more secure your data.
EOF
diff --git a/crypto/bcrypt/HISTORY b/crypto/bcrypt/HISTORY
index 2c7d3f6..009eac2 100644
--- a/crypto/bcrypt/HISTORY
+++ b/crypto/bcrypt/HISTORY
@@ -1,3 +1,6 @@
+2011-09-15 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Word-wrap long description.
+
2010-02-21 Ladislav Hagara <hgr AT vabo.cz>
* BUILD, PRE_BUILD: fixed man path #15576
diff --git a/crypto/gpa/DETAILS b/crypto/gpa/DETAILS
index f71a848..ed38d61 100755
--- a/crypto/gpa/DETAILS
+++ b/crypto/gpa/DETAILS
@@ -1,7 +1,6 @@
SPELL=gpa
-
-if [ "$GPA_SVN" == "y" ]; then
- if [ "$GPA_SVN_AUTOUPDATE" == "y" ]; then
+if [ "$GPA_BRANCH" == "scm" ]; then
+ if [ "$GPA_AUTOUPDATE" == "y" ]; then
VERSION=$(date +%Y%m%d)
else
VERSION=svn
diff --git a/crypto/gpa/HISTORY b/crypto/gpa/HISTORY
index 9ea987b..d927e3d 100644
--- a/crypto/gpa/HISTORY
+++ b/crypto/gpa/HISTORY
@@ -1,3 +1,6 @@
+2011-09-15 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS, PREPARE, PRE_BUILD: Use prepare_select_branch
+
2010-06-01 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS, PREPARE, PRE_BUILD: added support for svn version #15730
diff --git a/crypto/gpa/PREPARE b/crypto/gpa/PREPARE
index 0ae4ee1..98d27e4 100755
--- a/crypto/gpa/PREPARE
+++ b/crypto/gpa/PREPARE
@@ -1,6 +1,2 @@
-config_query GPA_SVN "Build SCM (subversion) version?" n &&
-
-if [ "$GPA_SVN" == "y" ]; then
- config_query GPA_SVN_AUTOUPDATE \
- "Automatically update on every system update?" n
-fi
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm
diff --git a/crypto/gpa/PRE_BUILD b/crypto/gpa/PRE_BUILD
index d9b31dd..ece5339 100755
--- a/crypto/gpa/PRE_BUILD
+++ b/crypto/gpa/PRE_BUILD
@@ -1,6 +1,6 @@
default_pre_build &&
message "${MESSAGE_COLOR}" &&
-message "See the PostgreSQL HOWTO at http://sourcemage.org/HowTo/Postgresql
if you" &&
+message "See the PostgreSQL HOWTO at http://wiki.sourcemage.org/HowTo/Postgresql if you" &&
message "need help setting up PostgreSQL." &&
message "${DEFAULT_COLOR}"
diff --git a/database/postgresql/HISTORY b/database/postgresql/HISTORY
index d5c9eba..17c42f0 100644
--- a/database/postgresql/HISTORY
+++ b/database/postgresql/HISTORY
@@ -1,3 +1,6 @@
+2011-09-12 Bor Kraljič <pyrobor AT ver.si>
+ * FINAL: show user url that exists (sourcemage.org ->
wiki.sourcemage.org)
+
2011-05-21 Vlad Glagolev <stealth AT sourcemage.org>
* PRE_BUILD: apply the patch
* perl514.patch: added, to fix compilation with perl 5.14
diff --git a/devel/b43-tools/DETAILS b/devel/b43-tools/DETAILS
index 824068f..e0800c4 100755
--- a/devel/b43-tools/DETAILS
+++ b/devel/b43-tools/DETAILS
@@ -1,5 +1,5 @@
SPELL=b43-tools
-if [[ $B43TOOLS_AUTOUPDATE == y ]]; then
+if [[ $B43_TOOLS_AUTOUPDATE == y ]]; then
VERSION=$(date +%Y%m%d)
else
VERSION=git
diff --git a/devel/b43-tools/HISTORY b/devel/b43-tools/HISTORY
index 1101114..6c94ef5 100644
--- a/devel/b43-tools/HISTORY
+++ b/devel/b43-tools/HISTORY
@@ -1,3 +1,6 @@
+2011-09-14 Ismael Luceno <ismael AT sourcemage.org>
+ * PREPARE, DETAILS: Use prepare_select_branch
+
2010-10-08 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: fixed SOURCE_URL
diff --git a/devel/b43-tools/PREPARE b/devel/b43-tools/PREPARE
index 6ef5a11..f8b7d7e 100755
--- a/devel/b43-tools/PREPARE
+++ b/devel/b43-tools/PREPARE
@@ -1,2 +1,2 @@
-config_query B43TOOLS_AUTOUPDATE \
- "Automatically update on every system update?" n
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch
diff --git a/devel/spidermonkey/DEPENDS b/devel/spidermonkey/DEPENDS
index e210e76..f039f37 100755
--- a/devel/spidermonkey/DEPENDS
+++ b/devel/spidermonkey/DEPENDS
@@ -1,3 +1,5 @@
+depends zip &&
+
optional_depends nspr \
"--with-system-nspr" \
"--without-system-nspr" \
diff --git a/devel/spidermonkey/HISTORY b/devel/spidermonkey/HISTORY
index 3704d95..3754a21 100644
--- a/devel/spidermonkey/HISTORY
+++ b/devel/spidermonkey/HISTORY
@@ -1,3 +1,6 @@
+2011-09-13 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: added missing required zip dependency
+
2011-07-02 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS, BUILD, INSTALL: updated spell to 1.8.5
* DEPENDS: added, for missing dependencies
diff --git a/disk/udev/HISTORY b/disk/udev/HISTORY
index aea9a4b..600cae4 100644
--- a/disk/udev/HISTORY
+++ b/disk/udev/HISTORY
@@ -1,3 +1,6 @@
+2011-09-12 Bor Kraljič <pyrobor AT ver.si>
+ * REPAIR^all^{,PRE}SUB_DEPENDS: use the latest version for REPAIR not
some ancient
+
2011-08-30 Vlad Glagolev <stealth AT sourcemage.org>
* BUILD: killed another typo
diff --git a/disk/udev/REPAIR^all^PRE_SUB_DEPENDS
b/disk/udev/REPAIR^all^PRE_SUB_DEPENDS
index 34515c6..5922183 100755
--- a/disk/udev/REPAIR^all^PRE_SUB_DEPENDS
+++ b/disk/udev/REPAIR^all^PRE_SUB_DEPENDS
@@ -1,5 +1,9 @@
case $THIS_SUB_DEPENDS in
- EXTRAS) list_find "$UDEV_OPTS" --enable-extras;;
-*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
- return 1;;
+ EXTRAS) message "the spell you are trying to cast is broken."
+ message "Udev's sub_depends have changed, contact the maintainer."
;;
+ GUDEV) is_depends_enabled $SPELL glib2 && return 0 ;;
+ ACL) is_depends_enabled $SPELL acl && return 0 ;;
+ HWDB) list_find "$UDEV_HWDB" --enable-hwdb ;;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
+ return 1;;
esac
diff --git a/disk/udev/REPAIR^all^SUB_DEPENDS
b/disk/udev/REPAIR^all^SUB_DEPENDS
new file mode 100755
index 0000000..f078172
--- /dev/null
+++ b/disk/udev/REPAIR^all^SUB_DEPENDS
@@ -0,0 +1,9 @@
+case "$THIS_SUB_DEPENDS" in
+ EXTRAS) message "${PROBLEM_COLOR}EXTRAS is obsolete, please fix the
spell using it${DEFAULT_COLOR}" ;;
+ GUDEV) depends glib2 '--enable-gudev' ;;
+ ACL) depends acl '--enable-udev_acl' ;;
+ HWDB) list_remove UDEV_HWDB '--disable-hwdb'
+ list_add UDEV_HWDB '--enable-hwdb' ;;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" &&
+ return 1;;
+esac
diff --git a/doc/dvipng/DETAILS b/doc/dvipng/DETAILS
index 033e1fd..5a6415e 100755
--- a/doc/dvipng/DETAILS
+++ b/doc/dvipng/DETAILS
@@ -1,8 +1,8 @@
SPELL=dvipng
- VERSION=1.12
+ VERSION=1.14
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_URL[0]=http://mirror.lihnidos.org/GNU/savannah/${SPELL}/${SOURCE}
-
SOURCE_HASH=sha512:66cc9140cc04cc79a483b440ca6784a31c16266b3ffd0d2fdc47282173d27bdc5c7312b5e3a29e50024bb6e587254672a9f4571d238afcdd14cd04034c3f092f
+
SOURCE_HASH=sha512:d7dda0e83ec93c0ebb9c970f2464ed1b04cdd41c178165db6da7c37b90810f3be0a513b9a43162563cb5ca15a7dec3c12a49f27abeb44fca3739090661ab53ba
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://www.nongnu.org/dvipng/"
LICENSE[0]="LGPL"
diff --git a/doc/dvipng/HISTORY b/doc/dvipng/HISTORY
index 2d2364c..e7b8d41 100644
--- a/doc/dvipng/HISTORY
+++ b/doc/dvipng/HISTORY
@@ -1,3 +1,6 @@
+2011-09-16 Pol Vinogradov <vin.public AT gmail.com>
+ * DETAILS: updated spell to 1.14
+
2010-08-10 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
* DETAILS: removed dos newlines
diff --git a/ftp-libs/rb-libtorrent/DETAILS b/ftp-libs/rb-libtorrent/DETAILS
index eaa7aa4..f3f61ed 100755
--- a/ftp-libs/rb-libtorrent/DETAILS
+++ b/ftp-libs/rb-libtorrent/DETAILS
@@ -1,8 +1,8 @@
SPELL=rb-libtorrent
- VERSION=0.15.6
+ VERSION=0.15.7
SOURCE=libtorrent-rasterbar-$VERSION.tar.gz
SOURCE_URL[0]=http://libtorrent.googlecode.com/files/$SOURCE
-
SOURCE_HASH=sha512:b62939fd8e067c536236bc5b96498c65de454eaeb76e23c360c848a523f6b306410164ef90ca2540324f4f6d6be88072903f6002075621e108c26550ad447e2d
+
SOURCE_HASH=sha512:2716625cc663a471d6b78425965a93041cca383b598de265d94f0b3db59187d6193216514e0d15d278a6ce45f41040d4613c0dad938b61800cbf22346ff2c3bd
SOURCE_DIRECTORY="$BUILD_DIRECTORY/libtorrent-rasterbar-$VERSION"
WEB_SITE=http://www.rasterbar.com/products/libtorrent/
LICENSE=BSD
diff --git a/ftp-libs/rb-libtorrent/HISTORY b/ftp-libs/rb-libtorrent/HISTORY
index b3b8d30..134eb77 100644
--- a/ftp-libs/rb-libtorrent/HISTORY
+++ b/ftp-libs/rb-libtorrent/HISTORY
@@ -1,3 +1,6 @@
+2011-09-13 Bor Kraljič <pyrobor AT ver.si>
+ * DETAILS: updated spell to 0.15.7
+
2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS: changed dependency on g++ to dependency on gcc with
sub-depends on CXX (scripted)
diff --git a/ftp/curl/DETAILS b/ftp/curl/DETAILS
index e6c0e5a..9b5fc52 100755
--- a/ftp/curl/DETAILS
+++ b/ftp/curl/DETAILS
@@ -1,5 +1,5 @@
SPELL=curl
- VERSION=7.21.7
+ VERSION=7.22.0
SECURITY_PATCH=8
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.asc
@@ -10,7 +10,6 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE2_URL[0]=$SOURCE_URL.asc
SOURCE_GPG=curl.gpg:$SOURCE2:UPSTREAM_KEY
SOURCE2_IGNORE=signature
- PATCHLEVEL=0
WEB_SITE=http://curl.haxx.se/
ENTERED=20010922
LICENSE[0]=MIT
diff --git a/ftp/curl/HISTORY b/ftp/curl/HISTORY
index 4ef9e19..b74b860 100644
--- a/ftp/curl/HISTORY
+++ b/ftp/curl/HISTORY
@@ -1,3 +1,6 @@
+2011-09-14 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 7.22.0
+
2011-06-24 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 7.21.7, SECURITY_PATCH=8 http://curl.haxx.se/docs/adv_20110623.html
diff --git a/ftp/lftp/DETAILS b/ftp/lftp/DETAILS
index 8211a23..85804a4 100755
--- a/ftp/lftp/DETAILS
+++ b/ftp/lftp/DETAILS
@@ -1,5 +1,5 @@
SPELL=lftp
- VERSION=4.3.1
+ VERSION=4.3.2
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/ftp/lftp/HISTORY b/ftp/lftp/HISTORY
index 84caff6..92eea62 100644
--- a/ftp/lftp/HISTORY
+++ b/ftp/lftp/HISTORY
@@ -1,3 +1,6 @@
+2011-09-17 Bor Kraljič <pyrobor AT ver.si>
+ * DETAILS: updated spell to 4.3.2
+
2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS: changed dependency on g++ to dependency on gcc with
sub-depends on CXX (scripted)
diff --git a/ftp/qbittorrent/DEPENDS b/ftp/qbittorrent/DEPENDS
index a1b3e70..a31e43e 100755
--- a/ftp/qbittorrent/DEPENDS
+++ b/ftp/qbittorrent/DEPENDS
@@ -1,5 +1,4 @@
depends qt4 &&
depends rb-libtorrent &&
depends curl &&
-optional_depends geoip "" "--disable-geoip-database" "for GeoIP location
support" &&
-optional_depends libnotify "" "--disable-libnotify" "for libnotify support"
+optional_depends geoip "" "--disable-geoip-database" "for GeoIP location
support"
diff --git a/ftp/qbittorrent/DETAILS b/ftp/qbittorrent/DETAILS
index 0a20bcf..8983dc7 100755
--- a/ftp/qbittorrent/DETAILS
+++ b/ftp/qbittorrent/DETAILS
@@ -1,8 +1,8 @@
SPELL=qbittorrent
- VERSION=2.5.1
+ VERSION=2.8.5
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:033a4992d17acd12f8644eed07d8337142e054b53ea971a294c7f1a2631042ed0ff32395ff31df4b2934da568ff2964c67d1fc213703931a1ee0cbb549dc2ea3
+
SOURCE_HASH=sha512:086f614f296b4c46bc46848e434839108707552e35e48c863ed3bd90e6702d631836715cce520e1b2318f4be127154717805f14fc35deec63a7234f8cd2b5c9a
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE="http://www.qbittorrent.org/"
LICENSE=GPL
diff --git a/ftp/qbittorrent/HISTORY b/ftp/qbittorrent/HISTORY
index 6bca70f..e7b0ed7 100644
--- a/ftp/qbittorrent/HISTORY
+++ b/ftp/qbittorrent/HISTORY
@@ -1,3 +1,7 @@
+2011-09-13 Bor Kraljič <pyrobor AT ver.si>
+ * DETAILS: updated spell to 2.8.5
+ * DEPENDS: removed libnotify as optional dependency
+
2010-12-08 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: updated spell to 2.5.1
diff --git a/http/apache22/BUILD b/http/apache22/BUILD
index 32db176..67ab6cc 100755
--- a/http/apache22/BUILD
+++ b/http/apache22/BUILD
@@ -4,6 +4,9 @@ APACHE22_EXTRA="${APACHE22_EXTRA} --with-mpm=${APACHE22_MPM}"
&&
# remove APR and APU and reconfigure to use external ones
rm -fr srclib/apr*/ &&
+# correct flags to find external apr-util
+CPPFLAGS="`apr-config --includes` $CPPFLAGS" &&
+
# use smgl standard layout
cp -f $SCRIPT_DIRECTORY/config.layout $SOURCE_DIRECTORY &&
diff --git a/http/apache22/CONFIGURE b/http/apache22/CONFIGURE
index 54bc751..b8f5444 100755
--- a/http/apache22/CONFIGURE
+++ b/http/apache22/CONFIGURE
@@ -1,4 +1,4 @@
-message "${PROBLEM_COLOR}Before picking a MPM, please see: http://sourcemage.org/ApacheMPM${DEFAULT_COLOR}" &&
+message "${PROBLEM_COLOR}Before picking a MPM, please see: http://wiki.sourcemage.org/ApacheMPM${DEFAULT_COLOR}" &&
config_query_list APACHE22_MPM "Which MPM would you like?" prefork worker
event &&
# Apache2 CONFIGURE script
diff --git a/http/apache22/DETAILS b/http/apache22/DETAILS
index 6d9f5d8..d55d3e9 100755
--- a/http/apache22/DETAILS
+++ b/http/apache22/DETAILS
@@ -1,6 +1,6 @@
SPELL=apache22
- VERSION=2.2.20
- SECURITY_PATCH=13
+ VERSION=2.2.21
+ SECURITY_PATCH=14
SOURCE=httpd-$VERSION.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_GPG="apache.gpg:$SOURCE2:UPSTREAM_KEY"
diff --git a/http/apache22/HISTORY b/http/apache22/HISTORY
index b583274..98b1151 100644
--- a/http/apache22/HISTORY
+++ b/http/apache22/HISTORY
@@ -1,3 +1,13 @@
+2011-09-13 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.2.21; SECURITY_PATCH++ (CVE-2011-3348,
+ regression introduced by the CVE-2011-3192)
+
+2011-09-12 Bor Kraljič <pyrobor AT ver.si>
+ * CONFIGURE: fixed url sourcemage.org -> wiki.sourcemage.org (fixes
#181)
+
+2011-09-12 Vlad Glagolev <stealth AT sourcemage.org>
+ * BUILD: fixed build with external apr-util (resolves #51)
+
2011-08-31 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 2.2.20; SECURITY_PATCH++ (CVE-2011-3192)
diff --git a/http/ashd/DETAILS b/http/ashd/DETAILS
index 3b7e741..5316660 100755
--- a/http/ashd/DETAILS
+++ b/http/ashd/DETAILS
@@ -30,9 +30,9 @@ simple protocol (not unlike Unix pipelines). The design of
Ashd brings it
a number of nice properties, the following being the most noteworthy ones.
Sanity of design The separation of concerns between different, independent
-programs is an example of standard Unix philosophy – each program
+programs is an example of standard Unix philosophy - each program
does one thing only, but does it well (I hope). The clean delineation of
-functions allows each program to be very small and simple – currently,
+functions allows each program to be very small and simple - currently,
each of the programs in the collection (including even the core HTTP parser
program, htparser, as long as one does not count its, quite optional, SSL
implementation) is implemented in less than 1,000 lines of C code (and most
@@ -54,6 +54,6 @@ possible, and most programs are configured simply with
command-line options.
Persistence Though Ashd is a multi-process program, it is not in the same
sense as e.g. Apache. Each request handler continues to run indefinitely
and does not spawn multiple copies of itself, meaning that all process
-state persists between requests – session data can be kept in memory,
+state persists between requests - session data can be kept in memory,
connections to back-end services can be kept open, and so on.
EOF
diff --git a/http/ashd/HISTORY b/http/ashd/HISTORY
index ac0d6a9..1af6cb5 100644
--- a/http/ashd/HISTORY
+++ b/http/ashd/HISTORY
@@ -1,3 +1,6 @@
+2011-09-15 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Remove non-ASCII dash from long description.
+
2011-05-02 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
* DETAILS: updated spell to 0.8
diff --git a/http/midori/DETAILS b/http/midori/DETAILS
index 4d0a573..fc57c6c 100755
--- a/http/midori/DETAILS
+++ b/http/midori/DETAILS
@@ -1,22 +1,23 @@
SPELL=midori
-if [[ $MIDORI_VCS == y ]]; then
- if [[ $MIDOTRI_VCS_AUTOUPDATE == y ]]; then
+if [[ $MIDORI_BRANCH == scm ]]; then
+ if [[ $MIDORI_AUTOUPDATE == y ]]; then
VERSION=$(date +%Y%m%d)
else
VERSION=git
fi
- SOURCE=$SPELL-$VERSION.tar.bz2
- SOURCE_URL[0]=git://git.xfce.org/apps/midori:$SPELL
+ SOURCE=$SPELL-git.tar.bz2
+ SOURCE_URL[0]=git://git.xfce.org/apps/$SPELL:$SPELL
SOURCE_IGNORE=volatile
FORCE_DOWNLOAD=on
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL"
else
VERSION=0.4.0
BRANCH=`echo $VERSION | cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=http://archive.xfce.org/src/apps/$SPELL/$BRANCH/$SOURCE
SOURCE_HASH=sha512:8a48bfdfd630e85371caa7be9da56925e2bb1abfa1bcdfda59643493753d66c1b96b68e8fd8194455439b4ed85413cefdc3b14cc3738f47a1691faf0e27633bd
-fi
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+fi
WEB_SITE=http://software.twotoasts.de/?page=midori
LICENSE[0]=GPL
ENTERED=20071209
diff --git a/http/midori/HISTORY b/http/midori/HISTORY
index e75a4bc..7958555 100644
--- a/http/midori/HISTORY
+++ b/http/midori/HISTORY
@@ -1,3 +1,7 @@
+2011-09-14 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Fix scm SOURCE and SOURCE_DIRECTORY
+ * PREPARE, DETAILS: Use prepare_select_branch
+
2011-08-01 George Sherwood <gsherwood AT sourcemage.org>
* DETAILS: Updated to version 0.4.0
* DEPENDS: Now depends vala
diff --git a/http/midori/PREPARE b/http/midori/PREPARE
index ea40eb7..98d27e4 100755
--- a/http/midori/PREPARE
+++ b/http/midori/PREPARE
@@ -1,6 +1,2 @@
-config_query MIDORI_VCS "Build latest version from development tree?" n &&
-
-if [[ $MIDORI_VCS == y ]]; then
- config_query MIDORI_VCS_AUTOUPDATE \
- "Automatically update on every system update?" n
-fi
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm
diff --git a/kde4-apps/bluedevil/DETAILS b/kde4-apps/bluedevil/DETAILS
index 9b98c77..28774e1 100755
--- a/kde4-apps/bluedevil/DETAILS
+++ b/kde4-apps/bluedevil/DETAILS
@@ -1,9 +1,8 @@
SPELL=bluedevil
- VERSION=1.1.1
- PATCHLEVEL=1
+ VERSION=1.2
SOURCE="${SPELL}-${VERSION}.tar.bz2"
SOURCE_URL[0]=$KDE_URL/stable/${SPELL}/${VERSION}/src/${SOURCE}
-
SOURCE_HASH=sha512:34fc6128cc42de1da9010046abf36b220018c3f19c620a9fd315a65add334ba490a9999eebc9903b55ee16d1f10a32e6c847d20940254f900ddc03762bf84008
+
SOURCE_HASH=sha512:cd4e6c93b9d7ba18e3ec499a1facb4a5351667e54f6c707e31938fc01f83b043af9499757376b44db6b8caecfe34adc74afca46b85852cc80ca37a3d81a3f5a8
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="https://projects.kde.org/projects/extragear/base/bluedevil"
LICENSE[0]="GPL"
diff --git a/kde4-apps/bluedevil/HISTORY b/kde4-apps/bluedevil/HISTORY
index 9ab0fac..de79fe1 100644
--- a/kde4-apps/bluedevil/HISTORY
+++ b/kde4-apps/bluedevil/HISTORY
@@ -1,3 +1,6 @@
+2011-09-13 Bor Kraljič <pyrobor AT ver.si>
+ * DETAILS: updated spell to 1.2
+
2011-09-06 Bor Kraljič <pyrobor AT ver.si>
* CONFLICTS: added, conflict with kdebluetooth4
diff --git a/kde4-apps/kid3-kde4/DETAILS b/kde4-apps/kid3-kde4/DETAILS
index 0340067..7824861 100755
--- a/kde4-apps/kid3-kde4/DETAILS
+++ b/kde4-apps/kid3-kde4/DETAILS
@@ -1,8 +1,7 @@
SPELL=kid3-kde4
SPELLX=kid3
- VERSION=1.5
- PATCHLEVEL=1
-
SOURCE_HASH=sha512:ffd2b100b9289b31ea6ed67e08272436e985228975bc9a24a37a956843a9a5f881aaad63f1a39ed7bf8bc3474e9cd3a0cd88fee55f2b0e64254ddf58ed790c37
+ VERSION=2.0
+
SOURCE_HASH=sha512:dc9b065316e020853b79b2d89f626e28adf4ee29ed58f8fdec844a09d1fdd40e24e7b9f4f4b66ddace7a2bac788ff9493c053e93aaa3fbb436b5dbc4528d30e1
SOURCE=$SPELLX-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELLX/$SOURCE
diff --git a/kde4-apps/kid3-kde4/HISTORY b/kde4-apps/kid3-kde4/HISTORY
index 3617a3d..de6b636 100644
--- a/kde4-apps/kid3-kde4/HISTORY
+++ b/kde4-apps/kid3-kde4/HISTORY
@@ -1,3 +1,6 @@
+2011-09-12 Bor Kraljič <pyrobor AT ver.si>
+ * DETAILS: updated spell to 2.0
+
2011-09-04 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: PATCHLEVEL++ for /opt/kde4 -> /usr change
diff --git a/kde4-support/akonadi/DETAILS b/kde4-support/akonadi/DETAILS
index 09ac4e2..bfd0f28 100755
--- a/kde4-support/akonadi/DETAILS
+++ b/kde4-support/akonadi/DETAILS
@@ -1,7 +1,6 @@
SPELL=akonadi
- VERSION=1.6.0
- PATCHLEVEL=1
-
SOURCE_HASH=sha512:ea122845fd66b7a01b93a9a949a38718390778149fc3f5405d80ed2947ae21451b3a4207b196fe45f482330d6c731d9526237330089964dc0825dfb41f61cd3f
+ VERSION=1.6.1
+
SOURCE_HASH=sha512:e221df425aadf4ccd02000c94b12f87d6f1cf130e2e0187d59b8b19874d1de4ef00de126834fe273377284a7f6362b125d62d85a3024ac81d54ea8c3bee7284d
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=$KDE_URL/stable/$SPELL/src/$SOURCE
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/kde4-support/akonadi/HISTORY b/kde4-support/akonadi/HISTORY
index 8d69dd6..c930c14 100644
--- a/kde4-support/akonadi/HISTORY
+++ b/kde4-support/akonadi/HISTORY
@@ -1,3 +1,6 @@
+2011-09-16 Bor Kraljič <pyrobor AT ver.si>
+ * DETAILS: updated spell to 1.6.1
+
2011-09-04 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: PATCHLEVEL++ for /opt/kde4 -> /usr change
-if [ "$GLIBC_CVS" = "y" ]; then
- depends CVS
+if [ "$GLIBC_GIT" = "y" ]; then
+ depends git
fi &&
if [ "$GLIBC_USEIDN" = "y" ]; then
diff --git a/libs/glibc/DETAILS b/libs/glibc/DETAILS
index 926e198..0219656 100755
--- a/libs/glibc/DETAILS
+++ b/libs/glibc/DETAILS
@@ -20,17 +20,18 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE5_HASH=sha512:c1931495915c8461de97e4156c9d0edd7b44e4b48cbce2d4c3a52b83d331a9ce48f3c7abb7dd787ed897f1e7d0e81c5cdb4eb3986bc24a5e2788708427e2dcb1
PATCHLEVEL=1
else
- if [[ "$GLIBC_CVS" == "y" ]]; then
+ if [[ "$GLIBC_GIT" == "y" ]]; then
local GLIBC_VERSION
GLIBC_VERSION=2.13
- if [[ "${GLIBC_CVS_AUTOUPDATE}" == "y" ]]; then
- VERSION=${GLIBC_VERSION}-$(date +%Y%m%d) && FORCE_DOWNLOAD=on
+ if [[ "${GLIBC_GIT_AUTOUPDATE}" == "y" ]]; then
+ VERSION=${GLIBC_VERSION}-git-$(date +%Y%m%d)
else
- VERSION=${GLIBC_VERSION}
+ VERSION=${GLIBC_VERSION}-git
fi
- SOURCE=$SPELL-${GLIBC_VERSION}.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-${GLIBC_VERSION}
-
SOURCE_URL=cvs://:pserver:anoncvs:anoncvs AT sources.redhat.com:/cvs/glibc:libc:$SPELL-${GLIBC_VERSION/./_}-branch
+ FORCE_DOWNLOAD=on
+ SOURCE=$SPELL-git.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-git
+
SOURCE_URL="git://sourceware.org/git/glibc.git:$SPELL-git:release/${GLIBC_VERSION}/master"
SOURCE_IGNORE=volatile
else
VERSION=2.13
diff --git a/libs/glibc/HISTORY b/libs/glibc/HISTORY
index 7416236..642b1f9 100644
--- a/libs/glibc/HISTORY
+++ b/libs/glibc/HISTORY
@@ -1,3 +1,7 @@
+2011-09-12 Bor Kraljič <pyrobor AT ver.si>
+ * PREPARE,DETAILS: changed cvs url to git (uses 2.13 branch) (fixes
#195)
+ * DEPENDS: replaced CVS with git
+
2011-07-25 Ladislav Hagara <hgr AT vabo.cz>
* PREPARE, DETAILS: linux 3 support added
diff --git a/libs/glibc/PREPARE b/libs/glibc/PREPARE
index 14df969..39ce0cc 100755
--- a/libs/glibc/PREPARE
+++ b/libs/glibc/PREPARE
@@ -5,9 +5,9 @@ if [[ $(uname -r) = 2.6.* ]] || [[ $(uname -r) = 3.*
]]; then
else
config_query GLIBC_NPTL "As you are running a $(uname -r | cut -f1,2
-d.) kernel, would you like to use the new nptl (Native Posix Thread
Libary)?" y &&
if [[ "$GLIBC_NPTL" == "y" ]]; then
- config_query GLIBC_CVS "Do you want to install the latest unstable
release (requires cvs)?" n &&
- if [[ "$GLIBC_CVS" == "y" ]]; then
- config_query GLIBC_CVS_AUTOUPDATE "Update cvs repo on every system
update?" n
+ config_query GLIBC_GIT "Do you want to install the latest unstable
(requires git)?" n &&
+ if [[ "$GLIBC_GIT" == "y" ]]; then
+ config_query GLIBC_GIT_AUTOUPDATE "Update on every system update?" n
fi
fi &&
config_query GLIBC_USEIDN "Would you like to compile glibc with libidn
support?" y &&
diff --git a/libs/libestr/DETAILS b/libs/libestr/DETAILS
index faf20bb..0f5355e 100755
--- a/libs/libestr/DETAILS
+++ b/libs/libestr/DETAILS
@@ -1,8 +1,8 @@
SPELL=libestr
- VERSION=0.1.0
+ VERSION=0.1.2
SOURCE="${SPELL}-${VERSION}.tar.gz"
- SOURCE_URL[0]=http://${SPELL}.adiscon.com/files/download/${SOURCE}
-
SOURCE_HASH=sha512:b237f91cecfee117b0c3ab5e0d4890c9d1cdf188c3862e002d0430dc033e2b61e63f1d6174d9c644a65afb4753f6684c6bb4889a72d70e12a4902d43d2f1237e
+ SOURCE_URL[0]=http://libestr.adiscon.com/files/download/${SOURCE}
+
SOURCE_HASH=sha512:dd423f534d4aad72819d6ed27b0b29a66afd3955acfda4051a389398e58cb2b6f25d47b79729df19e86fdf3cbd2a6e4814e670e4d8d27eaa07f6c40bd01e5667
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://libestr.adiscon.com/"
LICENSE[0]=GPL
diff --git a/libs/libestr/HISTORY b/libs/libestr/HISTORY
index 26a5229..d678091 100644
--- a/libs/libestr/HISTORY
+++ b/libs/libestr/HISTORY
@@ -1,3 +1,6 @@
+2011-09-12 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.1.2
+
2011-04-06 Arjan Bouter <abouter AT sourcemage.org>
* DETAILS: spell created
diff --git a/python-pypi/pyqscintilla/BUILD b/python-pypi/pyqscintilla/BUILD
new file mode 100755
index 0000000..7809ee4
--- /dev/null
+++ b/python-pypi/pyqscintilla/BUILD
@@ -0,0 +1,4 @@
+QTDIR=/usr &&
+cd $SOURCE_DIRECTORY/Python &&
+python configure.py &&
+make
diff --git a/python-pypi/pyqscintilla/DEPENDS
b/python-pypi/pyqscintilla/DEPENDS
new file mode 100755
index 0000000..53b89e8
--- /dev/null
+++ b/python-pypi/pyqscintilla/DEPENDS
@@ -0,0 +1,8 @@
+. "$GRIMOIRE/FUNCTIONS" &&
+depends qscintilla &&
+depends python &&
+
+if spell_ok qscintilla && is_version_less $(installed_version qscintilla)
$VERSION; then
+ force_depends qscintilla
+fi
+
diff --git a/python-pypi/pyqscintilla/DETAILS
b/python-pypi/pyqscintilla/DETAILS
new file mode 100755
index 0000000..f07d52b
--- /dev/null
+++ b/python-pypi/pyqscintilla/DETAILS
@@ -0,0 +1,23 @@
+ SPELL=pyqscintilla
+ VERSION=2.5.1
+
SOURCE_HASH=sha512:97ed3c387e6a4495a586e921db40502a9b2949672097efb51531c06046e2e0ee88a5adc198b90752acb356ec7bdff75a75a6cddfdbc1dc304a3b880ee3c4e14f
+ SOURCE=QScintilla-gpl-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/QScintilla-gpl-$VERSION
+
WEB_SITE=http://www.riverbankcomputing.co.uk/software/qscintilla/intro
+
SOURCE_URL[0]=http://www.riverbankcomputing.com/static/Downloads/QScintilla2/$SOURCE
+ LICENSE[0]=GPL
+ ENTERED=20060206
+ KEYWORDS="python qt libs"
+SHORT="Python API for Neil Hodgson's Scintilla C++ editor class"
+cat << EOF
+This spell is installs the Python API part of QScintilla:
+
+QScintilla is a port to Qt of Neil Hodgson's Scintilla C++ editor class.
+As well as features found in standard text editing components, QScintilla
+includes features especially useful when editing and debugging source code.
+These include support for syntax styling, error indicators, code completion
+and call tips. The selection margin can contain markers like those used in
+debuggers to indicate breakpoints and the current line. Styling choices are
+more open than with many editors, allowing the use of proportional fonts,
bold
+and italics, multiple foreground and background colours and multiple fonts.
+EOF
diff --git a/python-pypi/pyqscintilla/HISTORY
b/python-pypi/pyqscintilla/HISTORY
new file mode 100644
index 0000000..aaae835
--- /dev/null
+++ b/python-pypi/pyqscintilla/HISTORY
@@ -0,0 +1,3 @@
+2011-09-14 Robert Figura <template AT sourcemage.org>
+ * BUILD, DEPENDS, DETAILS: version 2.5.1
+ spell created (cut&paste from qscintilla)
diff --git a/python-pypi/pyqscintilla/INSTALL
b/python-pypi/pyqscintilla/INSTALL
new file mode 100755
index 0000000..9b71ccb
--- /dev/null
+++ b/python-pypi/pyqscintilla/INSTALL
@@ -0,0 +1,3 @@
+QTDIR=/usr &&
+cd $SOURCE_DIRECTORY/Python &&
+make install
diff --git a/science/viking/HISTORY b/science/viking/HISTORY
index 43a30f2..79c4c3f 100644
--- a/science/viking/HISTORY
+++ b/science/viking/HISTORY
@@ -1,3 +1,7 @@
+2011-09-15 Bor Kraljič <pyrobor AT ver.si>
+ * curl_types.patch: fixes build after curl update (upstream patch)
+ * PRE_BUILD: apply the patch for curl/types.h
+
2011-06-17 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: updated spell to 1.2.1
diff --git a/science/viking/PRE_BUILD b/science/viking/PRE_BUILD
new file mode 100755
index 0000000..1273ebd
--- /dev/null
+++ b/science/viking/PRE_BUILD
@@ -0,0 +1,2 @@
+default_pre_build &&
+patch -p1 -d $SOURCE_DIRECTORY < $SPELL_DIRECTORY/curl_types.patch
diff --git a/science/viking/curl_types.patch b/science/viking/curl_types.patch
new file mode 100644
index 0000000..803e12d
--- /dev/null
+++ b/science/viking/curl_types.patch
@@ -0,0 +1,24 @@
+From f715a77fbdc11aafff35f066380b34a99401a698 Mon Sep 17 00:00:00 2001
+From: Hanno Boeck <ctulhu AT users.sourceforge.net>
+Date: Mon, 25 Jul 2011 19:39:59 +0100
+Subject: [PATCH] Fix compilation with curl 7.21.7 (SF#3376584)
+
+Remove include of curl/types.h, which has been deprecated for a long time.
+---
+ src/osm-traces.c | 1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+diff --git a/src/osm-traces.c b/src/osm-traces.c
+index 6ef5bb5..f5088ce 100644
+--- a/src/osm-traces.c
++++ b/src/osm-traces.c
+@@ -27,7 +27,6 @@
+ #include <errno.h>
+
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+
+ #include <glib.h>
+--
+1.7.4.1
diff --git a/security/pwsafe/DETAILS b/security/pwsafe/DETAILS
index 3747bc9..c389199 100755
--- a/security/pwsafe/DETAILS
+++ b/security/pwsafe/DETAILS
@@ -9,10 +9,12 @@ SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
ENTERED=20080601
SHORT="a unix commandline program that manages encrypted password
databases"
cat << EOF
-* Pure command-line operation if desired (good for remote access over ssh) *
-or can interact with X11 selection & clipboard. * Portable, endianess-clean,
-misaligned-access-free C++. Compiles cleanly
- on linux, *bsd, macos x, solaris.
-* Compatible with CounterPane's PasswordSafe Win32 program versions 2.x
+Pure command-line operation if desired (good for remote access over ssh)
+or can interact with X11 selection & clipboard.
+
+Portable, endianess-clean, misaligned-access-free C++. Compiles cleanly
+on linux, *bsd, macos x, solaris.
+
+Compatible with CounterPane's PasswordSafe Win32 program versions 2.x
and 1.x.
EOF
diff --git a/security/pwsafe/HISTORY b/security/pwsafe/HISTORY
index 38db71e..768cb57 100644
--- a/security/pwsafe/HISTORY
+++ b/security/pwsafe/HISTORY
@@ -1,3 +1,6 @@
+2011-09-15 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Fix long description.
+
2010-09-10 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS: changed dependency from getopt-long to perl
diff --git a/shell-term-fm/mc/DETAILS b/shell-term-fm/mc/DETAILS
index e998039..da00452 100755
--- a/shell-term-fm/mc/DETAILS
+++ b/shell-term-fm/mc/DETAILS
@@ -1,11 +1,12 @@
SPELL=mc
- VERSION=4.7.5.3
+ VERSION=4.7.5.4
+ PATCHLEVEL=1
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=https://www.midnight-commander.org/downloads/$SOURCE
WEB_SITE=http://www.midnight-commander.org/
ENTERED=20010922
-
SOURCE_HASH=sha512:9b0f2addb168a5152803f234aad16a67351873a8565852a69d5b68cb3292c0d8e4267b83d29d928101d1cc5fa913b6490d03f567ad4e3a8302e796326ddc2f9f
+
SOURCE_HASH=sha512:b5391e1cd7de31c978c46b4582e66dbdfc4b4d590773cf129b4895535d7163a116fa01f4e9313323f921016d2f0275560717108cc8947eed5b014931f709e627
SOURCE_HINTS=no-check-certificate
LICENSE[0]=GPL
KEYWORDS="console"
diff --git a/shell-term-fm/mc/HISTORY b/shell-term-fm/mc/HISTORY
index e07ad41..fde0477 100644
--- a/shell-term-fm/mc/HISTORY
+++ b/shell-term-fm/mc/HISTORY
@@ -1,3 +1,10 @@
+2011-09-14 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: PATCHLEVEL=1
+ * PRE_BUILD, ctrl-x.patch: official patch added
+
+2011-09-12 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 4.7.5.4
+
2011-08-29 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: corrected source url to make it downloadable via wget
if is_depends_enabled $SPELL wxgtk; then
depends cairo &&
diff --git a/utils/gnuplot/DETAILS b/utils/gnuplot/DETAILS
index d2a23c7..7b69eaf 100755
--- a/utils/gnuplot/DETAILS
+++ b/utils/gnuplot/DETAILS
@@ -1,5 +1,5 @@
SPELL=gnuplot
-if [[ $GNUPLOT_SCM == "y" ]]; then
+if [[ $GNUPLOT_BRANCH == scm ]]; then
if [[ $GNUPLOT_AUTOUPDATE == "y" ]]; then
VERSION=$(date +%Y%m%d)
else
@@ -17,11 +17,6 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
SOURCE_HASH=sha512:dc520e8074e00f8ba346451ca9e229c31907735185f0ed4ae066ad5f2caa799db04c28181729bef1af467af7341f3b721eba8a0d5ecd6988c5740351fe002fd6
fi
-if [[ $GNUPLOT_LUA == "y" ]]; then
- SOURCE2=${SPELL}_lua_terminal.tgz
- SOURCE2_URL[0]=http://peter.affenbande.org/$SPELL/$SOURCE2
- SOURCE2_IGNORE=unversioned
-fi
WEB_SITE=http://www.gnuplot.info
ENTERED=20020210
LICENSE[0]=http://gnuplot.cvs.sourceforge.net/gnuplot/gnuplot/Copyright?view=markup
diff --git a/utils/gnuplot/HISTORY b/utils/gnuplot/HISTORY
index 41a758b..4b2e6d7 100644
--- a/utils/gnuplot/HISTORY
+++ b/utils/gnuplot/HISTORY
@@ -1,3 +1,12 @@
+2011-09-14 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD, PREPARE, DETAILS: Use prepare_select_branch
+
+2011-09-13 Bor Kraljič <pyrobor AT ver.si>
+ * DEPENDS: added lua and cairo as optional dependency
+ * DETAILS: removed SOURCE & SOURCE_URL for lua 3rd party addon (fixes
#138)
+ * PREPARE: removed query about lua 3rd party addon
+ * BUILD: removed code for building lua 3rd party addon
+
2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS: changed dependency on g++ to dependency on gcc with
sub-depends on CXX (scripted)
diff --git a/utils/gnuplot/PREPARE b/utils/gnuplot/PREPARE
index 6528253..98d27e4 100755
--- a/utils/gnuplot/PREPARE
+++ b/utils/gnuplot/PREPARE
@@ -1,9 +1,2 @@
-config_query GNUPLOT_SCM "Do you want to use the development version from
CVS?" n &&
-
-if [[ $GNUPLOT_SCM == "y" ]]; then
- config_query GNUPLOT_AUTOUPDATE \
- "Automatically update on every system update?" n
-fi &&
-
-config_query GNUPLOT_LUA "Do you want to enable the lua terminal (3rd party
addon)?" n
-
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm
diff --git a/utils/pv/DETAILS b/utils/pv/DETAILS
new file mode 100755
index 0000000..1def3f4
--- /dev/null
+++ b/utils/pv/DETAILS
@@ -0,0 +1,18 @@
+ SPELL=pv
+ VERSION=1.2.0
+ SOURCE=${SPELL}-${VERSION}.tar.bz2
+ SOURCE_URL[0]=http://pipeviewer.googlecode.com/files/${SOURCE}
+
SOURCE_HASH=sha512:9b5a880b54b55f79c421b159fd6de379cacf233ba32ccdaa51cfdd18db5959b366ab50074ff84e67b09fd8377bcc9ef428efd864da1d5a8774ecbb7d3936475d
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ DOCS="COPYING NEWS TODO"
+ WEB_SITE=http://www.ivarch.com/programs/pv.shtml
+ LICENSE[0]=Artistic
+ ENTERED=20110916
+ SHORT="terminal-based tool for monitoring the progress of data
through a pipeline"
+cat << EOF
+Pipe Viewer is a terminal-based tool for monitoring the progress of data
through
+a pipeline. It can be inserted into any normal pipeline between two
processes to
+give a visual indication of how quickly data is passing through, how long it
has
+taken, how near to completion it is, and an estimate of how long it will be
+until completion.
+EOF
diff --git a/utils/pv/HISTORY b/utils/pv/HISTORY
new file mode 100644
index 0000000..24ba4c1
--- /dev/null
+++ b/utils/pv/HISTORY
@@ -0,0 +1,2 @@
+2011-09-16 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: spell created
diff --git a/utils/rsyslog/DETAILS b/utils/rsyslog/DETAILS
index 51fb485..58e362e 100755
--- a/utils/rsyslog/DETAILS
+++ b/utils/rsyslog/DETAILS
@@ -1,16 +1,17 @@
SPELL=rsyslog
if [[ "${RSYSLOG_BRANCH}" == "devel" ]]; then
- VERSION=6.3.1
- SECURITY_PATCH=1
-
SOURCE_HASH=sha512:ac47ec4a5540c3d8ffe3e63a64fe1a75caa97c2e366b5464bf98692fb8f46da3ea4160671abef5900bed9f01a0d0cbb22a9bbc37d99b3b9492902c82ee7f2206
+ VERSION=6.3.5
+ SECURITY_PATCH=2
+
SOURCE_HASH=sha512:91d33c96c3c251baccb0ce04b27051aa5c605a5a1c31158e4e9a01796f8102af639f9a22227d41541d39275720c3227d09965787998fca897015961462ce38cc
elif [[ "${RSYSLOG_BRANCH}" == "v4stable" ]]; then
- VERSION=4.6.5
- SECURITY_PATCH=1
-
SOURCE_HASH=sha512:56444acde025ad2dacea3aa394ee9e2d84d7a54a9fff083c8cee84df4885c661d8ae7685f79dab82700ba25eb7f5cd3dd748615c530aa5705a32b0aea60d1828
+ VERSION=4.8.0
+ SECURITY_PATCH=2
+
SOURCE_HASH=sha512:47cef6c60a9fc0505c315cbf532755af78ea53af09e127a01d99c38ae52c026cf7f0b828881d6536ee131ef050f036cede297c1d070fa565cec98391158a7be6
elif [[ "${RSYSLOG_BRANCH}" == "v5stable" ]]; then
- VERSION=5.8.2
-
SOURCE_HASH=sha512:c4e99ea98bc89940e47d87f8493db8efda956244657f3fcd9b60fa8d8d7d7c3ae4676dea3fda65660b61e2a40642e336c46d59fb2c0ace0e5aa3008d1884d2d2
+ VERSION=5.8.5
+ SECURITY_PATCH=1
+
SOURCE_HASH=sha512:0e38bd03d0dd681f68ab11ef2f9d0633958a49d50379721f807fc9d31441b192c331ff56df0c8f8b5c319e0d9c65072402559ace665e80cce4f251dd24e45715
else
VERSION=3.22.3
SECURITY_PATCH=1
diff --git a/utils/rsyslog/HISTORY b/utils/rsyslog/HISTORY
index 1ccbccf..f07d2f9 100644
--- a/utils/rsyslog/HISTORY
+++ b/utils/rsyslog/HISTORY
@@ -1,4 +1,8 @@
-2001-06-24 Elisamuel Resto <ryuji AT sourcemage.org>
+2011-09-12 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 4.8.0 (v4stable), 5.8.5 (v5stable), 6.3.5
+ (devel), SECURITY_PATCH++ (fixes CVE-2011-3200)
+
+2011-06-24 Elisamuel Resto <ryuji AT sourcemage.org>
* DETAILS: devel updated to 6.3.1, v5stable to 5.8.2