Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-libpng grimoire by Remko van der Vossen (061ca2467ae9cbf45de742762a5e047d1c4d3206)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Remko van der Vossen <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to devel-libpng grimoire by Remko van der Vossen (061ca2467ae9cbf45de742762a5e047d1c4d3206)
  • Date: Sat, 21 Aug 2010 07:16:17 -0500

GIT changes to devel-libpng grimoire by Remko van der Vossen
<wich AT sourcemage.org>:

ChangeLog |
4 ++
database/mysql/DETAILS |
6 ++--
database/mysql/HISTORY |
3 ++
dev/null
|binary
devel/geany/DETAILS |
2 -
devel/geany/HISTORY |
3 ++
devel/git/DETAILS |
2 -
devel/git/HISTORY |
3 ++
devel/make/DETAILS |
13 +++++----
devel/make/HISTORY |
4 ++
devel/make/make-3.81.tar.gz.sig |
0
disk/lvm/DETAILS |
4 +-
disk/lvm/HISTORY |
3 ++
disk/squashfs-tools/DETAILS |
4 +-
disk/squashfs-tools/HISTORY |
3 ++
editors/scribus4/DETAILS |
2 -
editors/scribus4/HISTORY |
3 ++
ftp/gtk-gnutella/DETAILS |
4 +-
ftp/gtk-gnutella/HISTORY |
3 ++
ftp/gtk-gnutella/gtk-gnutella-0.96.6.tar.bz2.sig |
0
ftp/gtk-gnutella/gtk-gnutella-0.96.8.tar.bz2.sig
|binary
gnome2-apps/evolution/DETAILS |
2 -
gnome2-apps/evolution/HISTORY |
3 ++
gnome2-apps/evolution/evolution-2.30.2.tar.bz2.sig |
0
gnome2-apps/evolution/evolution-2.30.3.tar.bz2.sig
|binary
gnome2-libs/evolution-data-server/DETAILS |
2 -
gnome2-libs/evolution-data-server/HISTORY |
3 ++
gnome2-libs/evolution-data-server/evolution-data-server-2.30.2.tar.bz2.sig |
0
gnome2-libs/evolution-data-server/evolution-data-server-2.30.3.tar.bz2.sig
|binary
gnome2-libs/evolution-exchange/DETAILS |
2 -
gnome2-libs/evolution-exchange/HISTORY |
3 ++
gnome2-libs/evolution-exchange/evolution-exchange-2.30.2.tar.bz2.sig |
0
gnome2-libs/evolution-exchange/evolution-exchange-2.30.3.tar.bz2.sig
|binary
gnome2-libs/tracker/DEPENDS |
5 +++
gnome2-libs/tracker/DETAILS |
2 -
gnome2-libs/tracker/HISTORY |
4 ++
gnome2-libs/tracker/tracker-0.8.12.tar.bz2.sig |
0
gnome2-libs/tracker/tracker-0.8.16.tar.bz2.sig
|binary
graphics-libs/mesalib/DEPENDS |
3 +-
graphics-libs/mesalib/HISTORY |
5 +++
graphics-libs/mesalib/PRE_BUILD |
4 ++
graphics-libs/mesalib/PROVIDES |
1
graphics-libs/mesalib/autogen.patch |
9 ++++++
graphics/netpbm/HISTORY |
3 ++
graphics/netpbm/PRE_BUILD |
2 -
graphics/zgv/HISTORY |
4 ++
graphics/zgv/PRE_BUILD |
4 ++
http/apache-mod_ssl/CONFLICTS |
12 +++++---
http/apache-mod_ssl/HISTORY |
4 ++
http/apache1/CONFLICTS |
11 +++++--
http/apache1/HISTORY |
4 ++
http/apache2/CONFLICTS |
12 +++++---
http/apache2/HISTORY |
4 ++
http/apache22/CONFLICTS |
12 +++++---
http/apache22/HISTORY |
4 ++
http/firefox/DEPENDS |
4 ++
http/httpd-dev/CONFLICTS |
12 +++++++-
http/httpd-dev/HISTORY |
3 ++
http/mod_geoip2/BUILD |
1
http/mod_geoip2/DEPENDS |
2 +
http/mod_geoip2/DETAILS |
14 ++++++++++
http/mod_geoip2/HISTORY |
2 +
http/mod_geoip2/INSTALL |
1
http/xshttpd/CONFLICTS |
5 ++-
http/xshttpd/DETAILS |
2 -
http/xshttpd/HISTORY |
4 ++
kernels/linux/HISTORY |
4 ++
kernels/linux/info/patches/maintenance_patches/patch-2.6.35.3 |
6 ++++
kernels/linux/latest.defaults |
2 -
libs/boost/DETAILS |
4 +-
libs/boost/HISTORY |
3 ++
libs/glibc/BUILD |
3 --
libs/glibc/HISTORY |
3 --
net/rrdtool/DEPENDS |
1
net/rrdtool/HISTORY |
3 ++
net/whois/DETAILS |
4 +-
net/whois/HISTORY |
3 ++
utils/nss-pam-ldapd/DETAILS |
2 -
utils/nss-pam-ldapd/HISTORY |
3 ++
video/vlc/DETAILS |
4 +-
video/vlc/HISTORY |
4 ++
x11-libs/cairo/DETAILS |
4 +-
x11-libs/cairo/HISTORY |
8 +++++
x11-libs/cairo/PRE_BUILD |
5 +++
x11-libs/cairo/libpng14.patch |
12 ++++++++
x11-libs/wine/DETAILS |
2 -
x11-libs/wine/HISTORY |
3 ++
87 files changed, 260 insertions(+), 63 deletions(-)

New commits:
commit 061ca2467ae9cbf45de742762a5e047d1c4d3206
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

cairo: back to 1.8.8 again

commit 3ea3d0f246dcc3bad74c1f0e8ab11b6fa4be1b47
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

cairo: added patch to stable so it compiles with libpng 1.4*

commit 1f7a52d952c5a1187820fe404a1d81f95eaef373
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

make: => 3.82

commit 6761f8a6f6bccce8f47ad0bc3bf5db8f5094aa06
Author: Finn Haedicke <finn AT sourcemage.org>
Commit: Finn Haedicke <finn AT sourcemage.org>

scribus4: fixed source name (upstream renamed it)

commit 02a579072460295069404b56c67f8d53af5e7a6c
Author: Finn Haedicke <finn AT sourcemage.org>
Commit: Finn Haedicke <finn AT sourcemage.org>

boost => 1_44_0

commit f80064aae53f0b08c1211775cc5e30889ebf7934
Author: Mark Bainter <mbainter AT sourcemage.org>
Commit: Mark Bainter <mbainter AT sourcemage.org>

net/rrdtool: Added missing dependency on intltool

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

linux: Updated latest 2.6 to 2.6.35.3

This kernel seems to fix the numerous kernel BUG faults 2.6.35.2
was giving me, making my machine unusable most times (constant hangs)
and even unbootable (hang during boot).

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

wine: Updated devel to 1.3.1

commit c048a831fe87cd293a1ffc3d4870b6b038d2af0c
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

mod_geoip2: new spell, Apache 2 module for finding the country of web
requests

commit 1994f70cf66830dade63453c11cc88687982cebd
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

geany: => 0.19.1

commit c0d5536809fccd4f61cfb380d6904a636f05f7b3
Author: David Haley <khoralin AT gmail.com>
Commit: David Haley <khoralin AT gmail.com>

Resubmit of previous commit. Version bump fpr gtk-gnutella 0.96.6 ->
0.96.8.

commit 9faeb4a79a70d6372cda28073adc6ae355f19f44
Author: David Haley <khoralin AT gmail.com>
Commit: David Haley <khoralin AT gmail.com>

Commit was not complete and am reverting this small bump so that I can
try and resubmit correctly.

Revert "Update spell to version 0.96.8. Swapped out the sig file
with a new one. The"

This reverts commit 43854ad5b209dded71ed59d25d8508f18609ee4f.

commit 5cb526552e5391c74c00488d9f03c78365f65191
Author: Andraž Levstik <ruskie+2054d253 AT codemages.net>
Commit: Andraž Levstik <ruskie+2054d253 AT codemages.net>

squashfs-tools: update to v4.0, inkernel squashfs doesn't have backwards
compatibility so all existing squashfs fs' need to be rebuilt using v4 tools

commit 43854ad5b209dded71ed59d25d8508f18609ee4f
Author: David Haley <khoralin AT gmail.com>
Commit: David Haley <khoralin AT gmail.com>

Update spell to version 0.96.8. Swapped out the sig file with a new one.
The
SHA512 has field was commented out, but I updated this as well and
updated teh
file accordingly.

commit 799f7cd4dbc6534a35a92443b4676468f14b20cf
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

git 1.7.2.2

commit e714cd06a3601aacc27fe97c00bfcff5b438606b
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

mysql: => 5.1.50 (stable)

commit d11a0e8ea841e2878fdcf023d95a7ef427c8c090
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

mesalib: small fixes for latest scm version

commit 0521d9ccfb35ad1c8a4d86deac4a5a0186d6e262
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

evolution-exchange 2.30.3

commit fcae7b8e4ca7d54c79ed5f4e12a0a43d933b4b63
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

netpbm: small filename change in the advanced version

commit 142a27bf97abb4d148ee78a5d8c4148dbb9d94a9
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

evolution 2.30.3

commit 097eb16701622b7ad6004456d241165c83ce388c
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

evolution-data-server 2.30.3

commit 384cee9d030dd0e31c91c4b745c9d48b7ff1252c
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

tracker 0.8.16

commit bbaca9b4aa0df3baad26d37356c3270953758d69
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

whois 5.0.7

commit 138de827ac3b5c46e54725fa5ed0e41aae938a7c
Author: David Haley <khoralin AT gmail.com>
Commit: David Haley <khoralin AT gmail.com>

Adding libnotify as a dependency for firefox regardless if CVS used or
not. During compile of devel version it was found that firefox would not
compile unless libnotify (version >= 0.4) was cast. Stable also requires
libnotify but is pulled in indirectly as a dependency for xulrunner.

commit 72e1e310ab4a7d28b12782feb6484b295f27a454
Author: David Haley <khoralin AT gmail.com>
Commit: David Haley <khoralin AT gmail.com>

Updating DEPENDS file for CVS(devel) dependencies. Unable to compile
firefox from CVS without libnotify (version >= 0.4) cast. Once this
dependency is
in place there were no issues in casting firefox. I have confirmed that
firefox (stable, currently 3.6.8) does NOT require libnotify. Due to this the
depends statement has been located in the proper place within the DEPENDS
file.

commit 64f1104a2c5b332764de6260de90593aba82a1d2
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

nss-pam-ldapd: => 0.7.8

commit 83923b564a0883969bee2369839e9d483c22ff88
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

lvm 2.02.73

commit ed43f92ab02d0b06d6512ebfa601aa492e36900b
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

vlc 1.1.3, SECURITY_PATCH=13

commit 290b1ae0bdbe62e5cf9a79687f3bbf9c72987c3f
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

zgv: fixed build for new gcc

commit 76e41cdda5e67721eefc34ff469af24343326ac5
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

httpd-dev: fixed up CONFLICTS

commit 643a60683ad68e6ff5ab740a9993e152498d1711
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

xshttpd: devel version 37b16

commit c0c4c49129e693932f7c83dc0daf90df0d9ecc2b
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

Revert "glibc: disable stripping, so thread debugging works #15017"

This reverts commit 5baabea0403c9d39b7442f9eb6b192bd451a35fc.

commit 395673251eea4ba1f94d48fbd3825301351dafc8
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

apache22: fixed up CONFLICTS

commit 3ca2a0a484a5fd6d19d4405bb86a3a50aee8ecc0
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

apache2: fixed up CONFLICTS

commit b042aeef91ebb128fe7b68986364ca0e759cc9b1
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

apache1: fixed up CONFLICTS

commit 57aa69ebc6d6ca2a09e809df37854c91bf27425c
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

apache-mod_ssl: fixed up CONFLICTS

diff --git a/ChangeLog b/ChangeLog
index 14c7c29..d493d33 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-08-20 Vlad Glagolev <stealth AT sourcemage.org>
+ * http/mod_geoip2: new spell, Apache 2 module for finding the country
of
+ web requests
+
2010-08-17 George Sherwood <gsherwood AT sourcemage.org>
* gnome2-libs/gdk-pixbuf2: new spell for devel gtk+3
* x11-toolkits/gtk+3: new spell with latest gtk toolkit
diff --git a/database/mysql/DETAILS b/database/mysql/DETAILS
index 2a36468..b700979 100755
--- a/database/mysql/DETAILS
+++ b/database/mysql/DETAILS
@@ -4,7 +4,7 @@ if [[ $OLD == y ]]; then

SECURITY_PATCH=4
else
- VERSION=5.1.49
+ VERSION=5.1.50
fi
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.asc
@@ -12,9 +12,9 @@ fi
SOURCE2_IGNORE=signature
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URI=MySQL-${VERSION%\.*}/$SOURCE
- SOURCE_URL[0]=ftp://mirror.mcs.anl.gov/pub/mysql/Downloads/$SOURCE_URI
+ SOURCE_URL[0]=http://ftp.gwdg.de/pub/misc/mysql/Downloads/$SOURCE_URI
SOURCE_URL[1]=http://mysql.he.net/Downloads/$SOURCE_URI
- SOURCE_URL[2]=ftp://ftp.mysql.com/$SOURCE_URI
+ SOURCE_URL[2]=ftp://mirror.switch.ch/mirror/mysql/Downloads/$SOURCE_URI
SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
SOURCE2_URL[1]=${SOURCE_URL[1]}.asc
SOURCE2_URL[2]=${SOURCE_URL[2]}.asc
diff --git a/database/mysql/HISTORY b/database/mysql/HISTORY
index 560b4ff..e031042 100644
--- a/database/mysql/HISTORY
+++ b/database/mysql/HISTORY
@@ -1,3 +1,6 @@
+2010-08-19 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated stable to 5.1.50; renewed source urls
+
2010-07-23 George Sherwood <gsherwood AT sourcemage.org>
* DETAILS: Updated stable to 5.1.49

diff --git a/devel/geany/DETAILS b/devel/geany/DETAILS
index f6f7964..23f15d4 100755
--- a/devel/geany/DETAILS
+++ b/devel/geany/DETAILS
@@ -1,5 +1,5 @@
SPELL=geany
- VERSION=0.19
+ VERSION=0.19.1
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.sig
SOURCE_URL[0]=http://download.geany.org/$SOURCE
diff --git a/devel/geany/HISTORY b/devel/geany/HISTORY
index 3e7d9e1..119d7a7 100644
--- a/devel/geany/HISTORY
+++ b/devel/geany/HISTORY
@@ -1,3 +1,6 @@
+2010-08-20 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.19.1
+
2010-06-12 George Sherwood <gsherwood AT sourcemage.org>
* DETAILS: Updated to version 0.19

diff --git a/devel/git/DETAILS b/devel/git/DETAILS
index 081e899..52852e1 100755
--- a/devel/git/DETAILS
+++ b/devel/git/DETAILS
@@ -1,5 +1,5 @@
SPELL=git
- VERSION=1.7.2.1
+ VERSION=1.7.2.2
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.sign
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/devel/git/HISTORY b/devel/git/HISTORY
index d033a84..372e7c6 100644
--- a/devel/git/HISTORY
+++ b/devel/git/HISTORY
@@ -1,3 +1,6 @@
+2010-08-20 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.7.2.2
+
2010-07-28 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.7.2.1

diff --git a/devel/make/DETAILS b/devel/make/DETAILS
index bf9d4c0..09dabb7 100755
--- a/devel/make/DETAILS
+++ b/devel/make/DETAILS
@@ -1,16 +1,19 @@
SPELL=make
- VERSION=3.81
+ VERSION=3.82
SOURCE=$SPELL-$VERSION.tar.gz
- SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ SOURCE2=$SOURCE.sig
+ SOURCE_GPG=gnu.gpg:$SOURCE2:UPSTREAM_KEY
+ SOURCE2_IGNORE=signature
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=$GNU_URL/$SPELL/$SOURCE
SOURCE_URL[1]=ftp://ftp.gnu.org/pub/gnu/$SPELL/$SOURCE
+ SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
+ SOURCE2_URL[1]=${SOURCE_URL[1]}.sig
LICENSE[0]=GPL
WEB_SITE=http://www.gnu.org/software/make/make.html
ENTERED=20010922
- UPDATED=20050721
KEYWORDS="devel"
- SHORT="make generates executables and other non-source programs."
+ SHORT="make generates executables and other non-source programs"
cat << EOF
make - Generates executables and other non-source programs
Make examines a set of related files, determines which of them are out
diff --git a/devel/make/HISTORY b/devel/make/HISTORY
index 538c3fd..c9ef3c5 100644
--- a/devel/make/HISTORY
+++ b/devel/make/HISTORY
@@ -1,3 +1,7 @@
+2010-08-21 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 3.82; quoting paths
+ converted to upstream signature checking
+
2009-06-18 Ethan Grammatikidis <eekee57 AT fastmail.fm>
* DETAILS: fixed WEB_SITE

diff --git a/devel/make/make-3.81.tar.gz.sig b/devel/make/make-3.81.tar.gz.sig
deleted file mode 100644
index 18b09a9..0000000
Binary files a/devel/make/make-3.81.tar.gz.sig and /dev/null differ
diff --git a/disk/lvm/DETAILS b/disk/lvm/DETAILS
index ac9239a..0ccaa86 100755
--- a/disk/lvm/DETAILS
+++ b/disk/lvm/DETAILS
@@ -1,10 +1,10 @@
SPELL=lvm
- VERSION=2.02.72
+ VERSION=2.02.73
SOURCE=LVM2.$VERSION.tgz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/LVM2.$VERSION
SOURCE_URL[0]=ftp://sources.redhat.com/pub/lvm2/$SOURCE
SOURCE_URL[1]=ftp://sources.redhat.com/pub/lvm2/old/$SOURCE
-
SOURCE_HASH=sha512:c730208b59b7b62850c0875b376a100218a0ccae9f2803b11f29bfcb83d38494febaf3f94082cbeddac0674377b97156950ca33a9a7c15495498b526dc685b7c
+
SOURCE_HASH=sha512:238ea145e5cd37c39cedb19a2e4d0d8488a6724e366aabefea931dffe14465b55aef96e241f25a7c95d2bc7d08c5853a6d29eaaa1574af65b84454bf1b114f23
WEB_SITE=http://sources.redhat.com/lvm2/
ENTERED=20010922
LICENSE[0]=GPL
diff --git a/disk/lvm/HISTORY b/disk/lvm/HISTORY
index 6076a78..8bbb552 100644
--- a/disk/lvm/HISTORY
+++ b/disk/lvm/HISTORY
@@ -1,3 +1,6 @@
+2010-08-19 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.02.73
+
2010-07-28 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.02.72

diff --git a/disk/squashfs-tools/DETAILS b/disk/squashfs-tools/DETAILS
index 6df9141..1649e9e 100755
--- a/disk/squashfs-tools/DETAILS
+++ b/disk/squashfs-tools/DETAILS
@@ -1,9 +1,9 @@
SPELL=squashfs-tools
- VERSION=3.3
+ VERSION=4.0
SOURCE=squashfs${VERSION}.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/squashfs${VERSION}
SOURCE_URL[0]=${SOURCEFORGE_URL}/squashfs/${SOURCE}
-
SOURCE_HASH=sha512:04d3960d71ce263d3d77878ca06d3f3a55bc10db4efc3ab500868a611fede8f3a1db7cb365693af1fd1578994dc53d6d39f2c5c7b50b8fce37c85794fae8e052
+
SOURCE_HASH=sha512:4056c5f061496c2b984b5aa3a4047aa0f19c6effe107f46b21dd3ee780a71b9cb23c50662b327ea04c63e8150c0a911b716e181ab6372bfc67a01f9342e29b7c
WEB_SITE=http://squashfs.sourceforge.net/
LICENSE[0]=GPL
ENTERED=20050104
diff --git a/disk/squashfs-tools/HISTORY b/disk/squashfs-tools/HISTORY
index 19ba548..e86fc86 100644
--- a/disk/squashfs-tools/HISTORY
+++ b/disk/squashfs-tools/HISTORY
@@ -1,3 +1,6 @@
+2010-08-20 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
+ * DETAILS: updated spell to 4.0
+
2008-02-16 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* DETAILS: updated spell to 3.3

diff --git a/editors/scribus4/DETAILS b/editors/scribus4/DETAILS
index a6fd286..17dbf35 100755
--- a/editors/scribus4/DETAILS
+++ b/editors/scribus4/DETAILS
@@ -2,7 +2,7 @@
SPELLX=${SPELL//4}
VERSION=1.3.8

SOURCE_HASH=sha512:dbfc6a58b13dc76099a466139fc66979ae51ec5e7cd6d3f7c4f2c6dcdc3bf0fbc1d12613cdcc147fb53b94256b8eed472b68705172a236e11abe459c4ba76cb0
- SOURCE=${SPELLX}-${VERSION}-tar.bz2
+ SOURCE=${SPELLX}-${VERSION}.tar.bz2
# SOURCE2=${SOURCE}.sig
# SOURCE_GPG=scribus.gpg:${SOURCE}.sig:ESTABLISHED_UPSTREAM_KEY
# SOURCE2_IGNORE=signature
diff --git a/editors/scribus4/HISTORY b/editors/scribus4/HISTORY
index 771178e..4d18130 100644
--- a/editors/scribus4/HISTORY
+++ b/editors/scribus4/HISTORY
@@ -1,3 +1,6 @@
+2010-08-21 Finn Haedicke <finn AT sourcemage.org>
+ * DETAILS: SOURCE updated
+
2010-07-29 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.3.8, SOURCE updated

diff --git a/ftp/gtk-gnutella/DETAILS b/ftp/gtk-gnutella/DETAILS
index e2c63c3..52d9ade 100755
--- a/ftp/gtk-gnutella/DETAILS
+++ b/ftp/gtk-gnutella/DETAILS
@@ -1,10 +1,10 @@
SPELL=gtk-gnutella
- VERSION=0.96.6
+ VERSION=0.96.8
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
-#
SOURCE_HASH=sha512:a248c16aca516c0032649251ba9ad2a075e9a57cb15f3441ae2c11be1c1a0e1096c16e78861b3b8d8dd8064b0931fbf0fbbf9c65e7cbc79e589894b22ceea1e5
+#
SOURCE_HASH=sha512:735797854210641d0758ddacf00be99323de7c4c1b8c3a9e2530b35bc9abf54a1f9dff792dfcdb2210d4d9072e02c8fdab66fd7707b3752007ed3126036e089e
LICENSE[0]=GPL
WEB_SITE=http://gtk-gnutella.sourceforge.net/
ENTERED=20011022
diff --git a/ftp/gtk-gnutella/HISTORY b/ftp/gtk-gnutella/HISTORY
index e647425..930b6b2 100644
--- a/ftp/gtk-gnutella/HISTORY
+++ b/ftp/gtk-gnutella/HISTORY
@@ -1,3 +1,6 @@
+2010-08-19 David C. Haley <khoralin AT gmail.com>
+ * DETAILS: Updated to 0.96.8
+
2009-04-12 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 0.96.6

diff --git a/ftp/gtk-gnutella/gtk-gnutella-0.96.6.tar.bz2.sig
b/ftp/gtk-gnutella/gtk-gnutella-0.96.6.tar.bz2.sig
deleted file mode 100644
index e5ec87f..0000000
Binary files a/ftp/gtk-gnutella/gtk-gnutella-0.96.6.tar.bz2.sig and /dev/null
differ
diff --git a/ftp/gtk-gnutella/gtk-gnutella-0.96.8.tar.bz2.sig
b/ftp/gtk-gnutella/gtk-gnutella-0.96.8.tar.bz2.sig
new file mode 100644
index 0000000..89e562b
Binary files /dev/null and b/ftp/gtk-gnutella/gtk-gnutella-0.96.8.tar.bz2.sig
differ
diff --git a/gnome2-apps/evolution/DETAILS b/gnome2-apps/evolution/DETAILS
index 732c114..5209eba 100755
--- a/gnome2-apps/evolution/DETAILS
+++ b/gnome2-apps/evolution/DETAILS
@@ -1,5 +1,5 @@
SPELL=evolution
- VERSION=2.30.2
+ VERSION=2.30.3
BRANCH=${VERSION:0:4}
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-apps/evolution/HISTORY b/gnome2-apps/evolution/HISTORY
index 640efd0..be8f2ac 100644
--- a/gnome2-apps/evolution/HISTORY
+++ b/gnome2-apps/evolution/HISTORY
@@ -1,3 +1,6 @@
+2010-08-19 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.30.3
+
2010-06-20 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.30.2

diff --git a/gnome2-apps/evolution/evolution-2.30.2.tar.bz2.sig
b/gnome2-apps/evolution/evolution-2.30.2.tar.bz2.sig
deleted file mode 100644
index 6a2f7ea..0000000
Binary files a/gnome2-apps/evolution/evolution-2.30.2.tar.bz2.sig and
/dev/null differ
diff --git a/gnome2-apps/evolution/evolution-2.30.3.tar.bz2.sig
b/gnome2-apps/evolution/evolution-2.30.3.tar.bz2.sig
new file mode 100644
index 0000000..0525944
Binary files /dev/null and
b/gnome2-apps/evolution/evolution-2.30.3.tar.bz2.sig differ
diff --git a/gnome2-libs/evolution-data-server/DETAILS
b/gnome2-libs/evolution-data-server/DETAILS
index b1c5c85..f333989 100755
--- a/gnome2-libs/evolution-data-server/DETAILS
+++ b/gnome2-libs/evolution-data-server/DETAILS
@@ -1,5 +1,5 @@
SPELL=evolution-data-server
- VERSION=2.30.2
+ VERSION=2.30.3
BRANCH=`echo $VERSION | cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-libs/evolution-data-server/HISTORY
b/gnome2-libs/evolution-data-server/HISTORY
index c80df69..dd8758c 100644
--- a/gnome2-libs/evolution-data-server/HISTORY
+++ b/gnome2-libs/evolution-data-server/HISTORY
@@ -1,3 +1,6 @@
+2010-08-19 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.30.3
+
2010-06-21 Vasil Yonkov <spirtbrat AT sourcemage.org>
* REPAIR^all^PRE_SUB_DEPENDS: fixed typo

diff --git
a/gnome2-libs/evolution-data-server/evolution-data-server-2.30.2.tar.bz2.sig
b/gnome2-libs/evolution-data-server/evolution-data-server-2.30.2.tar.bz2.sig
deleted file mode 100644
index 2313bb2..0000000
Binary files
a/gnome2-libs/evolution-data-server/evolution-data-server-2.30.2.tar.bz2.sig
and /dev/null differ
diff --git
a/gnome2-libs/evolution-data-server/evolution-data-server-2.30.3.tar.bz2.sig
b/gnome2-libs/evolution-data-server/evolution-data-server-2.30.3.tar.bz2.sig
new file mode 100644
index 0000000..b5f1970
Binary files /dev/null and
b/gnome2-libs/evolution-data-server/evolution-data-server-2.30.3.tar.bz2.sig
differ
diff --git a/gnome2-libs/evolution-exchange/DETAILS
b/gnome2-libs/evolution-exchange/DETAILS
index 3cc010e..7f1103c 100755
--- a/gnome2-libs/evolution-exchange/DETAILS
+++ b/gnome2-libs/evolution-exchange/DETAILS
@@ -1,5 +1,5 @@
SPELL=evolution-exchange
- VERSION=2.30.2
+ VERSION=2.30.3
BRANCH=`echo $VERSION | cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-libs/evolution-exchange/HISTORY
b/gnome2-libs/evolution-exchange/HISTORY
index 0dfe577..32b7b40 100644
--- a/gnome2-libs/evolution-exchange/HISTORY
+++ b/gnome2-libs/evolution-exchange/HISTORY
@@ -1,3 +1,6 @@
+2010-08-19 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.30.3
+
2010-06-28 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.30.2
* DEPENDS: --with-krb5 -> --with-krb5=/usr #15643
diff --git
a/gnome2-libs/evolution-exchange/evolution-exchange-2.30.2.tar.bz2.sig
b/gnome2-libs/evolution-exchange/evolution-exchange-2.30.2.tar.bz2.sig
deleted file mode 100644
index f2cc410..0000000
Binary files
a/gnome2-libs/evolution-exchange/evolution-exchange-2.30.2.tar.bz2.sig and
/dev/null differ
diff --git
a/gnome2-libs/evolution-exchange/evolution-exchange-2.30.3.tar.bz2.sig
b/gnome2-libs/evolution-exchange/evolution-exchange-2.30.3.tar.bz2.sig
new file mode 100644
index 0000000..bc1e81d
Binary files /dev/null and
b/gnome2-libs/evolution-exchange/evolution-exchange-2.30.3.tar.bz2.sig differ
diff --git a/gnome2-libs/tracker/DEPENDS b/gnome2-libs/tracker/DEPENDS
index 53b35d9..3d96d24 100755
--- a/gnome2-libs/tracker/DEPENDS
+++ b/gnome2-libs/tracker/DEPENDS
@@ -99,6 +99,11 @@ optional_depends libiptcdata
\
"--disable-libiptcdata" \
"for iptc data extractor" &&

+optional_depends evolution \
+ "--enable-miner-evolution" \
+ "--disable-miner-evolution" \
+ "to enable Evolution email data miner" &&
+
if [[ "${TRACKER_EXTRACTOR}" == "gstreamer" ]]; then
depends gstreamer
elif [[ "${TRACKER_EXTRACTOR}" == "xine" ]]; then
diff --git a/gnome2-libs/tracker/DETAILS b/gnome2-libs/tracker/DETAILS
index 726edf1..c829a58 100755
--- a/gnome2-libs/tracker/DETAILS
+++ b/gnome2-libs/tracker/DETAILS
@@ -2,7 +2,7 @@
if [[ "$TRACKER_DEVEL" == "y" ]]; then
VERSION=0.9.6
else
- VERSION=0.8.12
+ VERSION=0.8.16
fi
BRANCH=${VERSION:0:3}
SOURCE=$SPELL-$VERSION.tar.bz2
diff --git a/gnome2-libs/tracker/HISTORY b/gnome2-libs/tracker/HISTORY
index 6ba1d52..fc36f4f 100644
--- a/gnome2-libs/tracker/HISTORY
+++ b/gnome2-libs/tracker/HISTORY
@@ -1,3 +1,7 @@
+2010-08-19 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.8.16
+ * DEPENDS: added optional_depends evolution
+
2010-06-17 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.8.12

diff --git a/gnome2-libs/tracker/tracker-0.8.12.tar.bz2.sig
b/gnome2-libs/tracker/tracker-0.8.12.tar.bz2.sig
deleted file mode 100644
index e9b6c16..0000000
Binary files a/gnome2-libs/tracker/tracker-0.8.12.tar.bz2.sig and /dev/null
differ
diff --git a/gnome2-libs/tracker/tracker-0.8.16.tar.bz2.sig
b/gnome2-libs/tracker/tracker-0.8.16.tar.bz2.sig
new file mode 100644
index 0000000..7e6061f
Binary files /dev/null and b/gnome2-libs/tracker/tracker-0.8.16.tar.bz2.sig
differ
diff --git a/graphics-libs/mesalib/DEPENDS b/graphics-libs/mesalib/DEPENDS
index 2eddbf2..88ad890 100755
--- a/graphics-libs/mesalib/DEPENDS
+++ b/graphics-libs/mesalib/DEPENDS
@@ -30,5 +30,6 @@ fi &&


if [[ $MESALIB_VER == "git" ]]; then
- depends git
+ depends git &&
+ depends talloc
fi
diff --git a/graphics-libs/mesalib/HISTORY b/graphics-libs/mesalib/HISTORY
index 51d7a41..16db081 100644
--- a/graphics-libs/mesalib/HISTORY
+++ b/graphics-libs/mesalib/HISTORY
@@ -1,3 +1,8 @@
+2010-08-19 Arjan Bouter <abouter AT sourcemage.org>
+ * PROVIDES: enabled GLUT again, see docs/glu.html
+ * DEPENDS: added talloc for the scm version
+ * PRE_BUILD, autogen.patch: fixed autogen.sh for scm version
+
2010-06-17 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 7.8.2 (development)

diff --git a/graphics-libs/mesalib/PRE_BUILD b/graphics-libs/mesalib/PRE_BUILD
index 7f30ea9..acf89c1 100755
--- a/graphics-libs/mesalib/PRE_BUILD
+++ b/graphics-libs/mesalib/PRE_BUILD
@@ -35,6 +35,8 @@ sedit "s:/X11R6::g" Makefile
&&

if [[ $MESALIB_VER == "git" ]]; then
cd "$SOURCE_DIRECTORY" &&
- sedit "/.*configure.*/d" autogen.sh &&
+ patch -p0 < "${SCRIPT_DIRECTORY}/autogen.patch" &&
./autogen.sh
+ cd bin &&
+ ln -s install-sh minstall
fi
diff --git a/graphics-libs/mesalib/PROVIDES b/graphics-libs/mesalib/PROVIDES
index 3fc56f6..3721e17 100755
--- a/graphics-libs/mesalib/PROVIDES
+++ b/graphics-libs/mesalib/PROVIDES
@@ -1 +1,2 @@
OPENGL
+GLUT
diff --git a/graphics-libs/mesalib/autogen.patch
b/graphics-libs/mesalib/autogen.patch
new file mode 100644
index 0000000..eb50e7f
--- /dev/null
+++ b/graphics-libs/mesalib/autogen.patch
@@ -0,0 +1,9 @@
+--- autogen.sh 2010-08-19 17:21:46.000000000 +0200
++++ autogen.sh-fixed 2010-08-19 18:14:37.332895438 +0200
+@@ -14,5 +14,4 @@
+ MAKEFLAGS=""
+
+ autoreconf -v --install || exit 1
+-
+-"$srcdir"/configure "$@"
++automake --add-missing
diff --git a/graphics/netpbm/HISTORY b/graphics/netpbm/HISTORY
index 1ce7655..0714186 100644
--- a/graphics/netpbm/HISTORY
+++ b/graphics/netpbm/HISTORY
@@ -1,3 +1,6 @@
+2010-08-18 Arjan Bouter <abouter AT sourcemage.org>
+ * PRE_BUILD: sedit conig.mk instead of Makefile.common for recent scm
version
+
2010-01-16 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* BUILD: use ln -sf for symlinking

diff --git a/graphics/netpbm/PRE_BUILD b/graphics/netpbm/PRE_BUILD
index 7be99a2..77b5d3c 100755
--- a/graphics/netpbm/PRE_BUILD
+++ b/graphics/netpbm/PRE_BUILD
@@ -12,5 +12,5 @@ sed -i "s:/link:/lib:g" lib/Makefile &&
if [[ $NETPBM_RELEASE != advanced ]] && [[ $NETPBM_RELEASE != trunk ]]; then
sed -i "s:misc:share/netpbm:;s:/man/:/share/man/:g" Makefile.common
elif [[ $NETPBM_RELEASE == advanced ]]; then
- sed -i "s:misc:share/netpbm:;s:PKGMANDIR = man:PKGMANDIR = share/man:g"
Makefile.common
+ sed -i "s:misc:share/netpbm:;s:PKGMANDIR = man:PKGMANDIR = share/man:g"
common.mk
fi
diff --git a/graphics/zgv/HISTORY b/graphics/zgv/HISTORY
index f747093..84f5246 100644
--- a/graphics/zgv/HISTORY
+++ b/graphics/zgv/HISTORY
@@ -1,3 +1,7 @@
+2010-08-18 Remko van der Vossen <wich AT sourcemage.org>
+ * PRE_BUILD: sed to allow compilation with newer gcc
+ sed to install man pages in /usr/share
+
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS

diff --git a/graphics/zgv/PRE_BUILD b/graphics/zgv/PRE_BUILD
new file mode 100755
index 0000000..c53776e
--- /dev/null
+++ b/graphics/zgv/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+sedit '650i\ break;' src/zgv_io.c &&
+sedit 's/^#SHARE_INFIX=/SHARE_INFIX=/' config.mk
diff --git a/http/apache-mod_ssl/CONFLICTS b/http/apache-mod_ssl/CONFLICTS
index 64bdc8d..16a2c4f 100755
--- a/http/apache-mod_ssl/CONFLICTS
+++ b/http/apache-mod_ssl/CONFLICTS
@@ -1,8 +1,12 @@
conflicts apache &&
+conflicts apache1 &&
conflicts apache2 &&
conflicts apache22 &&
-persistent_read xshttpd XSHTTPD_USE_PREFIX XSHTTPD_USE_PREFIX &&
-if [[ "$XSHTTPD_USE_PREFIX" != "y" ]]; then
- message "apache-mod_ssl and xshttpd both provide the httpd binary, recast
xshttpd with the binary prefix if you wish to keep both spells installed."
1>&2
- conflicts xshttpd
+conflicts httpd-dev &&
+if spell_ok xshttpd; then
+ persistent_read xshttpd XSHTTPD_USE_PREFIX XSHTTPD_USE_PREFIX &&
+ if [[ "$XSHTTPD_USE_PREFIX" != "y" ]]; then
+ message "apache22 and xshttpd both provide the httpd binary, recast
xshttpd with the binary prefix if you wish to keep both spells installed."
1>&2
+ conflicts xshttpd
+ fi
fi
diff --git a/http/apache-mod_ssl/HISTORY b/http/apache-mod_ssl/HISTORY
index a5b9a66..f40cf52 100644
--- a/http/apache-mod_ssl/HISTORY
+++ b/http/apache-mod_ssl/HISTORY
@@ -1,3 +1,7 @@
+2010-08-18 Remko van der Vossen <wich AT sourcemage.org>
+ * CONFLICTS: check spell_ok before persistent_read
+ correct conflicts to apache1 and httpd-dev
+
2008-05-27 Remko van der Vossen <wich AT sourcemage.org>
* CONFLICTS: conflict with xshttpd if that is compiled without prefix

diff --git a/http/apache1/CONFLICTS b/http/apache1/CONFLICTS
index 6f5fbf0..cc991ea 100755
--- a/http/apache1/CONFLICTS
+++ b/http/apache1/CONFLICTS
@@ -2,8 +2,11 @@ conflicts apache &&
conflicts apache-mod_ssl &&
conflicts apache2 &&
conflicts apache22 &&
-persistent_read xshttpd XSHTTPD_USE_PREFIX XSHTTPD_USE_PREFIX &&
-if [[ "$XSHTTPD_USE_PREFIX" != "y" ]]; then
- message "apache and xshttpd both provide the httpd binary, recast xshttpd
with the binary prefix if you wish to keep both spells installed." 1>&2
- conflicts xshttpd
+conflicts httpd-dev &&
+if spell_ok xshttpd; then
+ persistent_read xshttpd XSHTTPD_USE_PREFIX XSHTTPD_USE_PREFIX &&
+ if [[ "$XSHTTPD_USE_PREFIX" != "y" ]]; then
+ message "apache22 and xshttpd both provide the httpd binary, recast
xshttpd with the binary prefix if you wish to keep both spells installed."
1>&2
+ conflicts xshttpd
+ fi
fi
diff --git a/http/apache1/HISTORY b/http/apache1/HISTORY
index d6c15d9..b1480e5 100644
--- a/http/apache1/HISTORY
+++ b/http/apache1/HISTORY
@@ -1,3 +1,7 @@
+2010-08-18 Remko van der Vossen <wich AT sourcemage.org>
+ * CONFLICTS: check spell_ok before persistent_read
+ correct conflicts to httpd-dev
+
2010-05-02 George Sherwood <gsherwood AT sourcemage.org>
* DETAILS: Actually rename spell so it will cast.
Updated to verison 1.3.42. SECURITY_PATCH++
diff --git a/http/apache2/CONFLICTS b/http/apache2/CONFLICTS
index f000b70..e5251ae 100755
--- a/http/apache2/CONFLICTS
+++ b/http/apache2/CONFLICTS
@@ -1,8 +1,12 @@
conflicts apache &&
conflicts apache-mod_ssl &&
+conflicts apache1 &&
conflicts apache22 &&
-persistent_read xshttpd XSHTTPD_USE_PREFIX XSHTTPD_USE_PREFIX &&
-if [[ "$XSHTTPD_USE_PREFIX" != "y" ]]; then
- message "apache2 and xshttpd both provide the httpd binary, recast xshttpd
with the binary prefix if you wish to keep both spells installed." 1>&2
- conflicts xshttpd
+conflicts httpd-dev &&
+if spell_ok xshttpd; then
+ persistent_read xshttpd XSHTTPD_USE_PREFIX XSHTTPD_USE_PREFIX &&
+ if [[ "$XSHTTPD_USE_PREFIX" != "y" ]]; then
+ message "apache22 and xshttpd both provide the httpd binary, recast
xshttpd with the binary prefix if you wish to keep both spells installed."
1>&2
+ conflicts xshttpd
+ fi
fi
diff --git a/http/apache2/HISTORY b/http/apache2/HISTORY
index 4bfc7d7..8974576 100644
--- a/http/apache2/HISTORY
+++ b/http/apache2/HISTORY
@@ -1,3 +1,7 @@
+2010-08-18 Remko van der Vossen <wich AT sourcemage.org>
+ * CONFLICTS: check spell_ok before persistent_read
+ correct conflicts to apache1 and httpd-dev
+
2008-10-07 David Kowis <dkowis AT shlrm.org>
* SUB_DEPENDS, PRE_SUB_DEPENDS, REPAIR^none^PRE_SUBDEPENDS:
Provided UNIQ sub dependency for mod_unique_id (copied from
apache22 spell)
diff --git a/http/apache22/CONFLICTS b/http/apache22/CONFLICTS
index 8b14455..dced333 100755
--- a/http/apache22/CONFLICTS
+++ b/http/apache22/CONFLICTS
@@ -1,8 +1,12 @@
conflicts apache &&
conflicts apache-mod_ssl &&
+conflicts apache1 &&
conflicts apache2 &&
-persistent_read xshttpd XSHTTPD_USE_PREFIX XSHTTPD_USE_PREFIX &&
-if [[ "$XSHTTPD_USE_PREFIX" != "y" ]]; then
- message "apache22 and xshttpd both provide the httpd binary, recast
xshttpd with the binary prefix if you wish to keep both spells installed."
1>&2
- conflicts xshttpd
+conflicts httpd-dev &&
+if spell_ok xshttpd; then
+ persistent_read xshttpd XSHTTPD_USE_PREFIX XSHTTPD_USE_PREFIX &&
+ if [[ "$XSHTTPD_USE_PREFIX" != "y" ]]; then
+ message "apache22 and xshttpd both provide the httpd binary, recast
xshttpd with the binary prefix if you wish to keep both spells installed."
1>&2
+ conflicts xshttpd
+ fi
fi
diff --git a/http/apache22/HISTORY b/http/apache22/HISTORY
index 01571ea..44ab1a1 100644
--- a/http/apache22/HISTORY
+++ b/http/apache22/HISTORY
@@ -1,3 +1,7 @@
+2010-08-18 Remko van der Vossen <wich AT sourcemage.org>
+ * CONFLICTS: check spell_ok before persistent_read
+ correct conflicts to apache1 and httpd-dev
+
2010-07-25 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 2.2.16; .gz -> .bz2; SECURITY_PATCH++

diff --git a/http/firefox/DEPENDS b/http/firefox/DEPENDS
index eddcf79..82281f1 100755
--- a/http/firefox/DEPENDS
+++ b/http/firefox/DEPENDS
@@ -9,13 +9,15 @@ depends zip &&
depends zlib &&
depends cairo &&
depends python &&
+depends libnotify &&
if [[ "$FIREFOX_CVS" = "n" ]]; then
depends nspr &&
depends -sub "3.12.x" nss &&
depends -sub APNG libpng &&
depends xulrunner
else
-depends autoconf-2.13
+depends autoconf-2.13 &&
+depends libnotify
fi &&

depends gtk+2 &&
diff --git a/http/httpd-dev/CONFLICTS b/http/httpd-dev/CONFLICTS
index 9542469..9e09b65 100755
--- a/http/httpd-dev/CONFLICTS
+++ b/http/httpd-dev/CONFLICTS
@@ -1,3 +1,11 @@
conflicts apache-mod_ssl &&
-conflicts apache &&
-conflicts apache2
+conflicts apache1 &&
+conflicts apache2 &&
+conflicts apache22 &&
+if spell_ok xshttpd; then
+ persistent_read xshttpd XSHTTPD_USE_PREFIX XSHTTPD_USE_PREFIX &&
+ if [[ "$XSHTTPD_USE_PREFIX" != "y" ]]; then
+ message "apache22 and xshttpd both provide the httpd binary, recast
xshttpd with the binary prefix if you wish to keep both spells installed."
1>&2
+ conflicts xshttpd
+ fi
+fi
diff --git a/http/httpd-dev/HISTORY b/http/httpd-dev/HISTORY
index 2120324..1a3c215 100644
--- a/http/httpd-dev/HISTORY
+++ b/http/httpd-dev/HISTORY
@@ -1,3 +1,6 @@
+2010-08-18 Remko van der Vossen <wich AT sourcemage.org>
+ CONFLICTS: added apache22 and xshttpd
+
2006-09-29 Arjan Bouter <abouter AT sourcemage.org>
CONFIGURE, DETAILS: removed 2.2.3 version option
it is incompatible with 2.0.
diff --git a/http/mod_geoip2/BUILD b/http/mod_geoip2/BUILD
new file mode 100755
index 0000000..9c1fab8
--- /dev/null
+++ b/http/mod_geoip2/BUILD
@@ -0,0 +1 @@
+apxs -lGeoIP -c mod_geoip.c
diff --git a/http/mod_geoip2/DEPENDS b/http/mod_geoip2/DEPENDS
new file mode 100755
index 0000000..23f0dca
--- /dev/null
+++ b/http/mod_geoip2/DEPENDS
@@ -0,0 +1,2 @@
+depends APACHE2 &&
+depends geoip
diff --git a/http/mod_geoip2/DETAILS b/http/mod_geoip2/DETAILS
new file mode 100755
index 0000000..bf6d77b
--- /dev/null
+++ b/http/mod_geoip2/DETAILS
@@ -0,0 +1,14 @@
+ SPELL=mod_geoip2
+ VERSION=1.2.5
+
SOURCE_HASH=sha512:bc3674fa374d613ce9512706c87cee68ecf20dfdfaeec81de8ce71345a4101ae4c6f8ac177fd9308c4ead933c757fd4e13f1888f4644650be96b36bf6d1049f5
+ SOURCE=${SPELL}_$VERSION.tar.gz
+ LICENSE[0]=APACHE
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/${SPELL}_$VERSION"
+ SOURCE_URL[0]=http://geolite.maxmind.com/download/geoip/api/$SPELL/$SOURCE
+ WEB_SITE=http://www.maxmind.com/app/mod_geoip
+ ENTERED=20100820
+ SHORT="Apache 2 module for finding the country of web requests"
+cat << EOF
+mod_geoip2 is an Apache 2 module for finding the country that a web request
+originated from. It uses the GeoIP library and database to perform the
lookup.
+EOF
diff --git a/http/mod_geoip2/HISTORY b/http/mod_geoip2/HISTORY
new file mode 100644
index 0000000..9462e56
--- /dev/null
+++ b/http/mod_geoip2/HISTORY
@@ -0,0 +1,2 @@
+2010-08-20 Vlad Glagolev <stealth AT sourcemage.org>
+ * BUILD, DETAILS, DEPENDS, INSTALL: created the spell
diff --git a/http/mod_geoip2/INSTALL b/http/mod_geoip2/INSTALL
new file mode 100755
index 0000000..036c527
--- /dev/null
+++ b/http/mod_geoip2/INSTALL
@@ -0,0 +1 @@
+apxs -i mod_geoip.la
diff --git a/http/xshttpd/CONFLICTS b/http/xshttpd/CONFLICTS
index 3135b31..58b62da 100755
--- a/http/xshttpd/CONFLICTS
+++ b/http/xshttpd/CONFLICTS
@@ -1,6 +1,7 @@
if [[ "$XSHTTPD_USE_PREFIX" != "y" ]]; then
- conflicts apache &&
conflicts apache-mod_ssl &&
+ conflicts apache1 &&
conflicts apache2 &&
- conflicts apache22
+ conflicts apache22 &&
+ conflicts httpd-dev
fi
diff --git a/http/xshttpd/DETAILS b/http/xshttpd/DETAILS
index c995f24..2dbae50 100755
--- a/http/xshttpd/DETAILS
+++ b/http/xshttpd/DETAILS
@@ -1,7 +1,7 @@
SPELL=xshttpd
case $XSHTTPD_BRANCH in
devel)
- VERSION=37b13
+ VERSION=37b16
;;
*)
VERSION=36g01
diff --git a/http/xshttpd/HISTORY b/http/xshttpd/HISTORY
index 7abcbf6..a85f055 100644
--- a/http/xshttpd/HISTORY
+++ b/http/xshttpd/HISTORY
@@ -1,3 +1,7 @@
+2010-08-18 Remko van der Vossen <wich AT sourcemage.org>
+ * DETAILS: devel version 37b16
+ * CONFLICTS: conflicts httpd-dev
+
2010-02-25 Remko van der Vossen <wich AT sourcemage.org>
* DEPENDS: updated ruby dependency to RUBY provider

diff --git a/kernels/linux/HISTORY b/kernels/linux/HISTORY
index 6eedc9a..5679ef6 100644
--- a/kernels/linux/HISTORY
+++ b/kernels/linux/HISTORY
@@ -1,3 +1,7 @@
+2010-08-20 Eric Sandall <sandalle AT sourcemage.org>
+ * latest.defaults: Updated latest to patch-2.6.35.3
+ * info/patches/maintenance_patches/patch-2.6.35.3: Added
+
2010-08-14 Ladislav Hagara <hgr AT vabo.cz>
* latest.defaults: updated latest to patch-2.6.35.2
* info/patches/maintenance_patches/patch-2.6.35.2: added
diff --git a/kernels/linux/info/patches/maintenance_patches/patch-2.6.35.3
b/kernels/linux/info/patches/maintenance_patches/patch-2.6.35.3
new file mode 100755
index 0000000..eed440c
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches/patch-2.6.35.3
@@ -0,0 +1,6 @@
+appliedkernels="2.6.35"
+patchversion="${appliedkernels}.3"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v2.6/${source}"
+source_gpg="kernel.gpg:${source}.sign:ESTABLISHED_UPSTREAM_KEY"
+gpg_source_url="${source_url}.sign"
diff --git a/kernels/linux/latest.defaults b/kernels/linux/latest.defaults
index a6ab130..c411f48 100644
--- a/kernels/linux/latest.defaults
+++ b/kernels/linux/latest.defaults
@@ -1,6 +1,6 @@
LATEST_2_6=2.6.35
LATEST_PRE_2_6=patch-2.6.35
-LATEST_maintenance_patches=patch-2.6.35.2
+LATEST_maintenance_patches=patch-2.6.35.3
LATEST_git_patches=patch-2.6.25-rc6-git7
LATEST_2_4=2.4.37.9
LATEST_PRE_2_4=patch-2.4.33-pre1
diff --git a/libs/boost/DETAILS b/libs/boost/DETAILS
index 04fa835..1d71642 100755
--- a/libs/boost/DETAILS
+++ b/libs/boost/DETAILS
@@ -1,6 +1,6 @@
SPELL=boost
- VERSION=1_43_0
-
SOURCE_HASH=sha512:9c7ae92580466eb276653709063d95daa6ff2c68281ce819ff067ad69252e67ec003c680dbd7bb2a0c6e82e3321cdcdfc881620416220ba9079d5d06488a0e7b
+ VERSION=1_44_0
+
SOURCE_HASH=sha512:62beb70c75a9fdc63fd6b9516ff8f9e9e498ab4942f2c7589a93570b0c5077e6484640830c5ebe08060342098e4f0cdb2626fb520d5cd9ea72e6e1362581f1bd
SOURCE=${SPELL}_${VERSION}.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}_${VERSION}
SOURCE_URL[0]=${SOURCEFORGE_URL}/$SPELL/$SOURCE
diff --git a/libs/boost/HISTORY b/libs/boost/HISTORY
index 4c1a2da..a940a23 100644
--- a/libs/boost/HISTORY
+++ b/libs/boost/HISTORY
@@ -1,3 +1,6 @@
+2010-08-18 Finn Haedicke <finn AT sourcemage.org>
+ * DETAILS: updated spell to 1_44_0
+
2010-06-29 Peng Chang (Charles) <chp AT sourcemage.org>
* DETAILS: updated spell to 1_43_0

diff --git a/libs/glibc/BUILD b/libs/glibc/BUILD
index f23db24..71d430b 100755
--- a/libs/glibc/BUILD
+++ b/libs/glibc/BUILD
@@ -60,9 +60,6 @@ fi &&
export CFLAGS="${CFLAGS/-ffast-math/}" &&
export CC=gcc &&

-# don't strip, so thread debugging works #15017
-export LDFLAGS="${LDFLAGS//-s/}" &&
-
#
# LD_LIBRARY_PATH includes $PWD bug
#
diff --git a/libs/glibc/HISTORY b/libs/glibc/HISTORY
index cdfcf6a..8b172d2 100644
--- a/libs/glibc/HISTORY
+++ b/libs/glibc/HISTORY
@@ -1,6 +1,3 @@
-2010-08-18 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
- * BUILD: disable stripping, so thread debugging works #15017
-
2010-08-06 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.12.1, HEADERS_VERSION=2.6.35, gnu.gpg -> glibc.gpg
* PRE_BUILD, binutils-2.20.patch: removed patch
diff --git a/net/rrdtool/DEPENDS b/net/rrdtool/DEPENDS
index 5f17ef6..6943271 100755
--- a/net/rrdtool/DEPENDS
+++ b/net/rrdtool/DEPENDS
@@ -1,6 +1,7 @@
depends freetype2 &&
depends libxml2 &&
depends libpng &&
+depends intltool &&

if [[ $RRDTOOL_BRANCH == 1.3 ]]; then
depends pango &&
diff --git a/net/rrdtool/HISTORY b/net/rrdtool/HISTORY
index c49595d..0e0a93c 100644
--- a/net/rrdtool/HISTORY
+++ b/net/rrdtool/HISTORY
@@ -1,3 +1,6 @@
+2010-08-20 Mark Bainter <mbainter AT sourcemage.org>
+ * DEPENDS: Added missing dependency on intltool
+
2010-02-25 Remko van der Vossen <wich AT sourcemage.org>
* DEPENDS: updated ruby dependency to RUBY provider

diff --git a/net/whois/DETAILS b/net/whois/DETAILS
index 29549ef..b733957 100755
--- a/net/whois/DETAILS
+++ b/net/whois/DETAILS
@@ -1,9 +1,9 @@
SPELL=whois
- VERSION=5.0.6
+ VERSION=5.0.7
SOURCE=${SPELL}_$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://ftp.debian.org/debian/pool/main/w/whois/$SOURCE
-
SOURCE_HASH=sha512:335597563ce10266828537653fabfc05e0bd7f52663d9760d688ade7f9e24ce4685ff79b20d5d0f38c3eee313c64556c32ed9aa5d34984b23305505cb107c5ff
+
SOURCE_HASH=sha512:f67dab16fd287b34b7ba13d5830d249c24e2b848368de4546c66bad992a62db5ac4b3e224f94e162ada4c60799196106a2b4ba5261bfcf02871f124b94f6eccf
WEB_SITE=http://www.linux.it/~md/software/
ENTERED=20011228
LICENSE[0]=GPL
diff --git a/net/whois/HISTORY b/net/whois/HISTORY
index b392500..f187fa5 100644
--- a/net/whois/HISTORY
+++ b/net/whois/HISTORY
@@ -1,3 +1,6 @@
+2010-08-19 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 5.0.7
+
2010-07-15 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 5.0.6

diff --git a/utils/nss-pam-ldapd/DETAILS b/utils/nss-pam-ldapd/DETAILS
index 82f1cf3..d38db4f 100755
--- a/utils/nss-pam-ldapd/DETAILS
+++ b/utils/nss-pam-ldapd/DETAILS
@@ -1,5 +1,5 @@
SPELL=nss-pam-ldapd
- VERSION=0.7.7
+ VERSION=0.7.8
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
SOURCE_URL[0]=http://arthurdejong.org/$SPELL/$SOURCE
diff --git a/utils/nss-pam-ldapd/HISTORY b/utils/nss-pam-ldapd/HISTORY
index a9a24c4..7720e2d 100644
--- a/utils/nss-pam-ldapd/HISTORY
+++ b/utils/nss-pam-ldapd/HISTORY
@@ -1,3 +1,6 @@
+2010-08-19 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.7.8
+
2010-07-14 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 0.7.7

diff --git a/video/vlc/DETAILS b/video/vlc/DETAILS
index b39169f..ed6f955 100755
--- a/video/vlc/DETAILS
+++ b/video/vlc/DETAILS
@@ -1,5 +1,5 @@
SPELL=vlc
- VERSION=1.1.2
+ VERSION=1.1.3
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE2_IGNORE=signature
@@ -12,7 +12,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
LICENSE[0]=GPL
ENTERED=20011113
KEYWORDS="player video"
- SECURITY_PATCH=12
+ SECURITY_PATCH=13
SHORT="multimedia player"
cat << EOF
VLC (initially VideoLAN Client) is a highly portable multimedia player for
diff --git a/video/vlc/HISTORY b/video/vlc/HISTORY
index 7e15762..92a617f 100644
--- a/video/vlc/HISTORY
+++ b/video/vlc/HISTORY
@@ -1,3 +1,7 @@
+2010-08-19 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.1.3, SECURITY_PATCH=13
+ http://www.videolan.org/security/sa1004.html
+
2010-07-29 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.1.2

diff --git a/x11-libs/cairo/DETAILS b/x11-libs/cairo/DETAILS
index 76c3153..1c338a4 100755
--- a/x11-libs/cairo/DETAILS
+++ b/x11-libs/cairo/DETAILS
@@ -6,8 +6,8 @@ if [[ $CAIRO_DEVEL == y ]]; then
SOURCE_URL[0]=http://cairographics.org/snapshots/$SOURCE
# SOURCE_GPG=gurus.gpg:$SOURCE.sig
else
- VERSION=1.8.10
-
SOURCE_HASH=sha512:1c844f35a8102a8221ec2837ee7e1c72402b91af3f30465b4b2b0e210a62eed40def5839bd8e8dd6733b478ddc95cf6a5ad1c1d0b5e011c55de212f3a171ab40
+ VERSION=1.8.8
+
SOURCE_HASH=sha512:74d94e7239b1b4e3f4db9cc59fa44145838b13ad56e32b7bc165d62c8841f7e4c9b86e52e182b5b2811e6e034cf794fc7478a24828ed0d16f1fa4a9180c50d25
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=http://cairographics.org/releases/$SOURCE
fi
diff --git a/x11-libs/cairo/HISTORY b/x11-libs/cairo/HISTORY
index ab51ff5..1fac668 100644
--- a/x11-libs/cairo/HISTORY
+++ b/x11-libs/cairo/HISTORY
@@ -1,3 +1,11 @@
+2010-08-21 Remko van der Vossen <wich AT sourcemage.org>
+ * DETAILS: reverted stable to 1.8.8, compiles now with patch
+
+2010-08-21 Bor Kraljič <pyrobor AT ver.si>
+ * PRE_BUILD: apply the patch if VERSION is 1.8.8
+ * libpng14.patch: added to compile with libpng 1.4*. Based on
upstream patch:
+
http://cgit.freedesktop.org/cairo/patch/?id=0a5ec9802a39dee240a1a3476af1ef8a7db9b6b3
+
2010-08-17 George Sherwood <gsherwood AT sourcemage.org>
* DETAILS: Updated devel to version 1.9.14
* PRE_SUB_DEPENDS: Added option for devel version
diff --git a/x11-libs/cairo/PRE_BUILD b/x11-libs/cairo/PRE_BUILD
new file mode 100755
index 0000000..a3184fd
--- /dev/null
+++ b/x11-libs/cairo/PRE_BUILD
@@ -0,0 +1,5 @@
+mk_source_dir $SOURCE_DIRECTORY &&
+unpack_file &&
+if [[ $VERSION == "1.8.8" ]]; then
+ patch -p1 -d $SOURCE_DIRECTORY < $SPELL_DIRECTORY/libpng14.patch
+fi
diff --git a/x11-libs/cairo/libpng14.patch b/x11-libs/cairo/libpng14.patch
new file mode 100644
index 0000000..1cd4a3c
--- /dev/null
+++ b/x11-libs/cairo/libpng14.patch
@@ -0,0 +1,12 @@
+diff --git a/configure b/configure
+--- a/configure
++++ b/configure
+@@ -161,7 +161,7 @@ CAIRO_ENABLE_FUNCTIONS(png, PNG, yes, [
+ AC_ARG_VAR([png_REQUIRES], [module name for libpng to search for using
pkg-config])
+ if test "x$png_REQUIRES" = x; then
+ # libpng13 is GnuWin32's libpng-1.2.8 :-(
+- for l in libpng12 libpng13 libpng10 ; do
++ for l in libpng12 libpng13 libpng10 libpng ; do
+ if $PKG_CONFIG --exists $l ; then
+ png_REQUIRES=$l
+ use_png=yes
diff --git a/x11-libs/wine/DETAILS b/x11-libs/wine/DETAILS
index caab161..1092eaa 100755
--- a/x11-libs/wine/DETAILS
+++ b/x11-libs/wine/DETAILS
@@ -12,7 +12,7 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git"
FORCE_DOWNLOAD=1
else
if [[ $WINE_DEVEL == y ]]; then
- VERSION=1.3.0
+ VERSION=1.3.1
else
VERSION=1.2
fi
diff --git a/x11-libs/wine/HISTORY b/x11-libs/wine/HISTORY
index 1f58d48..357db19 100644
--- a/x11-libs/wine/HISTORY
+++ b/x11-libs/wine/HISTORY
@@ -1,3 +1,6 @@
+2010-08-20 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated devel to 1.3.1
+
2010-07-30 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated devel to 1.3.0
* PRE_BUILD: Only apply sc2-bug23556.diff for non-devel,



  • [SM-Commit] GIT changes to devel-libpng grimoire by Remko van der Vossen (061ca2467ae9cbf45de742762a5e047d1c4d3206), Remko van der Vossen, 08/21/2010

Archive powered by MHonArc 2.6.24.

Top of Page