sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to devel-kde47 grimoire by Bor Kraljič (1b6545b50be81598a7ce201a6362045264a17893)
- From: Bor Kraljič <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to devel-kde47 grimoire by Bor Kraljič (1b6545b50be81598a7ce201a6362045264a17893)
- Date: Thu, 4 Aug 2011 01:41:38 -0500
GIT changes to devel-kde47 grimoire by Bor Kraljič <pyrobor AT ver.si>:
e-16/e16/DETAILS | 4 -
e-16/e16/HISTORY | 3 +
ftp/aria2/DETAILS | 4 -
ftp/aria2/HISTORY | 3 +
libs/clucene/DEPENDS | 3 -
libs/clucene/DETAILS | 19 ---------
libs/clucene/HISTORY | 4 +
libs/clucene/PREPARE | 5 --
mail/dspam/BUILD | 7 +--
mail/dspam/CONFIGURE | 46
++++++++++++++++++----
mail/dspam/DEPENDS | 21 ++++++----
mail/dspam/DETAILS | 19 ++++-----
mail/dspam/HISTORY | 9 ++++
mail/dspam/PREPARE | 14 ++----
mail/dspam/dspam.gpg |binary
net/net-snmp/DETAILS | 2
net/net-snmp/HISTORY | 5 --
net/net-snmp/net-snmp.gpg |binary
net/openswan/DETAILS | 2
net/openswan/HISTORY | 3 +
printer/hplip/DETAILS | 2
printer/hplip/HISTORY | 4 +
printer/hplip/PRE_BUILD | 3 +
printer/pycups/DETAILS | 10 ++--
printer/pycups/HISTORY | 5 ++
printer/pycups/PRE_BUILD | 3 +
printer/pycups/timwaugh.gpg |binary
printer/system-config-printer/DETAILS | 4 -
printer/system-config-printer/HISTORY | 4 +
printer/system-config-printer/PRE_BUILD | 4 +
printer/system-config-printer/no-packagekit.patch | 36 +++++++++++++++++
ruby-raa/ruby-1.9/DEPENDS | 1
ruby-raa/ruby-1.9/DETAILS | 4 -
ruby-raa/ruby-1.9/HISTORY | 4 +
utils/dbus/DETAILS | 4 -
utils/dbus/HISTORY | 3 +
utils/dialog/DETAILS | 2
utils/dialog/HISTORY | 3 +
utils/file/DETAILS | 4 -
utils/file/HISTORY | 4 +
utils/file/PRE_BUILD | 2
utils/file/file-5.07-zip-detect.patch | 13 ------
42 files changed, 187 insertions(+), 105 deletions(-)
New commits:
commit b9b3fbf79d583d4ce8be862a1c2e99b7816864d4
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>
aria2: updated spell to 1.12.1
commit a31bb6c6bd1c1cace0fa45342ec813e34e529230
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
e16 1.0.9
commit 374f41a63efa23ca72aeef3e1f4ae0e0da777c3f
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
system-config-printer 1.3.5
commit d831437ebbebfa020aa4176058f8c565e1a41908
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
pycups 1.9.58
GPG checking source file pycups-1.9.58.tar.bz2...
gpg: armor header: Version: GnuPG v1.4.11 (GNU/Linux)
gpg: Signature made Tue Jul 26 13:28:58 2011 CEST using RSA key ID
F4DE942C
gpg: Can't check signature: public key not found
Failure to verify gpg signature
Abort? [y]
GPG checking source file pycups-1.9.58.tar.bz2...
gpg: armor header: Version: GnuPG v1.4.11 (GNU/Linux)
gpg: Signature made Tue Jul 26 13:28:58 2011 CEST using RSA key ID
F4DE942C
gpg: BAD signature from "Tim Waugh <twaugh AT redhat.com>"
gpg: binary signature, digest algorithm SHA1
Failure to verify gpg signature
Abort? [y]
commit 6b3dcfc7f5ceb3545d893d4bccdbfd4e64d39036
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
dialog: => 1.1-20110707
commit f31d661af73c9265c983523514dc615d60eb0e16
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
file: => 5.08
commit 446bc103b9ec9c4a90dea903f759ebc90769f021
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
Revert "net-snmp: => 5.7"
This reverts commit 94bbc259cf4067b64358ccf8e728fc7d9f5924ca.
not stable for production yet
commit 8371eee2b4b43f921057a13c961ff9e9ef717adb
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
dspam: => 3.10.0
commit e876ee1e9a4ccef071b78af4b31a4e5f724e5571
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
openswan: => 2.6.35
commit 2c9352b96c219f0caf10b3cc56ee0ac1ed253d9b
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
hplip 3.11.7
prnt/hpps/hppsfilter.c: In function 'require_bod':
prnt/hpps/hppsfilter.c:119: error: 'ppd_attr_t' undeclared (first use in
this fu
nction)
prnt/hpps/hppsfilter.c:119: error: (Each undeclared identifier is
reported only
once
prnt/hpps/hppsfilter.c:119: error: for each function it appears in.)
prnt/hpps/hppsfilter.c:119: error: 'pattr' undeclared (first use in this
functio
n)
prnt/hpps/hppsfilter.c:120: error: 'ppd_file_t' undeclared (first use in
this fu
nction)
prnt/hpps/hppsfilter.c:120: error: 'pppd' undeclared (first use in this
function
)
make: *** [hppsfilter.o] Error 1
! Problem Detected !
commit 05f3ef8d2989f2411c6cd241cfbb59728091a04f
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
dbus 1.4.14
commit 948cf0e1e069e2f701a6f33934b4a9ff51c9af2f
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
ruby-1.9: => 1.9.2-p290
commit 3b45ac186aac5b7a3d6ad8d811af02591f4371ea
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
clucene - remove svn support
diff --git a/e-16/e16/DETAILS b/e-16/e16/DETAILS
index 20105ae..1064999 100755
--- a/e-16/e16/DETAILS
+++ b/e-16/e16/DETAILS
@@ -11,12 +11,12 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-0.16-cvs
SOURCE_URL[0]=cvs://:pserver:anonymous AT anoncvs.enlightenment.org:/var/cvs/e:$SPELL/e
SOURCE_IGNORE=volatile
else
- VERSION=1.0.8
+ VERSION=1.0.9
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-${VERSION%-*}
SOURCE_URL[0]=$SOURCEFORGE_URL/enlightenment/$SOURCE
-
SOURCE_HASH=sha512:f8d8687a40defdbec385ab007351501a2bd5d39addc6d096655ee57b0384e59aa374c9d1860fa81f5405751e706015b920712c9607b04182916d9a5b7bfe22e7
+
SOURCE_HASH=sha512:75dc4c784bb70a22b5baa6462024164a10bcea325aa479d2c856f8d214910f36fba865f78017f5c71847991015e7164ecb3959b9ee6d8e531c1b938bd5f61d2a
# SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
fi
diff --git a/e-16/e16/HISTORY b/e-16/e16/HISTORY
index 4ee4f4a..2202e51 100644
--- a/e-16/e16/HISTORY
+++ b/e-16/e16/HISTORY
@@ -1,3 +1,6 @@
+2011-08-04 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.0.9
+
2011-05-02 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.0.8
diff --git a/ftp/aria2/DETAILS b/ftp/aria2/DETAILS
index 85f5b6b..7e22319 100755
--- a/ftp/aria2/DETAILS
+++ b/ftp/aria2/DETAILS
@@ -1,6 +1,6 @@
SPELL=aria2
- VERSION=1.12.0
-
SOURCE_HASH=sha512:ebdb5a4a9506b0f3fa3a1d696ed249c1b5859e7d0d80867c6a97a6c4c0989f0934bebe327d28c0ffde5b42aa1cb2c97fea76ea5002a9d461afd4450a56a92edc
+ VERSION=1.12.1
+
SOURCE_HASH=sha512:e65a7880ffddb6835ffbc8a848d00fd9314bc62df13c018a8232efc55a1b3a44a84614c7f443726ccb1713454fef567fe71734b8c1cd383fa66f4799b1529ced
SOURCE=${SPELL}-$VERSION.tar.bz2
SOURCE_URL[0]=${SOURCEFORGE_URL}/$SPELL/$SOURCE
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
diff --git a/ftp/aria2/HISTORY b/ftp/aria2/HISTORY
index 33d6f76..17666ba 100644
--- a/ftp/aria2/HISTORY
+++ b/ftp/aria2/HISTORY
@@ -1,3 +1,6 @@
+2011-08-04 Bor Kraljič <pyrobor AT ver.si>
+ * DETAILS: updated spell to 1.12.1
+
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/libs/clucene/DEPENDS b/libs/clucene/DEPENDS
index a9c6681..20382a0 100755
--- a/libs/clucene/DEPENDS
+++ b/libs/clucene/DEPENDS
@@ -1,7 +1,4 @@
depends -sub CXX gcc &&
if [[ $CLUC_VER != stable ]];then
depends cmake
-fi &&
-if [[ $CLUC_VER == svn ]]; then
- depends subversion
fi
diff --git a/libs/clucene/DETAILS b/libs/clucene/DETAILS
index 81f479e..c8973d2 100755
--- a/libs/clucene/DETAILS
+++ b/libs/clucene/DETAILS
@@ -1,28 +1,9 @@
SPELL=clucene
-if [[ $CLUC_VER == svn ]];then
- if [[ "$CLUC_SVN_AUTOUPDATE" == "y" ]]; then
- VERSION=$(date +%Y%m%d)
- else
- VERSION=svn
- fi
- FORCE_DOWNLOAD=on
- SPELLX=$SPELL-svn
- SOURCE=$SPELLX.tar.bz2
- SOURCE_IGNORE=volatile
-
SOURCE_URL[0]=svn_http://clucene.svn.sourceforge.net/svnroot/clucene/trunk:clucene
-else
-# if [[ $CLUC_VER == devel ]];then
-# VERSION=0.9.23.0
-# SOURCE_HASH=sha512:
-# SPELLX=$SPELL-core-$VERSION-Source
-# else
VERSION=0.9.21b
SOURCE_HASH=sha512:706e8ad1fc944ffe12f0b0057169bca63131ae2263a3e46dd9750bfe2e7401870dac8dc494e0159f9302afb285473d89b5bd62f9c2339a1a1954e4cb98391ee3
SPELLX=$SPELL-core-$VERSION
-# fi
SOURCE=$SPELLX.tar.bz2
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-fi
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX
WEB_SITE=http://sourceforge.net/projects/clucene/
ENTERED=20050531
diff --git a/libs/clucene/HISTORY b/libs/clucene/HISTORY
index 9cb56c3..60c26b1 100644
--- a/libs/clucene/HISTORY
+++ b/libs/clucene/HISTORY
@@ -1,3 +1,7 @@
+2011-08-03 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS, PREPARE, DETAILS: remove svn support
+ they now use git
+
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/libs/clucene/PREPARE b/libs/clucene/PREPARE
deleted file mode 100755
index b3c11c8..0000000
--- a/libs/clucene/PREPARE
+++ /dev/null
@@ -1,5 +0,0 @@
-config_query_list CLUC_VER 'which version?' stable svn
-if [[ $CLUC_VER == svn ]]; then
- config_query CLUC_SVN_AUTOUPDATE "Update to the latest SVN on every cast?"
${DEFAULT:-n}
-fi
-
diff --git a/mail/dspam/BUILD b/mail/dspam/BUILD
index aeba885..3edbe13 100755
--- a/mail/dspam/BUILD
+++ b/mail/dspam/BUILD
@@ -4,6 +4,7 @@ OPTS="--with-dspam-home=$INSTALL_ROOT/var/spool/dspam \
--with-dspam-group=dspam \
--with-dspam-home-group=dspam \
--with-logdir=$INSTALL_ROOT/var/log/dspam \
+ --disable-mysql4-initialization \
$DSPAM_OPTS \
$OPTS" &&
@@ -27,9 +28,9 @@ fi &&
OPTS="--with-storage-driver=$STORAGE_DRIVERS $OPTS" &&
case "$DSPAM_SCALE" in
- "none") ;;
- "Large Scale") OPTS="$OPTS --enable-large-scale" ;;
- "Domain Scale") OPTS="$OPTS --enable-domain-scale" ;;
+ "none") OPTS="--disable-large-scale --disable-domain-scale" ;;
+ "Large Scale") OPTS="$OPTS --enable-large-scale --disable-domain-scale" ;;
+ "Domain Scale") OPTS="$OPTS --enable-domain-scale --disable-large-scale" ;;
esac &&
default_build
diff --git a/mail/dspam/CONFIGURE b/mail/dspam/CONFIGURE
index 88bc89c..6a7647a 100755
--- a/mail/dspam/CONFIGURE
+++ b/mail/dspam/CONFIGURE
@@ -1,16 +1,46 @@
config_query DSPAM_GD 'Use gd for pretty graphs?' n &&
config_query_option DSPAM_OPTS 'Enable debug mode?' n \
- '--enable-debug' '--disable-debug' &&
+ '--enable-debug --enable-bnr-debug' \
+ '--disable-debug --disable-bnr-debug' &&
+
+if list_find "$DSPAM_OPTS" "--enable-debug"; then
+ config_query_option DSPAM_OPTS 'Enable verbose debug mode?' n \
+ '--enable-verbose-debug' \
+ '--disable-verbose-debug'
+else
+ DSPAM_OPTS="--disable-verbose-debug $DSPAM_OPTS"
+fi &&
+
config_query_option DSPAM_OPTS 'Enable daemon mode?' y \
- '--enable-daemon' '--disable-daemon' &&
+ '--enable-daemon' \
+ '--disable-daemon' &&
+
config_query_option DSPAM_OPTS 'Enable preferences extension?' y \
- '--enable-preferences-extension'
'--disable-preferences-extension' &&
+ '--enable-preferences-extension' \
+ '--disable-preferences-extension' &&
+
+config_query_option DSPAM_OPTS 'Enable trusted user security?' y \
+ '--enable-trusted-user-security' \
+ '--disable-trusted-user-security' &&
+
config_query_option DSPAM_OPTS 'Enable split configuration file support?' y \
- '--enable-split-configuration' '--disable--split-configuration'
&&
+ '--enable-split-configuration' \
+ '--disable--split-configuration' &&
+
config_query_option DSPAM_OPTS 'Enable long usernames?' y \
- '--enable-long-usernames' '--disable-long-usernames' &&
+ '--enable-long-usernames' \
+ '--disable-long-usernames' &&
+
+config_query_option DSPAM_OPTS 'Enable home directory filesystem storage
driver?' n \
+ '--enable-homedir' \
+ '--disable-homedir' &&
+
+config_query_option DSPAM_OPTS 'Enable performance profiling?' n \
+ '--enable-profiling' \
+ '--disable-profiling' &&
+
config_query_list DSPAM_SCALE 'Select a filesystem organization method:'\
- 'None' \
- 'Domain Scale' \
- 'Large Scale'
+ 'None' \
+ 'Domain Scale' \
+ 'Large Scale'
diff --git a/mail/dspam/DEPENDS b/mail/dspam/DEPENDS
index c7d9310..103b2d5 100755
--- a/mail/dspam/DEPENDS
+++ b/mail/dspam/DEPENDS
@@ -6,22 +6,25 @@ optional_depends MAIL-TRANSPORT-AGENT \
optional_depends db \
'' \
'' \
- 'Enable DB driver' &&
+ 'Enable DB storage driver' &&
+
optional_depends sqlite \
'' \
'' \
- 'Enable SQLite driver' &&
+ 'Enable SQLite storage driver' &&
+
optional_depends MYSQL \
'--with-mysql-includes=/usr/include/mysql' \
'' \
- 'Enable MYSQL driver' &&
+ 'Enable MYSQL storage driver' &&
+
optional_depends postgresql \
'--with-pgsql-includes=/usr/include/postgresql' \
'' \
- 'Enable PostgreSQL driver' &&
+ 'Enable PostgreSQL storage driver' &&
if is_depends_enabled $SPELL postgresql ||
- is_depends_enabled $SPELL $(get_spell_provider $SPELL MYSQL); then
+ is_depends_enabled $SPELL $(get_spell_provider $SPELL MYSQL); then
config_query_option DSPAM_OPTS "Enable virtual users?" n \
"--enable-virtual-users" \
"--disable-virtual-users"
@@ -35,16 +38,18 @@ if [[ "$DSPAM_GD" == y ]]; then
depends gd-text &&
depends perl-cgi;
fi &&
+
optional_depends openldap \
- '--enable-external-lookup --enable-ldap' \
- '--disable-ldap' \
+ '--enable-external-lookup' \
+ '--disable-external-lookup' \
'for LDAP support' &&
+
optional_depends clamav \
'--enable-clamav' \
'--disable-clamav' \
'for virus detection' &&
+
optional_depends SYSTEM-LOGGER \
'--enable-syslog' \
'--disable-syslog' \
'for logging through syslog'
-
diff --git a/mail/dspam/DETAILS b/mail/dspam/DETAILS
index 0563d59..d51ae2d 100755
--- a/mail/dspam/DETAILS
+++ b/mail/dspam/DETAILS
@@ -1,10 +1,10 @@
SPELL=dspam
if [[ $DSPAM_BRANCH == scm ]]; then
-if [[ $DSPAM_SCM_AUTO == y ]]; then
+ if [[ $DSPAM_SCM_AUTO == y ]]; then
VERSION=$(date +%Y%m%d)
-else
+ else
VERSION=scm
-fi
+ fi
SOURCE="${SPELL}-git.tar.bz2"
SOURCE_URL[0]=git://dspam.git.sourceforge.net/gitroot/dspam/dspam:dspam-scm
SOURCE_IGNORE=volatile
@@ -17,19 +17,20 @@ elif [[ $DSPAM_BRANCH == devel ]]; then
SOURCE_HASH=sha512:fd70938b3ef368fbfb992921a596972dc665ce9c6869ca362274c4bd02174fbfd3419438f63c1cdef06167fcde1ceea30fe359228642010bef4d77036e6bcf2f
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
else
- VERSION=3.9.0
- PATCHLEVEL=1
+ VERSION=3.10.0
SOURCE="${SPELL}-${VERSION}.tar.gz"
-
SOURCE_HASH=sha512:9208e973855e4527802603570ae7a8fbdafe9c4a40aaa55eda91810d98c13a234e1e1f681c9a219869fbb58c5be10d908d8a974d63d75dab965641b29ef557e6
+ SOURCE2=$SOURCE.asc
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
+ SOURCE2_URL[0]=$SOURCE_URL.asc
+ SOURCE_GPG=dspam.gpg:$SOURCE2:UPSTREAM_KEY
+ SOURCE2_IGNORE=signature
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
fi
WEB_SITE="http://dspam.sourceforge.net/";
DOCS="$DOCS RELEASE.NOTES UPGRADING"
- LICENSE[0]='GPL'
- PATCHLEVEL=0
+ LICENSE[0]='AGPL'
KEYWORDS="email mail spam filter"
- SHORT='A server-side anti-spam agent for UNIX email servers'
+ SHORT='server-side anti-spam agent for UNIX email servers'
cat << EOF
DSPAM is a scalable and open-source content-based spam filter designed for
multi-user enterprise systems. On a properly configured system, many users
diff --git a/mail/dspam/HISTORY b/mail/dspam/HISTORY
index 567ada0..1c99ad1 100644
--- a/mail/dspam/HISTORY
+++ b/mail/dspam/HISTORY
@@ -1,3 +1,12 @@
+2011-08-04 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 3.10.0; converted to upstream gpg
checking;
+ changed license to AGPL; readability++
+ * BUILD: added missing configure options
+ * CONFIGURE: added missing configure options; readability++
+ * DEPENDS: corrected flags for current dependencies
+ * PREPARE: readability++
+ * dspam.gpg: added
+
2011-01-31 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: added mta optional dependencies
* BUILD: use loyal rights if compiled with mta support
diff --git a/mail/dspam/PREPARE b/mail/dspam/PREPARE
index 251710b..2dcda1b 100755
--- a/mail/dspam/PREPARE
+++ b/mail/dspam/PREPARE
@@ -1,12 +1,10 @@
config_query_list DSPAM_BRANCH "What branch do you want to use?" \
- release \
- devel \
- scm &&
+ release \
+ devel \
+ scm &&
if [[ $DSPAM_BRANCH == scm ]]; then
-if [[ $DSPAM_SCM == y ]]; then
-config_query DSPAM_SCM_AUTO \
- "Automaticaly update the spell on sorcery queue/system-update?"
\
- n
-fi
+ if [[ $DSPAM_SCM == y ]]; then
+ config_query DSPAM_SCM_AUTO "Automaticaly update the spell on sorcery
queue/system-update?" n
+ fi
fi
diff --git a/mail/dspam/dspam.gpg b/mail/dspam/dspam.gpg
new file mode 100644
index 0000000..f07ff15
Binary files /dev/null and b/mail/dspam/dspam.gpg differ
diff --git a/net/net-snmp/DETAILS b/net/net-snmp/DETAILS
index bab3858..35a9413 100755
--- a/net/net-snmp/DETAILS
+++ b/net/net-snmp/DETAILS
@@ -1,5 +1,5 @@
SPELL=net-snmp
- VERSION=5.7
+ VERSION=5.6.1.1
SECURITY_PATCH=1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.asc
diff --git a/net/net-snmp/HISTORY b/net/net-snmp/HISTORY
index d97d252..f99810b 100644
--- a/net/net-snmp/HISTORY
+++ b/net/net-snmp/HISTORY
@@ -1,8 +1,3 @@
-2011-07-02 Vlad Glagolev <stealth AT sourcemage.org>
- * DETAILS: updated spell to 5.7
- * net-snmp: added A77C5329 public key (Net-SNMP Administrators
- <net-snmp-admin AT lists.sourceforge.net>)
-
2011-06-07 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 5.6.1.1
diff --git a/net/net-snmp/net-snmp.gpg b/net/net-snmp/net-snmp.gpg
index b97fa4d..8593ab3 100644
Binary files a/net/net-snmp/net-snmp.gpg and b/net/net-snmp/net-snmp.gpg
differ
diff --git a/net/openswan/DETAILS b/net/openswan/DETAILS
index d656b5f..b6cf805 100755
--- a/net/openswan/DETAILS
+++ b/net/openswan/DETAILS
@@ -1,5 +1,5 @@
SPELL=openswan
- VERSION=2.6.34
+ VERSION=2.6.35
SECURITY_PATCH=1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.asc
diff --git a/net/openswan/HISTORY b/net/openswan/HISTORY
index 2d48929..ea0d6e9 100644
--- a/net/openswan/HISTORY
+++ b/net/openswan/HISTORY
@@ -1,3 +1,6 @@
+2011-08-04 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.6.35
+
2011-06-24 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: use is_version_less() to compare versions carefully
diff --git a/printer/hplip/DETAILS b/printer/hplip/DETAILS
index 5b5b1e5..02235ff 100755
--- a/printer/hplip/DETAILS
+++ b/printer/hplip/DETAILS
@@ -1,5 +1,5 @@
SPELL=hplip
- VERSION=3.11.5
+ VERSION=3.11.7
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.asc
SOURCE2_IGNORE=signature
diff --git a/printer/hplip/HISTORY b/printer/hplip/HISTORY
index 81d1601..6929555 100644
--- a/printer/hplip/HISTORY
+++ b/printer/hplip/HISTORY
@@ -1,3 +1,7 @@
+2011-08-03 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 3.11.7
+ * PRE_BUILD: sedit added due to cups 1.5.0
+
2011-06-12 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 3.11.5
diff --git a/printer/hplip/PRE_BUILD b/printer/hplip/PRE_BUILD
index ac93b47..275dc10 100755
--- a/printer/hplip/PRE_BUILD
+++ b/printer/hplip/PRE_BUILD
@@ -1,6 +1,9 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&
+# cups 1.5.0 fix
+sedit "41i#include <cups/ppd.h>" prnt/hpps/hppsfilter.c &&
+
patch -p0 < "$SPELL_DIRECTORY/interactive.patch" &&
sed -i "s:SYSFS:ATTRS:g" data/rules/55-hpmud.rules \
diff --git a/printer/pycups/DETAILS b/printer/pycups/DETAILS
index fa7d82e..10fdb86 100755
--- a/printer/pycups/DETAILS
+++ b/printer/pycups/DETAILS
@@ -1,12 +1,12 @@
SPELL=pycups
- VERSION=1.9.57
-# SOURCE_HASH=sha512:
+ VERSION=1.9.58
+
SOURCE_HASH=sha512:b9aaaed83952524ea072486e2e245d200d4d09c47554f57eb02f7bce705ff1f6cde75ac708617dc10bf28aaf09b51ee6c884456efe9a31368c8a1eebd0e8dabf
SOURCE=$SPELL-$VERSION.tar.bz2
- SOURCE2=$SOURCE.sig
+ SOURCE2=$SOURCE.asc
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://cyberelk.net/tim/data/pycups/$SOURCE
- SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
- SOURCE_GPG=timwaugh.gpg:$SOURCE.sig:UPSTREAM_KEY
+ SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
+# SOURCE_GPG=timwaugh.gpg:$SOURCE.asc:UPSTREAM_KEY
SOURCE2_IGNORE=signature
WEB_SITE=http://cyberelk.net/tim/software/pycups/
LICENSE[0]=GPL
diff --git a/printer/pycups/HISTORY b/printer/pycups/HISTORY
index b8f2c1e..190be3e 100644
--- a/printer/pycups/HISTORY
+++ b/printer/pycups/HISTORY
@@ -1,3 +1,8 @@
+2011-08-03 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.9.58, sig -> asc, SHA512 used temporary
+ * PRE_BUILD: added to fix Makefile to install cups.so
+ * timwaugh.gpg: added F4DE942C
+
2011-06-12 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.9.57
diff --git a/printer/pycups/PRE_BUILD b/printer/pycups/PRE_BUILD
new file mode 100755
index 0000000..c2c203b
--- /dev/null
+++ b/printer/pycups/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+
+sed -i 's:mv build/lib:ln -sf build/lib:' $SOURCE_DIRECTORY/Makefile
diff --git a/printer/pycups/timwaugh.gpg b/printer/pycups/timwaugh.gpg
index e6baa83..e5d176a 100644
Binary files a/printer/pycups/timwaugh.gpg and b/printer/pycups/timwaugh.gpg
differ
diff --git a/printer/system-config-printer/DETAILS
b/printer/system-config-printer/DETAILS
index dc101dd..193f379 100755
--- a/printer/system-config-printer/DETAILS
+++ b/printer/system-config-printer/DETAILS
@@ -1,6 +1,6 @@
SPELL=system-config-printer
- VERSION=1.3.3
-
SOURCE_HASH=sha512:ea37a2e359f7940bfd7b37ce3398d449a4d31961a057f800f592328c39f3e4d30d7d8807df78be4ec64a5b8fa497014a1056a6b2c866b9501cd3e7c4a62d4ec0
+ VERSION=1.3.5
+
SOURCE_HASH=sha512:2b58dff4328455bd1f9b3a9d4df4a0c00ee7d3f1fbb1404652bbc7161dd08a5ac965371f90ff8d125447bfd9e652ca8d0434f7919b5773b6179e548eda358d11
SOURCE=$SPELL-$VERSION.tar.xz
# SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/printer/system-config-printer/HISTORY
b/printer/system-config-printer/HISTORY
index ac0b2f0..eaf0b8b 100644
--- a/printer/system-config-printer/HISTORY
+++ b/printer/system-config-printer/HISTORY
@@ -1,3 +1,7 @@
+2011-08-03 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.3.5
+ * PRE_BUILD, no-packagekit.patch: added patch form Arch
+
2011-06-12 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.3.3
diff --git a/printer/system-config-printer/PRE_BUILD
b/printer/system-config-printer/PRE_BUILD
index 6f54504..40c6dbc 100755
--- a/printer/system-config-printer/PRE_BUILD
+++ b/printer/system-config-printer/PRE_BUILD
@@ -2,4 +2,6 @@ mk_source_dir $SOURCE_DIRECTORY &&
cd $BUILD_DIRECTORY &&
verify_file '' &&
xz -dc $SOURCE_CACHE/$SOURCE | tar -xf -
-cd $SOURCE_DIRECTORY
+cd $SOURCE_DIRECTORY &&
+
+patch -p1 < $SPELL_DIRECTORY/no-packagekit.patch
diff --git a/printer/system-config-printer/no-packagekit.patch
b/printer/system-config-printer/no-packagekit.patch
new file mode 100644
index 0000000..8482ad8
--- /dev/null
+++ b/printer/system-config-printer/no-packagekit.patch
@@ -0,0 +1,36 @@
+--- system-config-printer-1.3.5/cupshelpers/cupshelpers.py 2011-08-01
10:47:11.614519332 +0100
++++ system-config-printer-1.3.5/cupshelpers/cupshelpers.py 2011-08-02
15:45:33.807623959 +0100
+@@ -21,7 +21,6 @@
+
+ import cups, pprint, os, tempfile, re, string
+ import locale
+-import packagekit.client, packagekit.enums
+ from . import _debugprint
+
+ class Printer:
+@@ -829,24 +828,7 @@
+ missing executables
+ """
+ executables = missingExecutables(ppd)
+- packages = []
+- if executables:
+- unresolved_executables = []
+- client = packagekit.client.PackageKitClient ()
+- for executable in executables:
+- if not executable.startswith ("/"):
+- executable = "/usr/bin/" + executable
+-
+- result = client.search_file ([executable],
+-
packagekit.enums.FILTER_NOT_INSTALLED)
+- if result:
+- packages.extend (set (map (lambda x: x.name, result)))
+- else:
+- unresolved_executables.append (executable)
+-
+- executables = unresolved_executables
+-
+- return (packages, executables)
++ return ([], executables)
+
+ def _main():
+ c = cups.Connection()
diff --git a/ruby-raa/ruby-1.9/DEPENDS b/ruby-raa/ruby-1.9/DEPENDS
index 888f0b4..f42ce5e 100755
--- a/ruby-raa/ruby-1.9/DEPENDS
+++ b/ruby-raa/ruby-1.9/DEPENDS
@@ -1,3 +1,4 @@
+optional_depends doxygen "" "--disable-install-doc" "install documentation"
&&
optional_depends db "" "" "for db support" &&
optional_depends gdbm "" "" "for gdbm support" &&
optional_depends tk "" "" "for tk support" &&
diff --git a/ruby-raa/ruby-1.9/DETAILS b/ruby-raa/ruby-1.9/DETAILS
index a14ce43..d5c4d87 100755
--- a/ruby-raa/ruby-1.9/DETAILS
+++ b/ruby-raa/ruby-1.9/DETAILS
@@ -1,7 +1,7 @@
SPELL=ruby-1.9
PACKAGE=ruby
- VERSION=1.9.2-p180
-
SOURCE_HASH=sha512:6b018b4b1d3e61a68f6065cf276545ae1613242d8d3065d1b0c1c476e99d6306a09382d4b36cab779390feb030f791bbb4fce9a3fecdebe1a85a7cb1df62d925
+ VERSION=1.9.2-p290
+
SOURCE_HASH=sha512:d9c3b13f52a565fcacec1916a68309efea012f583c886feb04580b536cd52e150dacb154a84d5f9e30d1f562eb0b3d360421b8ebfca75ec69b7824df3072c1d8
SOURCE=$PACKAGE-$VERSION.tar.gz
SECURITY_PATCH=3
SOURCE_URL[0]=ftp://ftp.ruby-lang.org/pub/ruby/1.9/$SOURCE
diff --git a/ruby-raa/ruby-1.9/HISTORY b/ruby-raa/ruby-1.9/HISTORY
index bc002a3..b2d7660 100644
--- a/ruby-raa/ruby-1.9/HISTORY
+++ b/ruby-raa/ruby-1.9/HISTORY
@@ -1,3 +1,7 @@
+2011-08-03 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.9.2-p290
+ * DEPENDS: add optional doxygen
+
2011-02-21 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.9.2-p180
SECURITY_PATCH++
diff --git a/utils/dbus/DETAILS b/utils/dbus/DETAILS
index 97ddb26..3ec22ef 100755
--- a/utils/dbus/DETAILS
+++ b/utils/dbus/DETAILS
@@ -1,6 +1,6 @@
SPELL=dbus
- VERSION=1.4.12
-
SOURCE_HASH=sha512:71154e42e98b172b6abad91abff7fb83f646bb2c4601922b4355eb10aaab4e23aca0607a66346d4e38b64433b0501149f3a498a80f18f0e5ac69cd83e883229d
+ VERSION=1.4.14
+
SOURCE_HASH=sha512:d1309b8fc5e84cfe3d2a27cf2a45737af693031b31d84870fdf19916cb4c758c23cfc0aa5cb0d7653624dca0ef90b551360770044a3b210cf1d77f5c76679a9f
SECURITY_PATCH=7
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/utils/dbus/HISTORY b/utils/dbus/HISTORY
index 40be66f..5754e00 100644
--- a/utils/dbus/HISTORY
+++ b/utils/dbus/HISTORY
@@ -1,3 +1,6 @@
+2011-08-03 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.4.14
+
2011-06-12 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.4.12, SECURITY_PATCH=7
diff --git a/utils/dialog/DETAILS b/utils/dialog/DETAILS
index bfe50a7..1739db1 100755
--- a/utils/dialog/DETAILS
+++ b/utils/dialog/DETAILS
@@ -1,5 +1,5 @@
SPELL=dialog
- VERSION=1.1-20110302
+ VERSION=1.1-20110707
SOURCE=$SPELL-$VERSION.tgz
SOURCE2=$SOURCE.asc
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/utils/dialog/HISTORY b/utils/dialog/HISTORY
index e5a846a..92562de 100644
--- a/utils/dialog/HISTORY
+++ b/utils/dialog/HISTORY
@@ -1,3 +1,6 @@
+2011-08-04 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.1-20110707
+
2011-04-30 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.1-20110302
diff --git a/utils/file/DETAILS b/utils/file/DETAILS
index d048ce0..674355c 100755
--- a/utils/file/DETAILS
+++ b/utils/file/DETAILS
@@ -1,6 +1,6 @@
SPELL=file
- VERSION=5.07
-
SOURCE_HASH=sha512:858cae086aaca14381961ea13fd77d4b6c16e8fb7b533c83c828c0797ad1f14be25bb55b05b608727c54251e2b92615e674408b95e07e345dbdd11f1d5cf73f3
+ VERSION=5.08
+
SOURCE_HASH=sha512:9696d45cbfd4931abe66f13717b227f8a284cd094a32f054d91d40e7f2a16a7d96c4994064887a986b39174de7702e73b7626742a06e4bf736d3e082904004fb
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=ftp://ftp.astron.com/pub/file/$SOURCE
diff --git a/utils/file/HISTORY b/utils/file/HISTORY
index 71c33b6..2960327 100644
--- a/utils/file/HISTORY
+++ b/utils/file/HISTORY
@@ -1,3 +1,7 @@
+2011-08-04 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 5.08
+ * PRE_BUILD, file-5.07-zip-detect.patch: removed
+
2011-05-27 Sukneet Basuta <sukneet AT sourcemage.org>
* PRE_BUILD, file-5.07-zip-detect.patch: added, patch to
recognize zip files correctly
diff --git a/utils/file/PRE_BUILD b/utils/file/PRE_BUILD
deleted file mode 100755
index c8da3b5..0000000
--- a/utils/file/PRE_BUILD
+++ /dev/null
@@ -1,2 +0,0 @@
-default_pre_build &&
-patch -p0 < ${SCRIPT_DIRECTORY}/file-5.07-zip-detect.patch
diff --git a/utils/file/file-5.07-zip-detect.patch
b/utils/file/file-5.07-zip-detect.patch
deleted file mode 100644
index 3e8f128..0000000
--- a/utils/file/file-5.07-zip-detect.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- file-5.07/magic/Magdir/archive.old 2011-04-23 17:02:48.000000000 +0200
-+++ file-5.07/magic/Magdir/archive 2011-05-15 10:14:44.509271579 +0200
-@@ -654,6 +654,10 @@
- >>>>78 string -template Template
- !:mime application/vnd.oasis.opendocument.image-template
-
-+>26 byte x Zip archive data
-+
-+
-+
- # StarView Metafile
- # From Pierre Ducroquet <pinaraf AT pinaraf.info>
- 0 string VCLMTF StarView MetaFile
- [SM-Commit] GIT changes to devel-kde47 grimoire by Bor Kraljič (1b6545b50be81598a7ce201a6362045264a17893), Bor Kraljič, 08/04/2011
Archive powered by MHonArc 2.6.24.