Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-xorg-modular grimoire by Vlad Glagolev (db6739e6d0215ea2cb1dabfd627b215e83493a20)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to devel-xorg-modular grimoire by Vlad Glagolev (db6739e6d0215ea2cb1dabfd627b215e83493a20)
  • Date: Fri, 18 Nov 2011 04:32:51 -0600

GIT changes to devel-xorg-modular grimoire by Vlad Glagolev
<stealth AT sourcemage.org>:

crypto/gnutls/DETAILS | 2
crypto/gnutls/HISTORY | 4
crypto/gnutls/PRE_BUILD | 9 ++
crypto/libsasl/DETAILS | 2
crypto/libsasl/HISTORY | 3
crypto/nss/DETAILS | 8 -
crypto/nss/HISTORY | 3
crypto/p11-kit/DETAILS | 2
crypto/p11-kit/HISTORY | 3
dev/null |binary
disk/testdisk/DETAILS | 4
disk/testdisk/HISTORY | 3
e-17/elation/DEPENDS | 2
e-17/elation/HISTORY | 3
e-17/etk_extra/DEPENDS | 2
e-17/etk_extra/HISTORY | 3
e-17/ewl/DEPENDS | 2
e-17/ewl/HISTORY | 3
e-17/eyelight/DEPENDS | 2
e-17/eyelight/HISTORY | 3
e-17/rage/DEPENDS | 2
e-17/rage/HISTORY | 3
ftp/curl/DETAILS | 2
ftp/curl/HISTORY | 7 +
ftp/curl/PRE_BUILD | 3
ftp/curl/gtls.patch | 14 ---
gnome2-libs/gconf2/DEPENDS | 8 +
gnome2-libs/gconf2/HISTORY | 6 +
graphics/imagemagick/DETAILS | 4
graphics/imagemagick/HISTORY | 3
http/firefox/DETAILS | 6 -
http/firefox/HISTORY | 3
kernels/kvm/BUILD | 1
kernels/kvm/DEPENDS | 2
kernels/kvm/DETAILS | 3
kernels/kvm/HISTORY | 8 +
kernels/kvm/PRE_BUILD | 3
kernels/kvm/archs | 73 ++++++++++-------
kernels/kvm/pci.patch | 61 --------------
kernels/kvm/qemu-kvm-0.14.0.tar.gz.sig | 0
kernels/kvm/qemu-kvm-0.15.1.tar.gz.sig |binary
kernels/ndiswrapper/DETAILS | 6 -
kernels/ndiswrapper/HISTORY | 11 ++
kernels/ndiswrapper/PRE_BUILD | 15 +++
kernels/ndiswrapper/kernel-2.6.35.patch | 98
++++++++++++++++++++++++
kernels/ndiswrapper/kernel-2.6.36.patch | 27 ++++++
kernels/ndiswrapper/kernel-2.6.38.patch | 24 +++++
kernels/ndiswrapper/kernel-3.1.patch | 13 +++
kernels/ndiswrapper/ndiswrapper-1.56.tar.gz.sig |binary
net/ipvsadm/DETAILS | 4
net/ipvsadm/HISTORY | 4
net/ipvsadm/PREPARE | 6 -
net/quagga/CONFLICTS | 2
net/quagga/HISTORY | 3
net/zebra/BUILD | 4
net/zebra/CONFIGURE | 7 -
net/zebra/CONFLICTS | 1
net/zebra/DEPENDS | 5 -
net/zebra/DETAILS | 9 +-
net/zebra/HISTORY | 4
net/zebra/INSTALL | 1
net/zebra/PRE_BUILD | 1
net/zebra/UP_TRIGGERS | 2
python-pypi/python-ssh/DETAILS | 4
python-pypi/python-ssh/HISTORY | 3
security/nikto/DETAILS | 4
security/nikto/HISTORY | 3
utils/grep/DEPENDS | 1
utils/grep/DETAILS | 4
utils/grep/HISTORY | 4
utils/grep/PRE_BUILD | 5 +
utils/ipv6calc/DETAILS | 2
utils/ipv6calc/HISTORY | 3
video-libs/libdvdcss/BUILD | 2
video-libs/libdvdcss/DETAILS | 4
video-libs/libdvdcss/HISTORY | 4
x11-toolkits/gtk+2/DEPENDS | 6 -
x11-toolkits/gtk+2/DETAILS | 7 -
x11-toolkits/gtk+2/HISTORY | 5 +
x11-toolkits/gtk+2/PREPARE | 1
80 files changed, 394 insertions(+), 190 deletions(-)

New commits:
commit 2bc079e1f86cb57f02da1cfbcb70cfdaa170e715
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

python-ssh: => 1.7.10

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

nikto 2.1.4

commit 8abcbc31fe04f01018f0e2d455ce4e2645216e5d
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Sukneet Basuta <sukneet AT sourcemage.org>

ndiswrapper: => 1.56
switched to gpg signing
PRE_BUILD: patch to fix for kernel versions, see below
fix regex to accecpt kernel >=3.0
fix module dir
kernel-2.6.35.patch: added, fix for kernels >=2.6.35
kernel-2.6.36.patch: added, fix for kernels >=2.6.36
kernel-2.6.38.patch: added, fix for kernels >=2.6.36
kernel-3.1.patch: added, fix for kernels >= 3.1

commit 0d2cb6a1f6b26d49e8798aeb95750d11a44ae502
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Sukneet Basuta <sukneet AT sourcemage.org>

gtk+2: removed DEVEL
since new devel happens in GTK+3 now
Did not migrate GTK_VER since it is irrelevent as stable and devel
migrate to the same default version

commit f8964b1b5ff65cce19ae9f4f72f0c26e5892266b
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Sukneet Basuta <sukneet AT sourcemage.org>

kvm: remove unused SOURCE_HASH

commit 1cef4437c6808e98fc3987cda541cd94a4fbdee8
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Sukneet Basuta <sukneet AT sourcemage.org>

kvm: => 0.15.1
DEPENDS: added depend pcituils
BUILD: removed --kerneldir configure option, no longer valid
PRE_BUILD: remove pci.patch, no longer needed
pci.patch: removed
archs: updated with archs list from qemu spel

commit 5e316d0657897a91527158eae28baf83a1e4fcf8
Author: Tommy Boatman <tboatman AT sourcemage.org>
Commit: Tommy Boatman <tboatman AT sourcemage.org>

ipvsadm: version 1.26 (requires kernel 2.6.28-rc3 or later)

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

curl 7.23.1

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

grep 2.10

commit 27fe52de5d25c5d3b6d9daaf589cd9204a03edd0
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

libsasl: => 2.1.25

commit 402f986f1e6ebc0619ee49a1e3892f5d6e5440eb
Author: Tommy Boatman <tboatman AT sourcemage.org>
Commit: Tommy Boatman <tboatman AT sourcemage.org>

zebra: deprecated for quagga

commit d6b97ef6cd59fc0808f5c1128aefa64cf6f95caa
Author: Tommy Boatman <tboatman AT sourcemage.org>
Commit: Tommy Boatman <tboatman AT sourcemage.org>

quagga: added "y" to zebra to force unattended cast

commit 317b22ea892016f127caa65e65ad9147602983e5
Author: Tommy Boatman <tboatman AT sourcemage.org>
Commit: Tommy Boatman <tboatman AT sourcemage.org>

ipv6calc: version 0.92.0

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

testdisk 6.13

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

firefox 8.0.1, SECURITY_PATCH=42

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

nss 3.12.11.with.ckbi.1.88, SECURITY_PATCH=3

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

p11-kit 0.9

commit 64bd23c9d3bc98abbe08104fa36055cef8301f6f
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

libdvdcss: => 1.2.11

commit 58a65402cd396796c9e02b62021feb2a67a7f3ce
Author: Tommy Boatman <tboatman AT sourcemage.org>
Commit: Tommy Boatman <tboatman AT sourcemage.org>

eyelight: changed e-emotion dependency to emotion

commit a9afd66e6db753556837c06651973b19b8b4db07
Author: Tommy Boatman <tboatman AT sourcemage.org>
Commit: Tommy Boatman <tboatman AT sourcemage.org>

rage: change e-emotion dependency to emotion

commit aa4dc2e9fabd80dc4de341bc0aa15e8d7a2869ef
Author: Tommy Boatman <tboatman AT sourcemage.org>
Commit: Tommy Boatman <tboatman AT sourcemage.org>

ewl: changed e-emotion dependency to emotion

commit 70a21204b560e767db14fc49e8155449a9796da0
Author: Tommy Boatman <tboatman AT sourcemage.org>
Commit: Tommy Boatman <tboatman AT sourcemage.org>

etk_extra: changed e-emotion depends to emotion

commit 8c18d9fdbfa8dd1d45eb7ad5c131c9cabc858c7b
Author: Tommy Boatman <tboatman AT sourcemage.org>
Commit: Tommy Boatman <tboatman AT sourcemage.org>

elation: changed e-emotion depend to emotion

commit 58bfead1185bc71a805964e784dc2485ec2f55c0
Author: Tommy Boatman <tboatman AT sourcemage.org>
Commit: Tommy Boatman <tboatman AT sourcemage.org>

gconf2: amended bug id (45) to HISTORY

commit 139dd11c2c9f37df5ba0406b47dbeff33177398e
Author: Tommy Boatman <tboatman AT sourcemage.org>
Commit: Tommy Boatman <tboatman AT sourcemage.org>

gconf2: add gtk+3 as optional in addition to gtk+2

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

curl 7.23.0

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

gnutls 3.0.8

commit 5ed4c29b67735fee998cf6c6d5eaf89282dcb2ae
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

imagemagick: Updated to version 6.7.3-6

diff --git a/crypto/gnutls/DETAILS b/crypto/gnutls/DETAILS
index 9257f0b..ffddb34 100755
--- a/crypto/gnutls/DETAILS
+++ b/crypto/gnutls/DETAILS
@@ -47,7 +47,7 @@ case $GNUTLS_BRANCH in
SOURCE=$SPELL-$VERSION.tar.bz2
;;
3.0)
- VERSION=3.0.7
+ VERSION=3.0.8
SOURCE=$SPELL-$VERSION.tar.xz
;;
esac
diff --git a/crypto/gnutls/HISTORY b/crypto/gnutls/HISTORY
index 2b80f10..549cfb8 100644
--- a/crypto/gnutls/HISTORY
+++ b/crypto/gnutls/HISTORY
@@ -1,3 +1,7 @@
+2011-11-15 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 3.0.8
+ * PRE_BUILD: added to process tar.xz
+
2011-11-08 Sukneet Basuta <sukneet AT sourcemage.org>
* DETAILS: updated GNUTLS_BRANCH=3.0 to 3.0.7
updated GNUTLS_BRANCH=2.12 to 2.12.14
diff --git a/crypto/gnutls/PRE_BUILD b/crypto/gnutls/PRE_BUILD
new file mode 100755
index 0000000..9f6c705
--- /dev/null
+++ b/crypto/gnutls/PRE_BUILD
@@ -0,0 +1,9 @@
+if [ "$GNUTLS_BRANCH" == "3.0" ]; then
+ mk_source_dir $SOURCE_DIRECTORY &&
+ cd $BUILD_DIRECTORY &&
+ verify_file '' &&
+ xz -dc $SOURCE_CACHE/$SOURCE | tar -xf -
+ cd $SOURCE_DIRECTORY
+else
+ default_pre_build
+fi
diff --git a/crypto/libsasl/DETAILS b/crypto/libsasl/DETAILS
index 72f3bfa..40532b1 100755
--- a/crypto/libsasl/DETAILS
+++ b/crypto/libsasl/DETAILS
@@ -1,5 +1,5 @@
SPELL=libsasl
- VERSION=2.1.23
+ VERSION=2.1.25
SOURCE=cyrus-sasl-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY=$BUILD_DIRECTORY/cyrus-sasl-$VERSION
diff --git a/crypto/libsasl/HISTORY b/crypto/libsasl/HISTORY
index 1857855..717651c 100644
--- a/crypto/libsasl/HISTORY
+++ b/crypto/libsasl/HISTORY
@@ -1,3 +1,6 @@
+2011-11-17 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: 2.1.25
+
2011-10-14 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: fixed long description wrap (scripted)

diff --git a/crypto/nss/DETAILS b/crypto/nss/DETAILS
index d2d8bdd..1eeb8fa 100755
--- a/crypto/nss/DETAILS
+++ b/crypto/nss/DETAILS
@@ -14,13 +14,13 @@ case $NSS_BRANCH in
;;
3.12)
VERSION=3.12.11
- SECURITY_PATCH=2
+ SECURITY_PATCH=3
# FFVERSION=3.6.2
# SOURCE=$SPELL-$VERSION.tar.gz
- SOURCE=nss-3.12.11.with.ckbi.1.87.tar.gz
+ SOURCE=nss-3.12.11.with.ckbi.1.88.tar.gz
#
SOURCE_URL[0]=http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_${VERSION//./_}_RTM/src/$SOURCE
-
SOURCE_URL[0]=http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_12_11_WITH_CKBI_1_87_RTM/src/$SOURCE
-
SOURCE_HASH=sha512:549c3a0abec18bfe53e082d24bfa641034e186a1c77e07b1244675694a423189075db9e47fd89d535dd7170ead049023948d3b645dee10d4f9a88c54251edb75
+
SOURCE_URL[0]=http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_12_11_WITH_CKBI_1_88_RTM/src/$SOURCE
+
SOURCE_HASH=sha512:19601383313fe6457b1af03161a9902811a77715e8a9a04ec4e70fd8e9685b3883497b7a8c5f877728fea2144c3e14c0d811f13fe1cd39dccd95feb60d3eb57f
# SOURCE=firefox-$FFVERSION.source.tar.bz2
# SOURCE2=$SOURCE.asc
# SOURCE2_IGNORE=signature
diff --git a/crypto/nss/HISTORY b/crypto/nss/HISTORY
index 14b7530..7855a77 100644
--- a/crypto/nss/HISTORY
+++ b/crypto/nss/HISTORY
@@ -1,3 +1,6 @@
+2011-11-16 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 3.12.11.with.ckbi.1.88, SECURITY_PATCH=3
+
2011-09-03 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 3.12.11.with.ckbi.1.87, SECURITY_PATCH=2

diff --git a/crypto/p11-kit/DETAILS b/crypto/p11-kit/DETAILS
index 9069b62..8ff82cc 100755
--- a/crypto/p11-kit/DETAILS
+++ b/crypto/p11-kit/DETAILS
@@ -1,5 +1,5 @@
SPELL=p11-kit
- VERSION=0.7
+ VERSION=0.9
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
SOURCE_GPG=D92765AF.gpg:$SOURCE2:UPSTREAM_KEY
diff --git a/crypto/p11-kit/HISTORY b/crypto/p11-kit/HISTORY
index 8c59c96..65c9176 100644
--- a/crypto/p11-kit/HISTORY
+++ b/crypto/p11-kit/HISTORY
@@ -1,3 +1,6 @@
+2011-11-16 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.9
+
2011-10-07 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.7

diff --git a/disk/testdisk/DETAILS b/disk/testdisk/DETAILS
index 14371ef..ae76486 100755
--- a/disk/testdisk/DETAILS
+++ b/disk/testdisk/DETAILS
@@ -1,9 +1,9 @@
SPELL=testdisk
- VERSION=6.12
+ VERSION=6.13
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.cgsecurity.org/$SOURCE
-
SOURCE_HASH=sha512:5cd17d1ad851515dcd1f3ef5dfb7435aff2f89e2b0467e84552809d203688a47731e23a602dc10355861414eb2d8c6b9edd48225ccc6229ab59810803a59da4c
+
SOURCE_HASH=sha512:30889b8afed5b0fac93ce028e8c95bfa3e14b72d39cc4f86659edcce0b8820c5ce0c2b7e1d09f23f0da977b5d1cb275551069a87b109d05538e63e9b76200442
WEB_SITE=http://www.cgsecurity.org/wiki/TestDisk
LICENSE[0]=GPL
ENTERED=20060916
diff --git a/disk/testdisk/HISTORY b/disk/testdisk/HISTORY
index 4c0f9c7..9b65203 100644
--- a/disk/testdisk/HISTORY
+++ b/disk/testdisk/HISTORY
@@ -1,3 +1,6 @@
+2011-11-16 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 6.13
+
2011-05-21 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 6.12

diff --git a/e-17/elation/DEPENDS b/e-17/elation/DEPENDS
index 1396939..469c25a 100755
--- a/e-17/elation/DEPENDS
+++ b/e-17/elation/DEPENDS
@@ -1,2 +1,2 @@
-depends e-emotion &&
+depends emotion &&
depends subversion
diff --git a/e-17/elation/HISTORY b/e-17/elation/HISTORY
index ce1adb6..5b3c017 100644
--- a/e-17/elation/HISTORY
+++ b/e-17/elation/HISTORY
@@ -1,3 +1,6 @@
+2011-11-15 Tommy Boatman <tboatman AT sourcemage.org>
+ * DEPENDS: switched e-emotion to emotion
+
2011-01-02 Ismael Luceno <ismael AT sourcemage.org>
* elation.desktop: add spanish comment and generic name

diff --git a/e-17/etk_extra/DEPENDS b/e-17/etk_extra/DEPENDS
index b3c0eec..e2646ad 100755
--- a/e-17/etk_extra/DEPENDS
+++ b/e-17/etk_extra/DEPENDS
@@ -5,7 +5,7 @@ depends edje &&
depends etk &&
depends evas &&

-optional_depends e-emotion \
+optional_depends emotion \
'' \
'' \
'for Video widgets based on E17 Emotion' &&
diff --git a/e-17/etk_extra/HISTORY b/e-17/etk_extra/HISTORY
index 318ab78..1e25eb1 100644
--- a/e-17/etk_extra/HISTORY
+++ b/e-17/etk_extra/HISTORY
@@ -1,3 +1,6 @@
+2011-11-15 Tommy Boatman <tboatman AT sourcemage.org>
+ * DEPENDS: Changed e-emotion to emotion
+
2010-10-30 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: fixed SOURCE_URL

diff --git a/e-17/ewl/DEPENDS b/e-17/ewl/DEPENDS
index e2f879b..d8048ac 100755
--- a/e-17/ewl/DEPENDS
+++ b/e-17/ewl/DEPENDS
@@ -5,7 +5,7 @@ depends edje
&&
depends evas &&
depends efreet &&

-optional_depends e-emotion \
+optional_depends emotion \
'' \
'' \
"emotion support for video/audio media widgets" &&
diff --git a/e-17/ewl/HISTORY b/e-17/ewl/HISTORY
index 1eee648..5003b92 100644
--- a/e-17/ewl/HISTORY
+++ b/e-17/ewl/HISTORY
@@ -1,3 +1,6 @@
+2011-11-15 Tommy Boatman <tboatman AT sourcemage.org>
+ * DEPENDS: changed e-emotion to emotion
+
2011-09-22 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS, PREPARE: Use prepare_select_branch

diff --git a/e-17/eyelight/DEPENDS b/e-17/eyelight/DEPENDS
index 833d55b..70a9f63 100755
--- a/e-17/eyelight/DEPENDS
+++ b/e-17/eyelight/DEPENDS
@@ -1,4 +1,4 @@
depends subversion &&
depends ecore &&
-depends e-emotion &&
+depends emotion &&
depends libpng
diff --git a/e-17/eyelight/HISTORY b/e-17/eyelight/HISTORY
index 31cf97b..667a84e 100644
--- a/e-17/eyelight/HISTORY
+++ b/e-17/eyelight/HISTORY
@@ -1,3 +1,6 @@
+2011-11-15 Tommy Boatman <tboatman AT sourcemage.org>
+ * DEPENDS: changed e-emotion to emotion
+
2011-10-14 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: fixed long description wrap (scripted)

diff --git a/e-17/rage/DEPENDS b/e-17/rage/DEPENDS
index b50e01b..82e4f21 100755
--- a/e-17/rage/DEPENDS
+++ b/e-17/rage/DEPENDS
@@ -2,5 +2,5 @@ depends eet &&
depends evas &&
depends edje &&
depends ecore &&
-depends e-emotion &&
+depends emotion &&
depends subversion
diff --git a/e-17/rage/HISTORY b/e-17/rage/HISTORY
index c7df983..6e31374 100644
--- a/e-17/rage/HISTORY
+++ b/e-17/rage/HISTORY
@@ -1,3 +1,6 @@
+2011-11-15 Tommy Boatman <tboatman AT sourcemage.org>
+ * DETAILS: changed e-emotion to emotion
+
2008-09-19 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: CVS -> SVN
Remove unneeded modification of SPELL for SOURCE_URL
diff --git a/ftp/curl/DETAILS b/ftp/curl/DETAILS
index 9b5fc52..6f1f343 100755
--- a/ftp/curl/DETAILS
+++ b/ftp/curl/DETAILS
@@ -1,5 +1,5 @@
SPELL=curl
- VERSION=7.22.0
+ VERSION=7.23.1
SECURITY_PATCH=8
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.asc
diff --git a/ftp/curl/HISTORY b/ftp/curl/HISTORY
index b4c9025..04b3811 100644
--- a/ftp/curl/HISTORY
+++ b/ftp/curl/HISTORY
@@ -1,3 +1,10 @@
+2011-11-18 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 7.23.1
+
+2011-11-16 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 7.23.0
+ * PRE_BUILD, gtls.patch: patch removed, fixed upstream
+
2011-10-19 Treeve Jelbert <treeve AT sourcemage.org>
* PRE_BUILD, gtls.patch: add upstream path for gnutls-3.x

diff --git a/ftp/curl/PRE_BUILD b/ftp/curl/PRE_BUILD
deleted file mode 100755
index 2b3766c..0000000
--- a/ftp/curl/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-patch -p1 < $SPELL_DIRECTORY/gtls.patch
diff --git a/ftp/curl/gtls.patch b/ftp/curl/gtls.patch
deleted file mode 100644
index 3fa097d..0000000
--- a/ftp/curl/gtls.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/lib/gtls.c
-+++ b/lib/gtls.c
-@@ -476,8 +476,10 @@ gtls_connect_step1(struct connectdata *conn,
- gnutls_transport_set_push_function(session, Curl_gtls_push);
- gnutls_transport_set_pull_function(session, Curl_gtls_pull);
-
-+#if GNUTLS_VERSION_NUMBER < 0x020c00
- /* lowat must be set to zero when using custom push and pull functions. */
- gnutls_transport_set_lowat(session, 0);
-+#endif
-
- /* This might be a reconnect, so we check for a session ID in the cache
- to speed up things */
-
diff --git a/gnome2-libs/gconf2/DEPENDS b/gnome2-libs/gconf2/DEPENDS
index 2ebdee6..f98ea7a 100755
--- a/gnome2-libs/gconf2/DEPENDS
+++ b/gnome2-libs/gconf2/DEPENDS
@@ -22,4 +22,10 @@ optional_depends gtk-doc \
optional_depends gtk+2 \
"--enable-gtk --with-gtk=2.0" \
"--disable-gtk" \
- "for GConf sanity checker"
+ "for GConf sanity checker (gtk+2)" &&
+
+optional_depends gtk+3 \
+ "--enable-gtk --with-gtk=3.0" \
+ "" \
+ "for GConf sanity checker (gtk+3)"
+
diff --git a/gnome2-libs/gconf2/HISTORY b/gnome2-libs/gconf2/HISTORY
index 4b139c4..d63ba31 100644
--- a/gnome2-libs/gconf2/HISTORY
+++ b/gnome2-libs/gconf2/HISTORY
@@ -1,3 +1,9 @@
+2011-11-15 Tommy Boatman <tboatman AT sourcemage.org>
+ * DEPENDS: Added gtk+3 optional. Bug #45
+ Note: If gtk+2 is disabled and gtk+3 is enabled, the
+ --disable-gtk is overridden, but the opposite would not
+ be true, so the no on gtk+3 does not include --disable-gtk
+
2011-11-04 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 3.2.3

diff --git a/graphics/imagemagick/DETAILS b/graphics/imagemagick/DETAILS
index d0f0069..1864b07 100755
--- a/graphics/imagemagick/DETAILS
+++ b/graphics/imagemagick/DETAILS
@@ -1,5 +1,5 @@
SPELL=imagemagick
- VERSION=6.7.2-9
+ VERSION=6.7.3-6
SECURITY_PATCH=1
SOURCE=ImageMagick-${VERSION}.tar.bz2
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/ImageMagick-${VERSION}
@@ -8,7 +8,7 @@ SOURCE_DIRECTORY=${BUILD_DIRECTORY}/ImageMagick-${VERSION}
SOURCE_URL[2]=ftp://ftp.nluug.nl/pub/ImageMagick/$SOURCE
SOURCE_URL[3]=http://image_magick.veidrodis.com/image_magick/$SOURCE
# SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
-
SOURCE_HASH=sha512:fedd8552a70d576480ed79aa304c4a42d99ab7cba1027009f25fcb833acb16192ca5c562673085de59720d62b78d2330a31b3c24b55e0af43d75a571ce93ca51
+
SOURCE_HASH=sha512:3b507b4aed64d006b31711edb8388e352385d3bbec3e5d7aef08055b49af0981202ba4f21060e6b4e7fa03289620b6a3c8b9501b34d9c915bcfb2b4c845054a0
CCACHE="off"
WEB_SITE=http://www.imagemagick.org/
ENTERED=20010922
diff --git a/graphics/imagemagick/HISTORY b/graphics/imagemagick/HISTORY
index a2315eb..bbdae2d 100644
--- a/graphics/imagemagick/HISTORY
+++ b/graphics/imagemagick/HISTORY
@@ -1,3 +1,6 @@
+2011-11-15 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated to version 6.7.3-6
+
2011-09-26 George Sherwood <gsherwood AT sourcemage.org>
* DETAILS: Updated to version 6.7.2-9

diff --git a/http/firefox/DETAILS b/http/firefox/DETAILS
index 1b33e96..fdf5ca4 100755
--- a/http/firefox/DETAILS
+++ b/http/firefox/DETAILS
@@ -1,20 +1,20 @@
SPELL=firefox
if [[ $FIREFOX_CVS == y ]]; then
- VERSION=8.0
+ VERSION=8.0.1
SOURCE=$SPELL-$VERSION.source.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_GPG=firefox.gpg:$SOURCE2:UPSTREAM_KEY

SOURCE_URL[0]=ftp://ftp.mozilla.org/pub/$SPELL/releases/$VERSION/source/$SOURCE
SOURCE2_URL[0]=$SOURCE_URL.asc
else
- VERSION=8.0
+ VERSION=8.0.1
SOURCE=$SPELL-$VERSION.source.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_GPG=firefox.gpg:$SOURCE2:UPSTREAM_KEY

SOURCE_URL[0]=ftp://ftp.mozilla.org/pub/$SPELL/releases/$VERSION/source/$SOURCE

SOURCE_URL[1]=ftp://ftp.in2p3.fr/pub/mozilla/$SPELL/releases/$VERSION/source/$SOURCE
SOURCE2_URL[0]=$SOURCE_URL.asc
- SECURITY_PATCH=41
+ SECURITY_PATCH=42
fi
SOURCE2_IGNORE=signature
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index fbb145a..7236849 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,6 @@
+2011-11-16 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 8.0.1, SECURITY_PATCH=42
+
2011-11-07 Sukneet Basuta <sukneet AT sourcemage.org>
* DETAILS: updated spell to 8.0
removed SOURCE_URL[1], dead
diff --git a/kernels/kvm/BUILD b/kernels/kvm/BUILD
index f5a155f..21b18db 100755
--- a/kernels/kvm/BUILD
+++ b/kernels/kvm/BUILD
@@ -4,7 +4,6 @@ message "Target list: $KVM_ARCHS" &&
--sysconfdir=${INSTALL_ROOT}/etc \
--extra-cflags="${CFLAGS}" \
--extra-ldflags="${LDFLAGS}" \
- --kerneldir="/lib/modules/$(get_kernel_version)/build" \
--disable-werror \
--disable-xen \
--target-list="$KVM_ARCHS" \
diff --git a/kernels/kvm/DEPENDS b/kernels/kvm/DEPENDS
index 939a72b..2956a7c 100755
--- a/kernels/kvm/DEPENDS
+++ b/kernels/kvm/DEPENDS
@@ -1,3 +1,5 @@
+depends pciutils &&
+
optional_depends sdl \
'' \
'--disable-sdl' \
diff --git a/kernels/kvm/DETAILS b/kernels/kvm/DETAILS
index d737908..9e09ccc 100755
--- a/kernels/kvm/DETAILS
+++ b/kernels/kvm/DETAILS
@@ -1,9 +1,8 @@
SPELL=kvm
- VERSION=0.14.0
+ VERSION=0.15.1
SOURCE=qemu-${SPELL}-${VERSION}.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/qemu-${SPELL}-${VERSION}
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-#
SOURCE_HASH=sha512:25cf2bd1c4ad1c1c01d6202ab61fbe2cc5ab48cb43e1bb7e04c47d1840f564cba613f6653ea7b517ddb86489796718bbf3b6587316e1f267bbb63bcd7307003e
SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
LICENSE[0]=GPL
SECURITY_PATCH=1
diff --git a/kernels/kvm/HISTORY b/kernels/kvm/HISTORY
index c1e74c1..a0798b8 100644
--- a/kernels/kvm/HISTORY
+++ b/kernels/kvm/HISTORY
@@ -1,3 +1,11 @@
+2011-11-17 Sukneet Basuta <sukneet AT sourcemage.org>
+ * DETAILS: updated spell to 0.15.1
+ * DEPENDS: added depend pcituils
+ * BUILD: removed --kerneldir configure option, no longer valid
+ * PRE_BUILD: remove pci.patch, no longer needed
+ * pci.patch: removed
+ * archs: updated with archs list from qemu spell
+
2011-09-05 Bor Kraljič <pyrobor AT ver.si>
* BUILD: install config files in /etc

diff --git a/kernels/kvm/PRE_BUILD b/kernels/kvm/PRE_BUILD
index 54f3f27..bb7310f 100755
--- a/kernels/kvm/PRE_BUILD
+++ b/kernels/kvm/PRE_BUILD
@@ -12,5 +12,4 @@ if [[ "$KVM_DIAGTOOLS" == "y" ]]; then
return 1
fi
fi &&
-default_pre_build &&
-patch -p1 -d $SOURCE_DIRECTORY < $SPELL_DIRECTORY/pci.patch
+default_pre_build #&&
diff --git a/kernels/kvm/archs b/kernels/kvm/archs
index 4d0eb1f..a062278 100644
--- a/kernels/kvm/archs
+++ b/kernels/kvm/archs
@@ -1,32 +1,41 @@
-alpha-linux-user alpha on
-i386-linux-user i386 on
-arm-linux-user arm on
-armeb-linux-user armeb on
-cris-linux-user cris on
-m68k-linux-user m68k on
-mips-linux-user mips on
-mipsel-linux-user mipsel on
-ppc-linux-user ppc on
-ppc64-linux-user ppc64 on
-ppc64abi32-linux-user ppc64abi32 on
-sparc-linux-user sparc on
-sparc32plus-linux-user sparc32plus on
-sparc64-linux-user sparc64 on
-sh4-linux-user sh4 on
-sh4eb-linux-user sh4eb on
-x86_64-linux-user x86_64 on
-i386-softmmu i386-sofmmu on
-ppc-softmmu ppc-softmmu on
-ppcemb-softmmu ppcemb-softmmu on
-ppc64-softmmu ppc64-softmmu on
-sparc-softmmu sparc-softmmu on
-x86_64-softmmu x86_64-softmmu on
-mips-softmmu mips-softmmu on
-mipsel-softmmu mipsel-softmmu on
-mips64-softmmu mips64-softmmu on
-mips64el-softmmu mips64el-softmmu on
-arm-softmmu arm-softmmu on
-m68k-softmmu m68k-softmmu on
-cris-softmmu cris-softmmu on
-sh4-softmmu sh4-softmmu on
-sh4eb-softmmu sh4eb-softmmu on
+alpha-linux-user alpha on
+armeb-linux-user armeb on
+arm-linux-user arm on
+cris-linux-user cris on
+i386-linux-user i386 on
+m68k-linux-user m68k on
+microblazeel-linux-user microblazeel on
+microblaze-linux-user microblaze on
+mipsel-linux-user mipsel on
+mips-linux-user mips on
+ppc64abi32-linux-user ppc64abi32 on
+ppc64-linux-user ppc64 on
+ppc-linux-user ppc on
+s390x-linux-user s390x on
+sh4eb-linux-user sh4eb on
+sh4-linux-user sh4 on
+sparc32plus-linux-user sparc32plus on
+sparc64-linux-user sparc64 on
+sparc-linux-user sparc on
+unicore32-linux-user unicore32 on
+x86_64-linux-user x86_64 on
+arm-softmmu arm-softmmu on
+cris-softmmu cris-softmmu on
+i386-softmmu i386-softmmu on
+lm32-softmmu lm32-softmmu on
+m68k-softmmu m68k-softmmu on
+microblazeel-softmmu microblazeel-softmmu on
+microblaze-softmmu microblaze-softmmu on
+mips64el-softmmu mips64el-softmmu on
+mips64-softmmu mips64-softmmu on
+mipsel-softmmu mipsel-softmmu on
+mips-softmmu mips-softmmu on
+ppc64-softmmu ppc64-softmmu on
+ppcemb-softmmu ppcemb-softmmu on
+ppc-softmmu ppc-softmmu on
+s390x-softmmu s390x-softmmu on
+sh4eb-softmmu sh4eb-softmmu on
+sh4-softmmu sh4-softmmu on
+sparc64-softmmu sparc64-softmmu on
+sparc-softmmu sparc-softmmu on
+x86_64-softmmu x86_64-softmmu on
diff --git a/kernels/kvm/pci.patch b/kernels/kvm/pci.patch
deleted file mode 100644
index 9e897a7..0000000
--- a/kernels/kvm/pci.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From ac360f5441282f0bd1061654776bb11a2db91a5b Mon Sep 17 00:00:00 2001
-From: Jan Kiszka <jan.kiszka AT siemens.com>
-Date: Wed, 23 Feb 2011 09:28:53 +0100
-Subject: [PATCH] qemu-kvm: Fix non-PCI target build
-
-Replace obsolete qemu-kvm.h with kvm.h in pci.c and build that module
-just like upstream does. This fixes non-x86 targets which have no PCI
-support.
-
-Signed-off-by: Jan Kiszka <jan.kiszka AT siemens.com>
-Signed-off-by: Avi Kivity <avi AT redhat.com>
-(cherry picked from commit cf3a3feb8d6309a5c79277fc084d7785729b7262)
----
- Makefile.objs | 2 +-
- Makefile.target | 2 +-
- hw/pci.c | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/Makefile.objs b/Makefile.objs
-index a647c45..37dea57 100644
---- a/Makefile.objs
-+++ b/Makefile.objs
-@@ -170,7 +170,7 @@ hw-obj-y =
- hw-obj-y += loader.o
- hw-obj-$(CONFIG_VIRTIO) += virtio.o virtio-console.o
- hw-obj-y += fw_cfg.o
--hw-obj-$(CONFIG_PCI) += pci_bridge.o
-+hw-obj-$(CONFIG_PCI) += pci.o pci_bridge.o
- hw-obj-$(CONFIG_PCI) += msix.o msi.o
- hw-obj-$(CONFIG_PCI) += pci_host.o pcie_host.o
- hw-obj-$(CONFIG_PCI) += ioh3420.o xio3130_upstream.o xio3130_downstream.o
-diff --git a/Makefile.target b/Makefile.target
-index 9680cc4..e3caa53 100644
---- a/Makefile.target
-+++ b/Makefile.target
-@@ -195,7 +195,7 @@ endif #CONFIG_BSD_USER
- # System emulator target
- ifdef CONFIG_SOFTMMU
-
--obj-y = arch_init.o cpus.o monitor.o pci.o machine.o gdbstub.o vl.o
balloon.o
-+obj-y = arch_init.o cpus.o monitor.o machine.o gdbstub.o vl.o balloon.o
- # virtio has to be here due to weird dependency between PCI and virtio-net.
- # need to fix this properly
- obj-$(CONFIG_NO_PCI) += pci-stub.o
-diff --git a/hw/pci.c b/hw/pci.c
-index 7792aa9..2f4a0fa 100644
---- a/hw/pci.c
-+++ b/hw/pci.c
-@@ -29,8 +29,8 @@
- #include "net.h"
- #include "sysemu.h"
- #include "loader.h"
--#include "qemu-kvm.h"
- #include "hw/pc.h"
-+#include "kvm.h"
- #include "device-assignment.h"
- #include "qemu-objects.h"
- #include "range.h"
---
-1.7.4.1
-
diff --git a/kernels/kvm/qemu-kvm-0.14.0.tar.gz.sig
b/kernels/kvm/qemu-kvm-0.14.0.tar.gz.sig
deleted file mode 100644
index 2948adc..0000000
Binary files a/kernels/kvm/qemu-kvm-0.14.0.tar.gz.sig and /dev/null differ
diff --git a/kernels/kvm/qemu-kvm-0.15.1.tar.gz.sig
b/kernels/kvm/qemu-kvm-0.15.1.tar.gz.sig
new file mode 100644
index 0000000..a5808bc
Binary files /dev/null and b/kernels/kvm/qemu-kvm-0.15.1.tar.gz.sig differ
diff --git a/kernels/ndiswrapper/DETAILS b/kernels/ndiswrapper/DETAILS
index ac6e74b..84b0553 100755
--- a/kernels/ndiswrapper/DETAILS
+++ b/kernels/ndiswrapper/DETAILS
@@ -11,17 +11,15 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-svn/$SPELL

SOURCE_URL[0]=svn://ndiswrapper.svn.sourceforge.net/svnroot/ndiswrapper/trunk:ndiswrapper
SOURCE_IGNORE=volatile
else
- VERSION=1.54
+ VERSION=1.56
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:cab670df160b4ad89ad7a21a56d552a43868c8a87f44fbd97a1524d60dd2736342371dcdd6fffbf9043043b644c3a5df4602f1f60074e2c6f97342a13db40b6a
-# SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
+ SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
fi
WEB_SITE=http://$SPELL.sf.net/
KEYWORDS="ndis driver"
ENTERED=20040417
- PATCHLEVEL=1
SHORT='Kernel module to load NDIS (W%nd&ws network driver API)
drivers'
cat << EOF
Some vendors refuse to release specs or even a binary linux-driver for their
diff --git a/kernels/ndiswrapper/HISTORY b/kernels/ndiswrapper/HISTORY
index 7c18419..54dbedc 100644
--- a/kernels/ndiswrapper/HISTORY
+++ b/kernels/ndiswrapper/HISTORY
@@ -1,3 +1,14 @@
+2011-11-18 Sukneet Basuta <sukneet AT sourcemage.org>
+ * DETAILS: updated spell to 1.56
+ switched to gpg signing
+ * PRE_BUILD: patch to fix for kernel versions, see below
+ fix regex to accecpt kernel >=3.0
+ fix module dir
+ * kernel-2.6.35.patch: added, fix for kernels >=2.6.35
+ * kernel-2.6.36.patch: added, fix for kernels >=2.6.36
+ * kernel-2.6.38.patch: added, fix for kernels >=2.6.36
+ * kernel-3.1.patch: added, fix for kernels >= 3.1
+
2011-10-14 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: fixed long description wrap (scripted)

diff --git a/kernels/ndiswrapper/PRE_BUILD b/kernels/ndiswrapper/PRE_BUILD
index 1ec2ffd..52d4d1f 100755
--- a/kernels/ndiswrapper/PRE_BUILD
+++ b/kernels/ndiswrapper/PRE_BUILD
@@ -1,2 +1,15 @@
[[ "$$NDIS_SVN" == "y" ]] && mkdir $BUILD_DIRECTORY/ndiswrapper-svn
-default_pre_build
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+
+# following is taken from ArchLinux
+patch -p1 < $SPELL_DIRECTORY/kernel-2.6.35.patch &&
+patch -p1 < $SPELL_DIRECTORY/kernel-2.6.36.patch &&
+patch -p2 < $SPELL_DIRECTORY/kernel-2.6.38.patch &&
+patch -p1 < $SPELL_DIRECTORY/kernel-3.1.patch &&
+
+# fix regex to accept kernel version 3.x
+sed -i "/uname/s/\/.*\//\/(\\\d+)\\\.(\\\d+)\//" utils/ndiswrapper &&
+
+# fix module dir
+sed -i "s|misc|kernel/drivers/net/wireless/$pkgname|" driver/Makefile
diff --git a/kernels/ndiswrapper/kernel-2.6.35.patch
b/kernels/ndiswrapper/kernel-2.6.35.patch
new file mode 100644
index 0000000..1cfdab2
--- /dev/null
+++ b/kernels/ndiswrapper/kernel-2.6.35.patch
@@ -0,0 +1,98 @@
+diff -uNr ndiswrapper-1.56.old/driver/usb.c ndiswrapper-1.56/driver/usb.c
+--- ndiswrapper-1.56.old/driver/usb.c 2010-02-10 18:09:32.000000000 -0800
++++ ndiswrapper-1.56/driver/usb.c 2010-07-25 02:29:25.442145846 -0700
+@@ -191,9 +191,15 @@
+ if (wrap_urb->flags & WRAP_URB_COPY_BUFFER) {
+ USBTRACE("freeing DMA buffer for URB: %p %p",
+ urb, urb->transfer_buffer);
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 35)
+ usb_buffer_free(IRP_WRAP_DEVICE(irp)->usb.udev,
++ urb->transfer_buffer_length,
++ urb->transfer_buffer, urb->transfer_dma);
++#else
++ usb_free_coherent(IRP_WRAP_DEVICE(irp)->usb.udev,
+ urb->transfer_buffer_length,
+ urb->transfer_buffer, urb->transfer_dma);
++#endif
+ }
+ if (urb->setup_packet)
+ kfree(urb->setup_packet);
+@@ -303,9 +309,16 @@
+ || PageHighMem(virt_to_page(buf))
+ #endif
+ )) {
++
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 35)
+ urb->transfer_buffer =
+- usb_buffer_alloc(wd->usb.udev, buf_len, alloc_flags,
++ usb_buffer_alloc(wd->usb.udev, buf_len, alloc_flags,
++ &urb->transfer_dma);
++#else
++ urb->transfer_buffer =
++ usb_alloc_coherent(wd->usb.udev, buf_len, alloc_flags,
+ &urb->transfer_dma);
++#endif
+ if (!urb->transfer_buffer) {
+ WARNING("couldn't allocate dma buf");
+ IoAcquireCancelSpinLock(&irp->cancel_irql);
+diff -uNr ndiswrapper-1.56.old/driver/wrapndis.c
ndiswrapper-1.56/driver/wrapndis.c
+--- ndiswrapper-1.56.old/driver/wrapndis.c 2010-02-10 18:09:32.000000000
-0800
++++ ndiswrapper-1.56/driver/wrapndis.c 2010-07-25 02:06:13.184631757 -0700
+@@ -936,6 +936,10 @@
+ EXIT2(return);
+ }
+
++#ifndef netdev_mc_count
++#define netdev_mc_count(net_dev) net_dev->mc_count
++#endif
++
+ static void set_multicast_list(struct ndis_device *wnd)
+ {
+ struct net_device *net_dev;
+@@ -950,20 +954,26 @@
+ packet_filter |= NDIS_PACKET_TYPE_PROMISCUOUS |
+ NDIS_PACKET_TYPE_ALL_LOCAL;
+ } else if (net_dev->flags & IFF_ALLMULTI ||
+- net_dev->mc_count > wnd->multicast_size) {
++ netdev_mc_count(net_dev) > wnd->multicast_size) {
+ packet_filter |= NDIS_PACKET_TYPE_ALL_MULTICAST;
+ TRACE2("0x%08x", packet_filter);
+- } else if (net_dev->mc_count > 0) {
++ } else if (netdev_mc_count(net_dev) > 0) {
+ int i, size;
+ char *buf;
++#ifndef netdev_for_each_mc_addr
+ struct dev_mc_list *mclist;
+- size = min(wnd->multicast_size, net_dev->mc_count);
+- TRACE2("%d, %d", wnd->multicast_size, net_dev->mc_count);
++#else
++ struct netdev_hw_addr *mclist;
++#endif
++
++ size = min(wnd->multicast_size, netdev_mc_count(net_dev));
++ TRACE2("%d, %d", wnd->multicast_size,
netdev_mc_count(net_dev));
+ buf = kmalloc(size * ETH_ALEN, GFP_KERNEL);
+ if (!buf) {
+ WARNING("couldn't allocate memory");
+ EXIT2(return);
+ }
++#ifndef netdev_for_each_mc_addr
+ mclist = net_dev->mc_list;
+ for (i = 0; i < size && mclist; mclist = mclist->next) {
+ if (mclist->dmi_addrlen != ETH_ALEN)
+@@ -972,6 +982,15 @@
+ TRACE2(MACSTRSEP, MAC2STR(mclist->dmi_addr));
+ i++;
+ }
++#else
++ i = 0;
++ netdev_for_each_mc_addr(mclist, net_dev){
++ memcpy(buf + i++ * ETH_ALEN,
++ mclist->addr, ETH_ALEN);
++ TRACE2(MACSTRSEP, MAC2STR(mclist->addr));
++
++ }
++#endif
+ res = mp_set(wnd, OID_802_3_MULTICAST_LIST, buf, i *
ETH_ALEN);
+ if (res == NDIS_STATUS_SUCCESS && i > 0)
+ packet_filter |= NDIS_PACKET_TYPE_MULTICAST;
diff --git a/kernels/ndiswrapper/kernel-2.6.36.patch
b/kernels/ndiswrapper/kernel-2.6.36.patch
new file mode 100644
index 0000000..63de303
--- /dev/null
+++ b/kernels/ndiswrapper/kernel-2.6.36.patch
@@ -0,0 +1,27 @@
+--- ndiswrapper-1.56.orig/driver/loader.c 2010-02-11 03:09:32.000000000
+0100
++++ ndiswrapper-1.56/driver/loader.c 2010-10-24 01:38:13.000000000 +0200
+@@ -750,13 +750,13 @@
+ }
+
+ /* called with loader_mutex is down */
+-static int wrapper_ioctl(struct inode *inode, struct file *file,
++static long wrapper_unlocked_ioctl(struct file *file,
+ unsigned int cmd, unsigned long arg)
+ {
+ struct load_driver *load_driver;
+ struct load_device load_device;
+ struct load_driver_file load_bin_file;
+- int ret;
++ long ret;
+ void __user *addr = (void __user *)arg;
+
+ ENTER1("cmd: %u", cmd);
+@@ -831,7 +831,7 @@
+
+ static struct file_operations wrapper_fops = {
+ .owner = THIS_MODULE,
+- .ioctl = wrapper_ioctl,
++ .unlocked_ioctl = wrapper_unlocked_ioctl,
+ .release = wrapper_ioctl_release,
+ };
+
diff --git a/kernels/ndiswrapper/kernel-2.6.38.patch
b/kernels/ndiswrapper/kernel-2.6.38.patch
new file mode 100644
index 0000000..6fdb1e8
--- /dev/null
+++ b/kernels/ndiswrapper/kernel-2.6.38.patch
@@ -0,0 +1,24 @@
+--- trunk/ndiswrapper/driver/wrapndis.c 2010/09/13 09:36:56 2728
++++ trunk/ndiswrapper/driver/wrapndis.c 2011/02/14 17:00:00 2729
+@@ -13,16 +13,16 @@
+ *
+ */
+
+-#include "ndis.h"
+-#include "iw_ndis.h"
+-#include "pnp.h"
+-#include "loader.h"
+-#include "wrapndis.h"
+ #include <linux/inetdevice.h>
+ #include <linux/ip.h>
+ #include <linux/tcp.h>
+ #include <linux/udp.h>
+ #include <linux/in.h>
++#include "ndis.h"
++#include "iw_ndis.h"
++#include "pnp.h"
++#include "loader.h"
++#include "wrapndis.h"
+ #include "wrapper.h"
+
+ /* Functions callable from the NDIS driver */
diff --git a/kernels/ndiswrapper/kernel-3.1.patch
b/kernels/ndiswrapper/kernel-3.1.patch
new file mode 100644
index 0000000..e23d586
--- /dev/null
+++ b/kernels/ndiswrapper/kernel-3.1.patch
@@ -0,0 +1,13 @@
+--- ndiswrapper-1.56/driver/ntoskernel.h 2010-02-11 02:09:32.000000000
+0000
++++ ndiswrapper-1.56/driver/ntoskernel.h 2011-11-09 15:39:14.640555480
+0000
+@@ -275,10 +275,6 @@
+ #define PM_EVENT_SUSPEND 2
+ #endif
+
+-#if !defined(HAVE_NETDEV_PRIV)
+-#define netdev_priv(dev) ((dev)->priv)
+-#endif
+-
+ #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,18)
+ #define ISR_PT_REGS_PARAM_DECL
+ #define ISR_PT_REGS_ARG
diff --git a/kernels/ndiswrapper/ndiswrapper-1.56.tar.gz.sig
b/kernels/ndiswrapper/ndiswrapper-1.56.tar.gz.sig
new file mode 100644
index 0000000..d4ac23a
Binary files /dev/null and b/kernels/ndiswrapper/ndiswrapper-1.56.tar.gz.sig
differ
diff --git a/net/ipvsadm/DETAILS b/net/ipvsadm/DETAILS
index fb9156d..336e418 100755
--- a/net/ipvsadm/DETAILS
+++ b/net/ipvsadm/DETAILS
@@ -1,10 +1,10 @@
SPELL=ipvsadm
- VERSION=1.24
+ VERSION=1.26
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.linux-vs.org/software/kernel-2.6/$SOURCE
WEB_SITE=http://www.linux-vs.org/
-
SOURCE_HASH=sha512:76c713298ef419aa2f6665236d797cdfa804960366682f7682281accd10fc654694e9264e1a8c1324523433345a68d040f8c4f6229a3a9ff3131aed42e33b486
+
SOURCE_HASH=sha512:873e23a6bdaabc153b00f1ede3853c947e8c8cfb4e18364d55197c74f26cc883ca469e074a90f377fbfd5e73e0cd6c1fe414c9f7a5c28b0d4431af58056eced4
LICENSE[0]=GPL
ENTERED=20041124
KEYWORDS="net"
diff --git a/net/ipvsadm/HISTORY b/net/ipvsadm/HISTORY
index 16e1b97..76bc526 100644
--- a/net/ipvsadm/HISTORY
+++ b/net/ipvsadm/HISTORY
@@ -1,3 +1,7 @@
+2011-11-17 Tommy Boatman <tboatman AT sourcemage.org>
+ * DETAILS: version 1.26
+ * PREPARE: check for kernel 2.6.28-rc3 or later
+
2008-03-28 Dale E. Edmons <linuxfan AT sourcemage.org>
* DETAILS: bug 14100

diff --git a/net/ipvsadm/PREPARE b/net/ipvsadm/PREPARE
index f4d7115..5644fe1 100755
--- a/net/ipvsadm/PREPARE
+++ b/net/ipvsadm/PREPARE
@@ -1,5 +1,7 @@
-if uname -r | grep -qv ^2\.6 ; then
- echo "Please note that ipvsadm requires that you use Linux 2.6."
+KERNEL_VER=2.6.28-rc3
+if [[ "`uname -r`" < "$KERNEL_VER" ]]
+then
+ echo "ipvsadm requires Linux kernel $KERNEL_VER or later."
echo "The cast will continue but will most likely fail."
fi
true
diff --git a/net/quagga/CONFLICTS b/net/quagga/CONFLICTS
index 05cd131..85a7250 100755
--- a/net/quagga/CONFLICTS
+++ b/net/quagga/CONFLICTS
@@ -1 +1 @@
-conflicts zebra
+conflicts zebra y
diff --git a/net/quagga/HISTORY b/net/quagga/HISTORY
index 86771ab..af15f7e 100644
--- a/net/quagga/HISTORY
+++ b/net/quagga/HISTORY
@@ -1,3 +1,6 @@
+2011-11-16 Tommy Boatman <tboatman AT sourcemage.org>
+ * CONFLICTS: added y to zebra conflict for autocast
+
2011-10-21 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: SECURITY_PATCH=1 (CVEs: 2011-3323, 2011-3324, 2011-3325,
2011-3326, 2011-3327, 2010-1674, 2010-1675 at least)
diff --git a/net/zebra/BUILD b/net/zebra/BUILD
index 3ec0388..27ba77d 100755
--- a/net/zebra/BUILD
+++ b/net/zebra/BUILD
@@ -1,3 +1 @@
-OPTS="$OPTS $ZEBRA_VTYSH $ZEBRA_IDRP $ZEBRA_SNMP $ZEBRA_TCPLINK
$ZEBRA_OSPF_NSSA $ZEBRA_OPAQUE $ZEBRA_OSPF_TE $ZEBRA_TCP_SIG" &&
-autoconf &&
-default_build
+true
diff --git a/net/zebra/CONFIGURE b/net/zebra/CONFIGURE
deleted file mode 100755
index 4d5120b..0000000
--- a/net/zebra/CONFIGURE
+++ /dev/null
@@ -1,7 +0,0 @@
-config_query_option ZEBRA_VTYSH 'Include integrated vty shell
(reccomended)' y '--enable-vtysh' '' &&
-config_query_option ZEBRA_IDRP 'Enable IRDP Server support in zebra?' y
'--enable-irdp' '--disable-irdp' &&
-config_query_option ZEBRA_TCPLINK 'Enable TCP/IP socket connection between
zebra and protocol daemon?' y '--enable-tcp-zebra' '--disable-tcp-zebra' &&
-config_query_option ZEBRA_OSPF_NSSA 'Enable OSPF NSSA option?' y
'--enable-nssa' '--disable-nssa' &&
-config_query_option ZEBRA_OPAQUE 'Enable OSPF Opaque-LSA support
(RFC2370)?' y '--enable-opaque-lsa' '--disable-opaque-lsa' &&
-config_query_option ZEBRA_OSPF_TE 'Enable OSPF Traffic Engineering
Extensions?' y '--enable-ospf-te' '--disable-ospf-te' &&
-config_query_option ZEBRA_TCP_SIG 'Enable TCP MD5 Signature Option
(RFC2385)?' y '--enable-tcp-signature' '--disable-tcp-signature'
diff --git a/net/zebra/CONFLICTS b/net/zebra/CONFLICTS
deleted file mode 100755
index db4ef03..0000000
--- a/net/zebra/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-conflicts quagga
diff --git a/net/zebra/DEPENDS b/net/zebra/DEPENDS
deleted file mode 100755
index 046b218..0000000
--- a/net/zebra/DEPENDS
+++ /dev/null
@@ -1,5 +0,0 @@
-depends autoconf &&
-optional_depends net-snmp "--enable-snmp" "--disable-snmp" "For SNMP
support" &&
-if [[ "ZEBRA_VTYSH" == "--enable-vtysh" ]] ; then
- optional_depends linux-pam '--with-libpam' '--without-libpam' 'For PAM
support in vtysh'
-fi
diff --git a/net/zebra/DETAILS b/net/zebra/DETAILS
index a15ca58..63da01c 100755
--- a/net/zebra/DETAILS
+++ b/net/zebra/DETAILS
@@ -1,12 +1,13 @@
SPELL=zebra
VERSION=0.95a
- SOURCE=$SPELL-$VERSION.tar.gz
+# SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-
SOURCE_URL[0]=ftp://ftp.ripe.net/mirrors/sites/ftp.zebra.org/pub/zebra/$SOURCE
- SOURCE_URL[1]=http://www.planetmirror.com/pub/zebra/$SOURCE
+#
SOURCE_URL[0]=ftp://ftp.ripe.net/mirrors/sites/ftp.zebra.org/pub/zebra/$SOURCE
+# SOURCE_URL[1]=http://www.planetmirror.com/pub/zebra/$SOURCE
# SOURCE_URL[0]=ftp://ftp.zebra.org/pub/zebra/$SOURCE
-
SOURCE_HASH=sha512:48cc3ea93017c9f1ca2237cc46bbbfda366453a15ef3f330e8d829bd708ea3ae735ec6655b4bde2d6106eeb6e85f097c0018cc053a5ef1783cd30520239c5195
+#
SOURCE_HASH=sha512:48cc3ea93017c9f1ca2237cc46bbbfda366453a15ef3f330e8d829bd708ea3ae735ec6655b4bde2d6106eeb6e85f097c0018cc053a5ef1783cd30520239c5195
WEB_SITE=http://www.zebra.org
+ PATCHLEVEL=1
LICENSE[0]=GPL
GCC_VERSION=3.4
ENTERED=20010922
diff --git a/net/zebra/HISTORY b/net/zebra/HISTORY
index 2e59c4a..8356b08 100644
--- a/net/zebra/HISTORY
+++ b/net/zebra/HISTORY
@@ -1,3 +1,7 @@
+2011-11-16 Tommy Boatman <tboatman AT sourcemage.org>
+ * Deprecated spell for favor of quagga per website
+ * All files modified to deprecation standard
+
2007-08-14 Tommy Boatman <tboatman AT sourcemage.org>
* DETAILS: Updated to 0.95a

diff --git a/net/zebra/INSTALL b/net/zebra/INSTALL
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/net/zebra/INSTALL
@@ -0,0 +1 @@
+true
diff --git a/net/zebra/PRE_BUILD b/net/zebra/PRE_BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/net/zebra/PRE_BUILD
@@ -0,0 +1 @@
+true
diff --git a/net/zebra/UP_TRIGGERS b/net/zebra/UP_TRIGGERS
new file mode 100755
index 0000000..e309cd2
--- /dev/null
+++ b/net/zebra/UP_TRIGGERS
@@ -0,0 +1,2 @@
+up_trigger zebra dispel_self
+up_trigger quagga cast_self
diff --git a/python-pypi/python-ssh/DETAILS b/python-pypi/python-ssh/DETAILS
index b35b6e8..59c8214 100755
--- a/python-pypi/python-ssh/DETAILS
+++ b/python-pypi/python-ssh/DETAILS
@@ -1,9 +1,9 @@
SPELL=python-ssh
SPELLX=ssh
- VERSION=1.7.9
+ VERSION=1.7.10
SOURCE=$SPELLX-$VERSION.tar.gz
SOURCE_URL[0]=http://pypi.python.org/packages/source/s/$SPELLX/$SOURCE
-
SOURCE_HASH=sha512:0f955098a3cd653b50a4dec0b4bb29b821ed5a83a99b76c5b9eaa9e2c522860d3853540801a01abfe9679a678b0411b3ee013d61a43b592dc638a8ddb7b77253
+
SOURCE_HASH=sha512:26c02729bcf7a6d5203030f3f7f6f98e4cfad9dceae85cf1f05b97c19abf97f3d373962d6c45c2809ffd9d5f443c1e9076e3e995822d1fa95e964b6d391d07e9
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
WEB_SITE=http://pypi.python.org/pypi/ssh/
ENTERED=20111025
diff --git a/python-pypi/python-ssh/HISTORY b/python-pypi/python-ssh/HISTORY
index c9b6a4f..62b8138 100644
--- a/python-pypi/python-ssh/HISTORY
+++ b/python-pypi/python-ssh/HISTORY
@@ -1,3 +1,6 @@
+2011-11-18 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.7.10
+
2011-11-08 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.7.9
* PRE_BUILD: removed
diff --git a/security/nikto/DETAILS b/security/nikto/DETAILS
index ae7b118..a097bd3 100755
--- a/security/nikto/DETAILS
+++ b/security/nikto/DETAILS
@@ -1,9 +1,9 @@
SPELL=nikto
- VERSION=2.1.1
+ VERSION=2.1.4
SOURCE=${SPELL}-${VERSION}.tar.bz2
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-$VERSION
SOURCE_URL[0]=http://www.cirt.net/${SPELL}/${SOURCE}
-
SOURCE_HASH=sha512:64dfaa6c4c490736bf3c62b32dc32d228b41c030817115fbfc24b5e4485db9ffdbac6179cd0e61e7ec4430981339cf59492abe2e3488676cffe06a40a83846b8
+
SOURCE_HASH=sha512:75cf3eeeefc4f70dbf27d76fed60db76afc1aac53847366ff83deaa7237c16cbfb7590ccbde40edd4d3ecab83a75bd3b7dcc24533d608317f6dca932d457813d
WEB_SITE=http://www.cirt.net/nikto2
ENTERED=20030727
LICENSE[0]=GPL
diff --git a/security/nikto/HISTORY b/security/nikto/HISTORY
index 1e4ba62..3d2c9cf 100644
--- a/security/nikto/HISTORY
+++ b/security/nikto/HISTORY
@@ -1,3 +1,6 @@
+2011-11-18 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.1.4
+
2010-04-27 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: updated spell to 2.1.1
changed SOURCE_DIRECTORY
diff --git a/utils/grep/DEPENDS b/utils/grep/DEPENDS
index 6e5fde2..6fb223c 100755
--- a/utils/grep/DEPENDS
+++ b/utils/grep/DEPENDS
@@ -1,3 +1,4 @@
+depends xz-utils &&
depends gnupg &&
depends smgl-fhs &&

diff --git a/utils/grep/DETAILS b/utils/grep/DETAILS
index c0a1a53..f2d1c58 100755
--- a/utils/grep/DETAILS
+++ b/utils/grep/DETAILS
@@ -1,6 +1,6 @@
SPELL=grep
- VERSION=2.9
- SOURCE=$SPELL-$VERSION.tar.gz
+ VERSION=2.10
+ SOURCE=$SPELL-$VERSION.tar.xz
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$GNU_URL/$SPELL/$SOURCE
diff --git a/utils/grep/HISTORY b/utils/grep/HISTORY
index 70f266b..07a9302 100644
--- a/utils/grep/HISTORY
+++ b/utils/grep/HISTORY
@@ -1,3 +1,7 @@
+2011-11-18 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.10, tar.gz -> tar.xz
+ * DEPENDS, PRE_BUILD: updated to process xz tarball
+
2011-08-23 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: changed to use gnu-verified.gpg
* grep.gpg: removed, 000BEEEE is in gnu-verfied.gpg
diff --git a/utils/grep/PRE_BUILD b/utils/grep/PRE_BUILD
new file mode 100755
index 0000000..6f54504
--- /dev/null
+++ b/utils/grep/PRE_BUILD
@@ -0,0 +1,5 @@
+mk_source_dir $SOURCE_DIRECTORY &&
+cd $BUILD_DIRECTORY &&
+verify_file '' &&
+xz -dc $SOURCE_CACHE/$SOURCE | tar -xf -
+cd $SOURCE_DIRECTORY
diff --git a/utils/ipv6calc/DETAILS b/utils/ipv6calc/DETAILS
index cd62435..0512ace 100755
--- a/utils/ipv6calc/DETAILS
+++ b/utils/ipv6calc/DETAILS
@@ -1,5 +1,5 @@
SPELL=ipv6calc
- VERSION=0.71.0
+ VERSION=0.92.0
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE2=${SOURCE}.sig
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
diff --git a/utils/ipv6calc/HISTORY b/utils/ipv6calc/HISTORY
index 1bc6521..930c1f5 100644
--- a/utils/ipv6calc/HISTORY
+++ b/utils/ipv6calc/HISTORY
@@ -1,3 +1,6 @@
+2011-11-16 Tommy Boatman <tboatman AT sourcemage.org>
+ * DETAILS: version 0.92.0
+
2008-04-20 Elisamuel Resto <ryuji AT sourcemage.org>
* DETAILS: added LICENSE
* BUILD: aparently, if CFLAGS env is set, config.h doesnt get copied
and md5.c fails
diff --git a/video-libs/libdvdcss/BUILD b/video-libs/libdvdcss/BUILD
deleted file mode 100755
index 08d7b9c..0000000
--- a/video-libs/libdvdcss/BUILD
+++ /dev/null
@@ -1,2 +0,0 @@
-OPTS="$OPTS --disable-doc" &&
-default_build
diff --git a/video-libs/libdvdcss/DETAILS b/video-libs/libdvdcss/DETAILS
index fbfd837..4d6ae9f 100755
--- a/video-libs/libdvdcss/DETAILS
+++ b/video-libs/libdvdcss/DETAILS
@@ -1,6 +1,6 @@
SPELL=libdvdcss
- VERSION=1.2.10
-
SOURCE_HASH=sha512:06a9d4d8a5450c59ae6de35e8efa962111fc96a5d55cdd9133d04a6676c9317944bc7e130d81f84ce7f45ae60b23da56eb653e6022413f3eb0b6366a6190733c
+ VERSION=1.2.11
+
SOURCE_HASH=sha512:32dec992cf2f352a09c4edc39ea16101fc9005f3aecc43460aa1b5834c104d3f2c1efc81051339fa18fd4f33cfa949fd17ffe84414519a92b91d0d8a1ae4c467
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://download.videolan.org/pub/libdvdcss/$VERSION/$SOURCE
diff --git a/video-libs/libdvdcss/HISTORY b/video-libs/libdvdcss/HISTORY
index 05687f7..88a1c9c 100644
--- a/video-libs/libdvdcss/HISTORY
+++ b/video-libs/libdvdcss/HISTORY
@@ -1,3 +1,7 @@
+2011-11-16 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.2.11
+ * BUILD: deleted, not needed
+
2010-04-14 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* BUILD: disabled building of api documentation to fix the
build
diff --git a/x11-toolkits/gtk+2/DEPENDS b/x11-toolkits/gtk+2/DEPENDS
index 69519aa..0495de6 100755
--- a/x11-toolkits/gtk+2/DEPENDS
+++ b/x11-toolkits/gtk+2/DEPENDS
@@ -1,8 +1,4 @@
-if [[ "$GTK_VER" == "devel" ]]; then
- depends -sub GLIB_DEVEL glib2
-else
- depends glib2
-fi
+depends glib2
depends gdk-pixbuf2 &&
depends atk &&
depends pango &&
diff --git a/x11-toolkits/gtk+2/DETAILS b/x11-toolkits/gtk+2/DETAILS
index 89b5f5b..53d187a 100755
--- a/x11-toolkits/gtk+2/DETAILS
+++ b/x11-toolkits/gtk+2/DETAILS
@@ -1,14 +1,7 @@
SPELL=gtk+2
-if [[ $GTK_VER == devel ]];then
VERSION=2.24.8
-#
SOURCE_HASH=sha512:b27b34eddf0f1881f7b326702675bba10d2b3958b87842dc04c1797c67b1db341d768f1c960a9dba57867ec9b74a7f7392a10d56068148a52254195da0245754
SOURCE=gtk+-$VERSION.tar.bz2
SOURCE_GPG=gurus.gpg:$SOURCE.sig
-else
- VERSION=2.24.8
- SOURCE=gtk+-$VERSION.tar.bz2
- SOURCE_GPG=gurus.gpg:$SOURCE.sig
-fi
BRANCH=`echo $VERSION | cut -d . -f 1,2`
SOURCE_DIRECTORY="$BUILD_DIRECTORY/gtk+-$VERSION"
SOURCE_URL[0]=$GNOME_URL/sources/gtk+/$BRANCH/$SOURCE
diff --git a/x11-toolkits/gtk+2/HISTORY b/x11-toolkits/gtk+2/HISTORY
index 487ec11..c0d72d1 100644
--- a/x11-toolkits/gtk+2/HISTORY
+++ b/x11-toolkits/gtk+2/HISTORY
@@ -1,3 +1,8 @@
+2011-11-18 Sukneet Basuta <sukneet AT sourcemage.org>
+ * removed DEVEL since devel happens in gtk+3 now
+ * DETAILS: removed variables for DEVEL
+ * PREPARE: removed, no longer need to select branch
+
2011-11-11 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 2.24.8

diff --git a/x11-toolkits/gtk+2/PREPARE b/x11-toolkits/gtk+2/PREPARE
deleted file mode 100755
index 03347b9..0000000
--- a/x11-toolkits/gtk+2/PREPARE
+++ /dev/null
@@ -1 +0,0 @@
-config_query_list GTK_VER 'which gtk version?' stable devel



  • [SM-Commit] GIT changes to devel-xorg-modular grimoire by Vlad Glagolev (db6739e6d0215ea2cb1dabfd627b215e83493a20), Vlad Glagolev, 11/18/2011

Archive powered by MHonArc 2.6.24.

Top of Page