Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-xorg-modular grimoire by Eric Sandall (8a2a9d7dcfbc1e75ebbb5949cbf08bb93a13669c)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to devel-xorg-modular grimoire by Eric Sandall (8a2a9d7dcfbc1e75ebbb5949cbf08bb93a13669c)
  • Date: Mon, 9 Jul 2012 15:44:55 -0500

GIT changes to devel-xorg-modular grimoire by Eric Sandall
<sandalle AT sourcemage.org>:

ChangeLog | 7
audio-players/qmmp/DETAILS | 4
audio-players/qmmp/HISTORY | 3
chat-im/pidgin/DETAILS | 4
chat-im/pidgin/HISTORY | 6
crypto/gnutls/DETAILS | 4
crypto/gnutls/HISTORY | 3
crypto/nettle/DETAILS | 2
crypto/nettle/HISTORY | 3
dev/null |binary
devel/phpmyadmin/DETAILS | 2
devel/phpmyadmin/HISTORY | 3
disk/nilfs-utils/DETAILS | 4
disk/nilfs-utils/HISTORY | 3
gnome2-apps/giggle/HISTORY | 5
gnome2-apps/giggle/PRE_BUILD | 3
gnome2-apps/giggle/gmodule.patch | 10
gnome2-apps/xournal/BUILD | 1
gnome2-apps/xournal/DETAILS | 4
gnome2-apps/xournal/HISTORY | 4
gnome2-apps/xournal/compilation_flags | 26 -
gnome2-apps/xournal/pdf-export-64.patch | 89 ---
gnome2-apps/xournal/poppler-api.patch | 158 ------
gnome2-libs/libgnomecups/DETAILS | 4
gnome2-libs/libgnomecups/HISTORY | 6
gnome2-libs/libgnomecups/PRE_BUILD | 4
gnome2-libs/libgnomecups/glib.patch | 37 +
gnome2-libs/libgnomecups/libgnomecups-0.2.2.tar.bz2.sig | 0
gnome2-libs/libgnomecups/libgnomecups-0.2.3.tar.bz2.sig |binary
gnome2-libs/libgnomeprint/HISTORY | 5
gnome2-libs/libgnomeprint/PRE_BUILD | 4
gnome2-libs/libgnomeprint/stdio.patch | 9
graphics/lensfun/BUILD | 4
graphics/lensfun/DEPENDS | 5
graphics/lensfun/DETAILS | 8
graphics/lensfun/HISTORY | 6
graphics/lensfun/PREPARE | 9
graphics/mutiara/DEPENDS | 4
graphics/mutiara/DETAILS | 13
graphics/mutiara/HISTORY | 2
http/xombrero/DETAILS | 2
http/xombrero/HISTORY | 4
http/xombrero/PRE_BUILD | 4
http/xombrero/xombrero-1.0.0.tgz.sig | 0
http/xombrero/xombrero-1.1.0.tgz.sig |binary
http/xombrero/xombrero-TAILQ_FOREACH_SAFE.patch | 19
kde4-apps/digikam4/DETAILS | 4
kde4-apps/digikam4/HISTORY | 3
lib/libyaml/DETAILS | 14
lib/libyaml/HISTORY | 3
libs/libbsd/DETAILS | 4
libs/libbsd/HISTORY | 3
libs/upower/DETAILS | 4
libs/upower/HISTORY | 3
net/dhcp/BUILD | 5
net/dhcp/CONFIGURE | 1
net/dhcp/DEPENDS | 18
net/dhcp/DETAILS | 9
net/dhcp/HISTORY | 16
net/dhcp/INSTALL | 3
net/dhcp/PRE_BUILD | 7
net/dhcp/SUB_DEPENDS | 7
net/dhcp/dhcp-3.0.3-dhclient-dbus.patch | 84 ---
net/dhcp/dhcp-3.0.3-x-option.patch | 216 --------
net/dhcp/init.d/dhcp | 6
net/dhcp/init.d/dhcp.conf | 7
net/ethtool/DETAILS | 4
net/ethtool/HISTORY | 3
net/hostapd/BUILD | 43 +
net/hostapd/CONFIGURE | 100 +++
net/hostapd/DEPENDS | 16
net/hostapd/DETAILS | 21
net/hostapd/FINAL | 4
net/hostapd/HISTORY | 3
net/hostapd/INSTALL | 20
net/hostapd/PRE_BUILD | 8
net/hostapd/hostapd-1.0.tar.gz.sig |binary
net/hostapd/init.d/hostapd | 11
net/hostapd/init.d/hostapd.conf | 2
python-pypi/alembic/DETAILS | 4
python-pypi/alembic/HISTORY | 3
security-libs/linux-pam/CONFIGURE | 1
security-libs/linux-pam/DEPENDS | 5
security-libs/linux-pam/HISTORY | 6
security-libs/linux-pam/INSTALL | 2
utils/colordiff/DETAILS | 4
utils/colordiff/HISTORY | 3
utils/dbus-glib/DETAILS | 4
utils/dbus-glib/HISTORY | 3
utils/dbus-python/DETAILS | 4
utils/dbus-python/HISTORY | 3
utils/dbus/DETAILS | 4
utils/dbus/HISTORY | 3
utils/usbutils/DETAILS | 13
utils/usbutils/HISTORY | 3
video/totem/DEPENDS | 14
video/totem/DETAILS | 2
video/totem/HISTORY | 8
video/totem/totem-3.4.2.tar.xz.sig | 0
video/totem/totem-3.4.3.tar.xz.sig |binary
video/vlc/HISTORY | 5
video/vlc/PRE_BUILD | 4
video/vlc/lua-scripts.patch | 131 +++++
video/vlc/lua.patch | 411
++++++++++++++++
x11-libs/wine/DETAILS | 2
x11-libs/wine/HISTORY | 3
106 files changed, 1125 insertions(+), 669 deletions(-)

New commits:
commit ea92d2c20f3fa61529b427189402736c1507bb1a
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

wine: Updated devel to 1.5.8

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

ethtool 3.4.1

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

nettle: => 2.5

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

gnutls 2.12.20 & 3.0.21

commit 98dbf1657b934103d881975f3500fc8848e482f4
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

alembic: => 0.3.5

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

colordiff 1.0.10

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

dbus-python 1.1.1

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

dbus-glib 0.100

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

dbus 1.6.2

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

digikam4 2.7.0

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

upower 0.9.17

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

xournal 0.4.7

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

nilfs-utils 2.1.4

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

pidgin 2.10.6

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

usbutils 006

Any news on SOURCE_DECOMPRESSED_GPG and SOURCE_DECOMPRESSED_HASH?
http://www.sourcemage.org/issues/331

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

phpmyadmin: cleaned up weird chars

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

libgnomeprint: fix compilation by adding missing header

* PRE_BUILD: added, to apply patch
* stdio.patch: added, patch to apply missing header.

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

libgnomecups: => 0.2.3
fixed WEB_SITE

* PRE_BUILD: added, to apply patch
* glib.patch: added, fix compilation with glib>=2.31

commit 5af1b311c1057c4937dd54e36f2e62407e327313
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

graphics/lensfun: version 0.2.6

* use prepare_select_branch
* use cmake
* have optional dependency on libpng

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

linux-pam: switch to optional_depends for selinux to pass proper flags

* CONFIGURE: remove config_query for SELINUX
* INSTALL: fix commented out check for libselinux in case someone needs it

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

totem: => 3.4.3

* DEPENDS: gtk+2 -> gtk+3
Removed depends gst-plugins-good.
Added depends gst-plugins-base (fixes #224).
Added suggest depends gst-plugins-good, gst-plugins-ugly,
gst-plugins-bad, and gst-ffmpeg.

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

vlc: apply lua 5.2 fixes

lua.patch, lua-scripts.patch: added, applies fixes for lua 5.2. From
upstream. I assume this will be in the next major update

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

graphics/mutiara: new spell, motif designer

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

qmmp 0.6.0

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

pidgin 2.10.5, SECURITY_PATCH=15

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

xombrero 1.1.0

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

libbsd 0.4.2

commit a1fc197db33635a5ffd8c03f2a5c68f436dbb480
Author: David Kowis <dkowis AT shlrm.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

Fixing DETAILSwq

commit c85537877ae1446fa478ef08cd6c07ec4c078cb6
Author: David Kowis <dkowis AT shlrm.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

Adding a libyaml spell for ruby

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

hostapd: new spell, IEEE 802.11 AP, IEEE 802.1X/WPA/WPA2/EAP/RADIUS
Authenticator

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

giggle: added patch to address upstream bug 667350

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

dhcp: => 4.2.4

diff --git a/ChangeLog b/ChangeLog
index 5187545..edaf6a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2012-07-05 Ladislav Hagara <hgr AT vabo.cz>
+ * graphics/mutiara: new spell, motif designer
+
+2012-07-05 Vlad Glagolev <stealth AT sourcemage.org>
+ * net/hostapd: new spell, IEEE 802.11 AP, IEEE
802.1X/WPA/WPA2/EAP/RADIUS
+ Authenticator
+
2012-07-03 Vlad Glagolev <stealth AT sourcemage.org>
* utils/wol: new spell, Wake On LAN client

diff --git a/audio-players/qmmp/DETAILS b/audio-players/qmmp/DETAILS
index 81927b0..93a5510 100755
--- a/audio-players/qmmp/DETAILS
+++ b/audio-players/qmmp/DETAILS
@@ -1,8 +1,8 @@
SPELL=qmmp
- VERSION=0.5.2
+ VERSION=0.6.0
SOURCE="${SPELL}-${VERSION}.tar.bz2"
SOURCE_URL[0]=http://${SPELL}.ylsoftware.com/files/${SOURCE}
-
SOURCE_HASH=sha512:be42fdbf69afc5f76164a843f2747b5fbc496cef0b3ae1eac2bb0c34014ea743403a0f3bc1e4bb7fe1f2d6e160ed8a18f08b95fa802b36ffb41dff597d71fe12
+
SOURCE_HASH=sha512:63897d7b93a071a1b51a18063f453044013bee91c68b186e52a48aa08c84180a8914dcaf1b20fdb8554430fd99511485d4529608f1ae61704c7c0a591356be98
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://qmmp.ylsoftware.com/";
LICENSE[0]="GPL"
diff --git a/audio-players/qmmp/HISTORY b/audio-players/qmmp/HISTORY
index 1598135..3b99b3c 100644
--- a/audio-players/qmmp/HISTORY
+++ b/audio-players/qmmp/HISTORY
@@ -1,3 +1,6 @@
+2012-07-05 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.6.0
+
2011-09-13 Bor Kraljič <pyrobor AT ver.si>
* DEPENDS, DETAILS, BUILD: spell created

diff --git a/chat-im/pidgin/DETAILS b/chat-im/pidgin/DETAILS
index 2841bf4..424d5ea 100755
--- a/chat-im/pidgin/DETAILS
+++ b/chat-im/pidgin/DETAILS
@@ -1,6 +1,6 @@
SPELL=pidgin
- VERSION=2.10.4
- SECURITY_PATCH=14
+ VERSION=2.10.6
+ SECURITY_PATCH=15
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/chat-im/pidgin/HISTORY b/chat-im/pidgin/HISTORY
index 3ced59a..65f88c1 100644
--- a/chat-im/pidgin/HISTORY
+++ b/chat-im/pidgin/HISTORY
@@ -1,3 +1,9 @@
+2012-07-08 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.10.6
+
+2012-07-05 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.10.5, SECURITY_PATCH=15
+
2012-05-07 Julien "_kaze_" ROZO <julien AT rozo.org>
* DETAILS: updated version to 2.10.4, SECURITY_PATCH=14

diff --git a/crypto/gnutls/DETAILS b/crypto/gnutls/DETAILS
index bc67f67..4613af4 100755
--- a/crypto/gnutls/DETAILS
+++ b/crypto/gnutls/DETAILS
@@ -43,11 +43,11 @@ case $GNUTLS_BRANCH in
SOURCE=$SPELL-$VERSION.tar.bz2
;;
2.12)
- VERSION=2.12.14
+ VERSION=2.12.20
SOURCE=$SPELL-$VERSION.tar.bz2
;;
3.0)
- VERSION=3.0.20
+ VERSION=3.0.21
SOURCE=$SPELL-$VERSION.tar.xz
;;
esac
diff --git a/crypto/gnutls/HISTORY b/crypto/gnutls/HISTORY
index 1a7d182..9534264 100644
--- a/crypto/gnutls/HISTORY
+++ b/crypto/gnutls/HISTORY
@@ -1,3 +1,6 @@
+2012-07-09 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.12.20 & 3.0.21
+
2012-06-06 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 3.0.20

diff --git a/crypto/nettle/DETAILS b/crypto/nettle/DETAILS
index c857982..557b1db 100755
--- a/crypto/nettle/DETAILS
+++ b/crypto/nettle/DETAILS
@@ -1,5 +1,5 @@
SPELL=nettle
- VERSION=2.4
+ VERSION=2.5
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/crypto/nettle/HISTORY b/crypto/nettle/HISTORY
index 12d7e8f..fb8a3ef 100644
--- a/crypto/nettle/HISTORY
+++ b/crypto/nettle/HISTORY
@@ -1,3 +1,6 @@
+2012-07-09 Treeve Jelbert <treeve AT sourmage.org>
+ * DETAILS: version 2.5
+
2011-09-26 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: converted to upstream signature checking
* A8F4C2FD.gpg: added gpg keyring
diff --git a/devel/phpmyadmin/DETAILS b/devel/phpmyadmin/DETAILS
index cb10b31..a050964 100755
--- a/devel/phpmyadmin/DETAILS
+++ b/devel/phpmyadmin/DETAILS
@@ -35,6 +35,6 @@ look up the appropriate part in the MySQL manual.
Currently phpMyAdmin can:
* communicate in 43 different languages

(*) phpMyAdmin can compress (Zip, GZip -RFC 1952- or Bzip2 formats) dumps and
-CSV exports if you use PHP4�>=�4.0.4 with Zlib support (--with-zlib) and/or
+CSV exports if you use PHP4 >= 4.0.4 with Zlib support (--with-zlib) and/or
Bzip2 support (--with-bz2).
EOF
diff --git a/devel/phpmyadmin/HISTORY b/devel/phpmyadmin/HISTORY
index 54cca64..e786e29 100644
--- a/devel/phpmyadmin/HISTORY
+++ b/devel/phpmyadmin/HISTORY
@@ -1,3 +1,6 @@
+2012-07-08 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
+ * DETAILS: fixed some odd byte encoding
+
2012-02-10 George Sherwood <gsherwood AT sourcemage.org>
* DETAILS: Updated to version 3.4.9

diff --git a/disk/nilfs-utils/DETAILS b/disk/nilfs-utils/DETAILS
index 48df964..66bbcb3 100755
--- a/disk/nilfs-utils/DETAILS
+++ b/disk/nilfs-utils/DETAILS
@@ -1,10 +1,10 @@
SPELL=nilfs-utils
- VERSION=2.1.1
+ VERSION=2.1.4
SECURITY_PATCH=1
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.nilfs.org/download/$SOURCE
-
SOURCE_HASH=sha512:a56953350b2c3ce69096dacc7c4f7472dbd25779d74679226c7823ec93d180a4c84b34791da12ba461684ccb267ba2fb42dac4d6a5787044777f95dc22151ac6
+
SOURCE_HASH=sha512:f30fd3fabd17aae8d68b30c4bfc6299bd1bed2853c8d10ebf4038a3a194e40419c44c50a2f3ffff8a4c17955a2c5a744c62cfd1dafcb9b4f8fb9d19bcc4d44af
WEB_SITE=http://www.nilfs.org/
ENTERED=20090603
LICENSE[0]=GPL
diff --git a/disk/nilfs-utils/HISTORY b/disk/nilfs-utils/HISTORY
index f592e20..4750c6b 100644
--- a/disk/nilfs-utils/HISTORY
+++ b/disk/nilfs-utils/HISTORY
@@ -1,3 +1,6 @@
+2012-07-08 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.1.4
+
2012-01-22 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.1.1

diff --git a/gnome2-apps/giggle/HISTORY b/gnome2-apps/giggle/HISTORY
index 14549aa..5b32df6 100644
--- a/gnome2-apps/giggle/HISTORY
+++ b/gnome2-apps/giggle/HISTORY
@@ -1,3 +1,8 @@
+2012-07-04 Tommy Boatman <tboatman AT sourcemage.org>
+ * PRE_BUILD: add gmodule.patch to address GNOME bug 667350
+ https://bugzilla.gnome.org/show_bug.cgi?id=667350 - gmodule-2.0 no
+ longer in pkg-config files for GTK+. 0.6.2 will fix when released
+
2011-10-25 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 0.6.1

diff --git a/gnome2-apps/giggle/PRE_BUILD b/gnome2-apps/giggle/PRE_BUILD
new file mode 100755
index 0000000..bdf18f2
--- /dev/null
+++ b/gnome2-apps/giggle/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p0 < $SPELL_DIRECTORY/gmodule.patch
diff --git a/gnome2-apps/giggle/gmodule.patch
b/gnome2-apps/giggle/gmodule.patch
new file mode 100644
index 0000000..40099c1
--- /dev/null
+++ b/gnome2-apps/giggle/gmodule.patch
@@ -0,0 +1,10 @@
+--- configure.ac~ 2011-10-24 07:56:10.000000000 -0500
++++ configure.ac 2012-07-04 20:08:45.000000000 -0500
+@@ -57,6 +57,7 @@
+ gio-2.0 >= $GLIB_REQUIRED_VERSION
+ glib-2.0 >= $GLIB_REQUIRED_VERSION
+ gthread-2.0 >= $GLIB_REQUIRED_VERSION
++ gmodule-2.0 >= $GLIB_REQUIRED_VERSION
+ gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED_VERSION
+ gdk-3.0 >= $GTK_REQUIRED_VERSION
+ gtk+-3.0 >= $GTK_REQUIRED_VERSION
diff --git a/gnome2-apps/xournal/BUILD b/gnome2-apps/xournal/BUILD
deleted file mode 100755
index 4936557..0000000
--- a/gnome2-apps/xournal/BUILD
+++ /dev/null
@@ -1 +0,0 @@
-LIBS+=" -lz -lX11" default_build
diff --git a/gnome2-apps/xournal/DETAILS b/gnome2-apps/xournal/DETAILS
index 7bf43e2..56d82dc 100755
--- a/gnome2-apps/xournal/DETAILS
+++ b/gnome2-apps/xournal/DETAILS
@@ -1,8 +1,8 @@
SPELL=xournal
- VERSION=0.4.5
+ VERSION=0.4.7
SOURCE="${SPELL}-${VERSION}.tar.gz"

SOURCE_URL[0]="$SOURCEFORGE_URL/project/${SPELL}/${SPELL}/${VERSION}/${SOURCE}"
-
SOURCE_HASH=sha512:78a4c250d2967489c10028eda29775fe45353c9a88752c5717ceb52ff6710e5d4683195d9252a9f05514643dfdb00dcd0f282662bae4d27801c00709b8f9b40e
+
SOURCE_HASH=sha512:476048b36c73b412dc7e003df5b61b3d694570fde77cbde057e887c1251c4ef18389567f2a63259b4e93a14ef4681536dcbb0f04ead28b60d70c9a4bd33a1cb0
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://xournal.sourceforge.net/";
LICENSE[0]=GPL
diff --git a/gnome2-apps/xournal/HISTORY b/gnome2-apps/xournal/HISTORY
index e61443b..d89d437 100644
--- a/gnome2-apps/xournal/HISTORY
+++ b/gnome2-apps/xournal/HISTORY
@@ -1,3 +1,7 @@
+2012-07-08 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.4.7
+ * BUILD, compilation_flags, {pdf-export-64,poppler-api}.patch: removed
+
2012-02-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* PRE_BUILD: added
* compilation_flags: added patch from ubuntu to fix compilation issues
diff --git a/gnome2-apps/xournal/compilation_flags
b/gnome2-apps/xournal/compilation_flags
deleted file mode 100644
index 6bf7eca..0000000
--- a/gnome2-apps/xournal/compilation_flags
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/po/Makefile.in.in
-+++ b/po/Makefile.in.in
-@@ -95,6 +95,13 @@
- $(srcdir)/$(GETTEXT_PACKAGE).pot: $(POTFILES)
- $(XGETTEXT) --default-domain=$(GETTEXT_PACKAGE)
--directory=$(top_srcdir) \
- --add-comments --keyword=_ --keyword=N_ \
-+ --keyword=C_:1c,2 \
-+ --keyword=NC_:1c,2 \
-+ --keyword=g_dngettext:2,3 \
-+ --flag=N_:1:pass-c-format \
-+ --flag=C_:2:pass-c-format \
-+ --flag=NC_:2:pass-c-format \
-+ --flag=g_dngettext:2:pass-c-format \
- --flag=g_strdup_printf:1:c-format \
- --flag=g_string_printf:2:c-format \
- --flag=g_string_append_printf:2:c-format \
---- a/src/ttsubset/Makefile.in
-+++ b/src/ttsubset/Makefile.in
-@@ -113,6 +113,7 @@
- PACKAGE_NAME = @PACKAGE_NAME@
- PACKAGE_STRING = @PACKAGE_STRING@
- PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_URL = @PACKAGE_URL@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PKG_CONFIG = @PKG_CONFIG@
diff --git a/gnome2-apps/xournal/pdf-export-64.patch
b/gnome2-apps/xournal/pdf-export-64.patch
deleted file mode 100644
index 9f7075c..0000000
--- a/gnome2-apps/xournal/pdf-export-64.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-diff -aur old/src/xo-print.c new/src/xo-print.c
---- old/src/xo-print.c 2009-09-28 23:36:54.000000000 +0200
-+++ new/src/xo-print.c 2009-11-15 06:06:00.000000000 +0100
-@@ -761,7 +761,7 @@
-
- make_xref(xref, xref->last+1, pdfbuf->len);
- g_string_append_printf(pdfbuf,
-- "%d 0 obj\n<< /Length %d /Filter /FlateDecode /Type /Xobject "
-+ "%d 0 obj\n<< /Length %zu /Filter /FlateDecode /Type /Xobject "
- "/Subtype /Image /Width %d /Height %d /ColorSpace /DeviceRGB "
- "/BitsPerComponent 8 >> stream\n",
- xref->last, zpix->len, width, height);
-@@ -840,8 +840,10 @@
- gboolean fallback, is_binary;
- guchar encoding[256];
- gushort glyphs[256];
-- int i, j, num, len1, len2;
-- gsize len;
-+ int i, j, num;
-+ guint32 len1, len2;
-+ guint32 tt_len;
-+ gsize t1_len;
- TrueTypeFont *ttfnt;
- char *seg1, *seg2;
- char *fontdata, *p;
-@@ -862,14 +864,14 @@
- }
- font->num_glyphs_used = num-1;
- if (OpenTTFont(font->filename, 0, &ttfnt) == SF_OK) {
-- if (CreateTTFromTTGlyphs_tomemory(ttfnt, (guint8**)&fontdata, &len,
glyphs, encoding, num,
-+ if (CreateTTFromTTGlyphs_tomemory(ttfnt, (guint8**)&fontdata,
&tt_len, glyphs, encoding, num,
- 0, NULL, TTCF_AutoName | TTCF_IncludeOS2) == SF_OK) {
- make_xref(xref, xref->last+1, pdfbuf->len);
- nobj_fontprog = xref->last;
- g_string_append_printf(pdfbuf,
-- "%d 0 obj\n<< /Length %d /Length1 %d >> stream\n",
-- nobj_fontprog, (int)len, (int)len);
-- g_string_append_len(pdfbuf, fontdata, len);
-+ "%d 0 obj\n<< /Length %u /Length1 %u >> stream\n",
-+ nobj_fontprog, tt_len, tt_len);
-+ g_string_append_len(pdfbuf, fontdata, tt_len);
- g_string_append(pdfbuf, "endstream\nendobj\n");
- g_free(fontdata);
- }
-@@ -879,7 +881,7 @@
- else fallback = TRUE;
- } else {
- // embed the font file: Type1 case
-- if (g_file_get_contents(font->filename, &fontdata, &len, NULL) &&
len>=8) {
-+ if (g_file_get_contents(font->filename, &fontdata, &t1_len, NULL) &&
t1_len>=8) {
- if (fontdata[0]==(char)0x80 && fontdata[1]==(char)0x01) {
- is_binary = TRUE;
- len1 = pfb_get_length((unsigned char *)fontdata+2);
-@@ -898,7 +900,7 @@
- if (*p=='\n' || *p=='\r') p++;
- if (*p=='\n' || *p=='\r') p++;
- len1 = p-fontdata;
-- p = g_strrstr_len(fontdata, len, T1_SEGMENT_3_END);
-+ p = g_strrstr_len(fontdata, t1_len, T1_SEGMENT_3_END);
- if (p==NULL) fallback = TRUE;
- else {
- // rewind 512 zeros
-@@ -936,7 +938,7 @@
- make_xref(xref, xref->last+1, pdfbuf->len);
- nobj_fontprog = xref->last;
- g_string_append_printf(pdfbuf,
-- "%d 0 obj\n<< /Length %d /Length1 %d /Length2 %d /Length3 0 >>
stream\n",
-+ "%d 0 obj\n<< /Length %u /Length1 %u /Length2 %u /Length3 0 >>
stream\n",
- nobj_fontprog, len1+len2, len1, len2);
- g_string_append_len(pdfbuf, seg1, len1);
- g_string_append_len(pdfbuf, seg2, len2);
-@@ -1258,7 +1260,7 @@
- tmpstr = make_pdfprefix(pdfinfo.pages+(pg->bg->file_page_seq-1),
- pg->width, pg->height);
- g_string_append_printf(pdfbuf,
-- "%d 0 obj\n<< /Length %d >> stream\n%s\nendstream\nendobj\n",
-+ "%d 0 obj\n<< /Length %zu >> stream\n%s\nendstream\nendobj\n",
- n_obj_prefix, tmpstr->len, tmpstr->str);
- g_string_free(tmpstr, TRUE);
- g_string_prepend(pgstrm, "Q Q Q ");
-@@ -1276,7 +1278,7 @@
-
- make_xref(&xref, xref.last+1, pdfbuf->len);
- g_string_append_printf(pdfbuf,
-- "%d 0 obj\n<< /Length %d /Filter /FlateDecode>> stream\n",
-+ "%d 0 obj\n<< /Length %zu /Filter /FlateDecode>> stream\n",
- xref.last, zpgstrm->len);
- g_string_append_len(pdfbuf, zpgstrm->str, zpgstrm->len);
- g_string_free(zpgstrm, TRUE);
diff --git a/gnome2-apps/xournal/poppler-api.patch
b/gnome2-apps/xournal/poppler-api.patch
deleted file mode 100644
index 9e33c7f..0000000
--- a/gnome2-apps/xournal/poppler-api.patch
+++ /dev/null
@@ -1,158 +0,0 @@
-diff -aur old/src/xo-file.c new/src/xo-file.c
---- old/src/xo-file.c 2009-09-29 09:36:05.000000000 +1000
-+++ new/src/xo-file.c 2011-10-06 03:11:17.307822836 +1100
-@@ -975,6 +975,140 @@
- g_free(req);
- }
-
-+/*
-+ * Copied from
http://cgit.freedesktop.org/poppler/poppler/tree/glib/poppler-page.cc?h=poppler-0.16#n617
-+ * as a temporary workaround to poppler removing depreciated functions
while we wait for
-+ * upstream to rewrite against cairo
-+ */
-+static void
-+copy_cairo_surface_to_pixbuf (cairo_surface_t *surface, GdkPixbuf *pixbuf)
-+{
-+ int cairo_width, cairo_height, cairo_rowstride;
-+ unsigned char *pixbuf_data, *dst, *cairo_data;
-+ int pixbuf_rowstride, pixbuf_n_channels;
-+ unsigned int *src;
-+ int x, y;
-+
-+ cairo_width = cairo_image_surface_get_width (surface);
-+ cairo_height = cairo_image_surface_get_height (surface);
-+ cairo_rowstride = cairo_image_surface_get_stride (surface);
-+ cairo_data = cairo_image_surface_get_data (surface);
-+
-+ pixbuf_data = gdk_pixbuf_get_pixels (pixbuf);
-+ pixbuf_rowstride = gdk_pixbuf_get_rowstride (pixbuf);
-+ pixbuf_n_channels = gdk_pixbuf_get_n_channels (pixbuf);
-+
-+ if (cairo_width > gdk_pixbuf_get_width (pixbuf))
-+ cairo_width = gdk_pixbuf_get_width (pixbuf);
-+ if (cairo_height > gdk_pixbuf_get_height (pixbuf))
-+ cairo_height = gdk_pixbuf_get_height (pixbuf);
-+ for (y = 0; y < cairo_height; y++)
-+ {
-+ src = (unsigned int *) (cairo_data + y * cairo_rowstride);
-+ dst = pixbuf_data + y * pixbuf_rowstride;
-+ for (x = 0; x < cairo_width; x++)
-+ {
-+ dst[0] = (*src >> 16) & 0xff;
-+ dst[1] = (*src >> 8) & 0xff;
-+ dst[2] = (*src >> 0) & 0xff;
-+ if (pixbuf_n_channels == 4)
-+ dst[3] = (*src >> 24) & 0xff;
-+ dst += pixbuf_n_channels;
-+ src++;
-+ }
-+ }
-+}
-+
-+static void
-+_poppler_page_render_to_pixbuf (PopplerPage *page,
-+ int src_x, int src_y,
-+ int src_width, int src_height,
-+ double scale,
-+ int rotation,
-+ gboolean printing,
-+ GdkPixbuf *pixbuf)
-+{
-+ cairo_t *cr;
-+ cairo_surface_t *surface;
-+
-+ surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32,
-+ src_width, src_height);
-+ cr = cairo_create (surface);
-+ cairo_save (cr);
-+ switch (rotation) {
-+ case 90:
-+ cairo_translate (cr, src_x + src_width, -src_y);
-+ break;
-+ case 180:
-+ cairo_translate (cr, src_x + src_width, src_y + src_height);
-+ break;
-+ case 270:
-+ cairo_translate (cr, -src_x, src_y + src_height);
-+ break;
-+ default:
-+ cairo_translate (cr, -src_x, -src_y);
-+ }
-+
-+ if (scale != 1.0)
-+ cairo_scale (cr, scale, scale);
-+
-+ if (rotation != 0)
-+ cairo_rotate (cr, rotation * G_PI / 180.0);
-+
-+ if (printing)
-+ poppler_page_render_for_printing (page, cr);
-+ else
-+ poppler_page_render (page, cr);
-+ cairo_restore (cr);
-+
-+ cairo_set_operator (cr, CAIRO_OPERATOR_DEST_OVER);
-+ cairo_set_source_rgb (cr, 1., 1., 1.);
-+ cairo_paint (cr);
-+
-+ cairo_destroy (cr);
-+
-+ copy_cairo_surface_to_pixbuf (surface, pixbuf);
-+ cairo_surface_destroy (surface);
-+}
-+
-+/**
-+ * poppler_page_render_to_pixbuf:
-+ * @page: the page to render from
-+ * @src_x: x coordinate of upper left corner
-+ * @src_y: y coordinate of upper left corner
-+ * @src_width: width of rectangle to render
-+ * @src_height: height of rectangle to render
-+ * @scale: scale specified as pixels per point
-+ * @rotation: rotate the document by the specified degree
-+ * @pixbuf: pixbuf to render into
-+ *
-+ * First scale the document to match the specified pixels per point,
-+ * then render the rectangle given by the upper left corner at
-+ * (src_x, src_y) and src_width and src_height.
-+ * This function is for rendering a page that will be displayed.
-+ * If you want to render a page that will be printed use
-+ * poppler_page_render_to_pixbuf_for_printing() instead
-+ *
-+ * Deprecated: 0.16
-+ **/
-+void
-+poppler_page_render_to_pixbuf (PopplerPage *page,
-+ int src_x, int src_y,
-+ int src_width, int src_height,
-+ double scale,
-+ int rotation,
-+ GdkPixbuf *pixbuf)
-+{
-+ g_return_if_fail (POPPLER_IS_PAGE (page));
-+ g_return_if_fail (scale > 0.0);
-+ g_return_if_fail (pixbuf != NULL);
-+
-+ _poppler_page_render_to_pixbuf (page, src_x, src_y,
-+ src_width, src_height,
-+ scale, rotation,
-+ FALSE,
-+ pixbuf);
-+}
- /* process a bg PDF request from the queue, and recurse */
-
- gboolean bgpdf_scheduler_callback(gpointer data)
-diff -aur old/src/xo-file.h new/src/xo-file.h
---- old/src/xo-file.h 2009-09-28 08:45:53.000000000 +1000
-+++ new/src/xo-file.h 2011-10-06 03:11:17.311156160 +1100
-@@ -36,3 +36,10 @@
- void init_config_default(void);
- void load_config_from_file(void);
- void save_config_to_file(void);
-+
-+void poppler_page_render_to_pixbuf (PopplerPage *page,
-+ int src_x, int src_y,
-+ int src_width, int src_height,
-+ double scale,
-+ int rotation,
-+ GdkPixbuf *pixbuf);
diff --git a/gnome2-libs/libgnomecups/DETAILS
b/gnome2-libs/libgnomecups/DETAILS
index 1ca6e3c..d5fa833 100755
--- a/gnome2-libs/libgnomecups/DETAILS
+++ b/gnome2-libs/libgnomecups/DETAILS
@@ -1,5 +1,5 @@
SPELL=libgnomecups
- VERSION=0.2.2
+ VERSION=0.2.3
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
@@ -7,7 +7,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
LICENSE[0]=LGPL
ENTERED=20020505
- UPDATED=20050318
+ WEB_SITE=http://www.gnome.org
KEYWORDS="cups gnome2 libs"
SHORT="Gnome library to CUPS system"
cat << EOF
diff --git a/gnome2-libs/libgnomecups/HISTORY
b/gnome2-libs/libgnomecups/HISTORY
index 4dae6c8..1f1ead6 100644
--- a/gnome2-libs/libgnomecups/HISTORY
+++ b/gnome2-libs/libgnomecups/HISTORY
@@ -1,3 +1,9 @@
+2012-07-08 Sukneet Basuta <sukneet AT sourcemage.org>
+ * DETAILS: updated spell to 0.2.3
+ fixed WEB_SITE
+ * PRE_BUILD: added, to apply patch
+ * glib.patch: added, fix compilation with glib>=2.31
+
2006-07-20 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: change glib -> glib2

diff --git a/gnome2-libs/libgnomecups/PRE_BUILD
b/gnome2-libs/libgnomecups/PRE_BUILD
new file mode 100755
index 0000000..4a5b046
--- /dev/null
+++ b/gnome2-libs/libgnomecups/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+
+patch -p1 < $SPELL_DIRECTORY/glib.patch
diff --git a/gnome2-libs/libgnomecups/glib.patch
b/gnome2-libs/libgnomecups/glib.patch
new file mode 100644
index 0000000..e84b0e6
--- /dev/null
+++ b/gnome2-libs/libgnomecups/glib.patch
@@ -0,0 +1,37 @@
+From d84eee9450b3b6f6155074915efc61bedcc8d446 Mon Sep 17 00:00:00 2001
+From: Dominique Leuenberger <dimstar AT opensuse.org>
+Date: Sun, 27 Nov 2011 21:36:41 +0100
+Subject: [PATCH] Fix: Only glib.h can be included
+
+---
+ libgnomecups/gnome-cups-i18n.c | 2 +-
+ libgnomecups/gnome-cups-init.h | 3 +--
+ 2 files changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/libgnomecups/gnome-cups-i18n.c b/libgnomecups/gnome-cups-i18n.c
+index 8987c5c..127756d 100644
+--- a/libgnomecups/gnome-cups-i18n.c
++++ b/libgnomecups/gnome-cups-i18n.c
+@@ -1,5 +1,5 @@
+ #include <config.h>
+-#include <glib/gmacros.h>
++#include <glib.h>
+ #include "gnome-cups-i18n.h"
+
+ #ifdef ENABLE_NLS
+diff --git a/libgnomecups/gnome-cups-init.h b/libgnomecups/gnome-cups-init.h
+index 22b682a..c4600fc 100644
+--- a/libgnomecups/gnome-cups-init.h
++++ b/libgnomecups/gnome-cups-init.h
+@@ -1,8 +1,7 @@
+ #ifndef GNOME_CUPS_INIT
+ #define GNOME_CUPS_INIT
+
+-#include <glib/gtypes.h>
+-#include <glib/gmacros.h>
++#include <glib.h>
+
+ G_BEGIN_DECLS
+
+--
+1.7.7
diff --git a/gnome2-libs/libgnomecups/libgnomecups-0.2.2.tar.bz2.sig
b/gnome2-libs/libgnomecups/libgnomecups-0.2.2.tar.bz2.sig
deleted file mode 100644
index 546e539..0000000
Binary files a/gnome2-libs/libgnomecups/libgnomecups-0.2.2.tar.bz2.sig and
/dev/null differ
diff --git a/gnome2-libs/libgnomecups/libgnomecups-0.2.3.tar.bz2.sig
b/gnome2-libs/libgnomecups/libgnomecups-0.2.3.tar.bz2.sig
new file mode 100644
index 0000000..0cd5b5e
Binary files /dev/null and
b/gnome2-libs/libgnomecups/libgnomecups-0.2.3.tar.bz2.sig differ
diff --git a/gnome2-libs/libgnomeprint/HISTORY
b/gnome2-libs/libgnomeprint/HISTORY
index 25e9f74..9062b14 100644
--- a/gnome2-libs/libgnomeprint/HISTORY
+++ b/gnome2-libs/libgnomeprint/HISTORY
@@ -1,3 +1,8 @@
+2012-07-08 Sukneet Basuta <sukneet AT sourcemage.org>
+ * PRE_BUILD: added, to apply patch
+ * stdio.patch: added, patch to apply missing header.
+ From gentoo.
+
2010-09-30 Vasil Yonkov <spirtbrat AT sourcemage.org>
* DETAILS: updated spell to 2.18.8

diff --git a/gnome2-libs/libgnomeprint/PRE_BUILD
b/gnome2-libs/libgnomeprint/PRE_BUILD
new file mode 100755
index 0000000..1055db2
--- /dev/null
+++ b/gnome2-libs/libgnomeprint/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+
+patch -p1 < $SPELL_DIRECTORY/stdio.patch
diff --git a/gnome2-libs/libgnomeprint/stdio.patch
b/gnome2-libs/libgnomeprint/stdio.patch
new file mode 100644
index 0000000..dd91954
--- /dev/null
+++ b/gnome2-libs/libgnomeprint/stdio.patch
@@ -0,0 +1,9 @@
+--- a/libgnomeprint/modules/cups/gnome-print-cups-transport.c
++++ b/libgnomeprint/modules/cups/gnome-print-cups-transport.c
+@@ -34,6 +34,7 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <fcntl.h>
++#include <stdio.h>
+ #include <unistd.h>
+ #include <locale.h>
diff --git a/graphics/lensfun/BUILD b/graphics/lensfun/BUILD
index e342b8f..e013b8d 100755
--- a/graphics/lensfun/BUILD
+++ b/graphics/lensfun/BUILD
@@ -1,3 +1 @@
-./configure --prefix=${INSTALL_ROOT}/usr --libdir="$INSTALL_ROOT/usr/lib"
$OPTS &&
-make all
-
+cmake_build
diff --git a/graphics/lensfun/DEPENDS b/graphics/lensfun/DEPENDS
index 6409049..e106143 100755
--- a/graphics/lensfun/DEPENDS
+++ b/graphics/lensfun/DEPENDS
@@ -1,7 +1,8 @@
depends python &&
depends glib2 &&
-depends libpng &&
-if [[ $LENSFUN_SCM == y ]]; then
+depends cmake &&
+optional_depends libpng '-DBUILD_AUXFUN=ON' '-DBUILD_AUXFUN=OFF' 'build
AUXFUN library?' &&
+if [[ $LENSFUN_BRANCH == scm ]]; then
depends subversion
fi &&
optional_depends doxygen '' '' 'build documentation'
diff --git a/graphics/lensfun/DETAILS b/graphics/lensfun/DETAILS
index ab73e23..cbd0149 100755
--- a/graphics/lensfun/DETAILS
+++ b/graphics/lensfun/DETAILS
@@ -1,6 +1,6 @@
SPELL=lensfun
-if [[ $LENSFUN_SCM == y ]]; then
-if [[ $LENSFUN_SCM_AUTO == y ]]; then
+if [[ $LENSFUN_BRANCH == scm ]]; then
+if [[ $LENSFUN_AUTOUPDATE == y ]]; then
VERSION=$(date +%Y%m%d)
else
VERSION=scm
@@ -12,8 +12,8 @@ fi
SOURCE_IGNORE=volatile
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-scm
else
- VERSION=0.2.5
-
SOURCE_HASH=sha512:a90292fd53fc12d82ccfd0211b8e544b18e2bd712010bf4c1cad5ad1d18f82145c399371f3699fe004571a845420f8e17f3237b45f861cb58c7ac8df8e503baa
+ VERSION=0.2.6
+
SOURCE_HASH=sha512:209ef807d0cc43dcc021709ab0f5e460fed9192a4f617c8e4e07fd6e3b0ad3863d1e1b716c38025ec5cc8b22f62708ec64b4e02f14b35f25c5767b5db1defbb1
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://download.berlios.de/$SPELL/$SOURCE
diff --git a/graphics/lensfun/HISTORY b/graphics/lensfun/HISTORY
index 39501ab..d4434b7 100644
--- a/graphics/lensfun/HISTORY
+++ b/graphics/lensfun/HISTORY
@@ -1,3 +1,9 @@
+2012-07-08 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 0.2.6
+ * DETAILS, PREPARE, DEPENDS: use prepare_select_branch
+ * DEPENDS: made dependency on libpng optional
+ * BUILD, DEPENDS: use cmake
+
2010-04-01 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.2.5

diff --git a/graphics/lensfun/PREPARE b/graphics/lensfun/PREPARE
index b3eac7f..98d27e4 100755
--- a/graphics/lensfun/PREPARE
+++ b/graphics/lensfun/PREPARE
@@ -1,7 +1,2 @@
-config_query LENSFUN_SCM "Do you want SCM version" "n" &&
-if [[ "${LENSFUN_SCM}" == "y" ]]
-then
-config_query LENSFUN_SCM_AUTO \
- "Automaticaly update the spell on sorcery queue/system-update?" \
- "n"
-fi
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm
diff --git a/graphics/mutiara/DEPENDS b/graphics/mutiara/DEPENDS
new file mode 100755
index 0000000..88bd85b
--- /dev/null
+++ b/graphics/mutiara/DEPENDS
@@ -0,0 +1,4 @@
+depends gtk+3 &&
+depends libgee &&
+depends intltool
+
diff --git a/graphics/mutiara/DETAILS b/graphics/mutiara/DETAILS
new file mode 100755
index 0000000..4e1f273
--- /dev/null
+++ b/graphics/mutiara/DETAILS
@@ -0,0 +1,13 @@
+ SPELL=mutiara
+ VERSION=0.10.0
+ SOURCE=$SPELL-$VERSION.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
+
SOURCE_HASH=sha512:c34d073746dcd3d801664c1dc778f79c4f4bbee0691f3713899e911e4a8ac14cdc7193e887489a54e5fd1c820c398cc32cbf3b76345fc34b33678c183e1edbf8
+ WEB_SITE=http://mutiara.sourceforge.net/
+ ENTERED=20120705
+ LICENSE[0]=GPL
+ SHORT="motif designer"
+cat << EOF
+Mutiara motif designer.
+EOF
diff --git a/graphics/mutiara/HISTORY b/graphics/mutiara/HISTORY
new file mode 100644
index 0000000..6948278
--- /dev/null
+++ b/graphics/mutiara/HISTORY
@@ -0,0 +1,2 @@
+2012-07-05 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS, DEPENDS: spell created, version 0.10.0
diff --git a/http/xombrero/DETAILS b/http/xombrero/DETAILS
index 875413c..3450822 100755
--- a/http/xombrero/DETAILS
+++ b/http/xombrero/DETAILS
@@ -1,5 +1,5 @@
SPELL=xombrero
- VERSION=1.0.0
+ VERSION=1.1.0
SOURCE=$SPELL-$VERSION.tgz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=https://opensource.conformal.com/snapshots/$SPELL/$SOURCE
diff --git a/http/xombrero/HISTORY b/http/xombrero/HISTORY
index a6e8d4b..cd9b47d 100644
--- a/http/xombrero/HISTORY
+++ b/http/xombrero/HISTORY
@@ -1,2 +1,6 @@
+2012-07-05 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.1.0
+ * PRE_BUILD, xombrero-TAILQ_FOREACH_SAFE.patch: upstream patch added
+
2012-06-03 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS, DEPENDS, PRE_BUILD, BUILD: spell created, version 1.0.0
diff --git a/http/xombrero/PRE_BUILD b/http/xombrero/PRE_BUILD
index ada9daf..6ece1cf 100755
--- a/http/xombrero/PRE_BUILD
+++ b/http/xombrero/PRE_BUILD
@@ -1,5 +1,7 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&

+patch -p1 < $SPELL_DIRECTORY/xombrero-TAILQ_FOREACH_SAFE.patch &&
+
sed -i "s:/local::" linux/Makefile &&
-sed -i 's:/usr/local/share/xombrero/:/usr/share/xombrero/:' xombrero.{c,conf}
+sed -i 's:/usr/local/share/xombrero/:/usr/share/xombrero/:' xombrero.conf
unix.c
diff --git a/http/xombrero/xombrero-1.0.0.tgz.sig
b/http/xombrero/xombrero-1.0.0.tgz.sig
deleted file mode 100644
index f075b80..0000000
Binary files a/http/xombrero/xombrero-1.0.0.tgz.sig and /dev/null differ
diff --git a/http/xombrero/xombrero-1.1.0.tgz.sig
b/http/xombrero/xombrero-1.1.0.tgz.sig
new file mode 100644
index 0000000..cf28fd5
Binary files /dev/null and b/http/xombrero/xombrero-1.1.0.tgz.sig differ
diff --git a/http/xombrero/xombrero-TAILQ_FOREACH_SAFE.patch
b/http/xombrero/xombrero-TAILQ_FOREACH_SAFE.patch
new file mode 100644
index 0000000..93cea4b
--- /dev/null
+++ b/http/xombrero/xombrero-TAILQ_FOREACH_SAFE.patch
@@ -0,0 +1,19 @@
+diff --git a/linux/util.h b/linux/util.h
+index 2f329bb..cce1453 100644
+--- a/linux/util.h
++++ b/linux/util.h
+@@ -39,6 +39,14 @@ int fmt_scaled(long long number, char *result);
+ #define TAILQ_END(head) NULL
+ #endif
+
++#ifndef TAILQ_FOREACH_SAFE
++#define TAILQ_FOREACH_SAFE(var, head, field, tvar) \
++ for ((var) = TAILQ_FIRST(head); \
++ (var) != TAILQ_END(head) && \
++ ((tvar) = TAILQ_NEXT(var, field), 1); \
++ (var) = (tvar))
++#endif
++
+ /*
+ * fmt_scaled(3) specific flags. (from OpenBSD util.h)
+ */
diff --git a/kde4-apps/digikam4/DETAILS b/kde4-apps/digikam4/DETAILS
index 44bade3..4e789c5 100755
--- a/kde4-apps/digikam4/DETAILS
+++ b/kde4-apps/digikam4/DETAILS
@@ -1,7 +1,7 @@
SPELL=digikam4
SPELLX=${SPELL//4}
- VERSION=2.6.0
-
SOURCE_HASH=sha512:7984e8b463a5393a4606a4f6d752c7d006cc62ada6947467c034ec5e7fdd5de12826e0f33bfb07b80bb7c83d03a29273eec618a0e7c0f5588416b94fe1d2768a
+ VERSION=2.7.0
+
SOURCE_HASH=sha512:34d33ef8b7dd0664f92bbb5f67720397f537ac46da7ad1b6c4ae854691925fe9004b27820e4ded0c6a45126429a452fdfe7f4114e381d975afbbee6d514536a9
SOURCE=${SPELLX}-$VERSION.tar.bz2
SOURCE_URL[0]=http://downloads.sourceforge.net/digikam/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELLX}-${VERSION}
diff --git a/kde4-apps/digikam4/HISTORY b/kde4-apps/digikam4/HISTORY
index 2bc6a0b..e094d89 100644
--- a/kde4-apps/digikam4/HISTORY
+++ b/kde4-apps/digikam4/HISTORY
@@ -1,3 +1,6 @@
+2012-07-09 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.7.0
+
2012-06-05 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.6.0
* PRE_BUILD, libkipi140.patch, boost148.patch: removed
diff --git a/lib/libyaml/DETAILS b/lib/libyaml/DETAILS
new file mode 100755
index 0000000..0c91b31
--- /dev/null
+++ b/lib/libyaml/DETAILS
@@ -0,0 +1,14 @@
+ SPELL=libyaml
+ VERSION=0.1.4
+ SOURCE=yaml-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/yaml-$VERSION
+ SOURCE_URL[0]=http://pyyaml.org/download/libyaml/$SOURCE
+
SOURCE_HASH=sha512:5864412b462f30e36550a1dcf52f66da9035aa17ee367bd41d0ba74d6809e281ea00c0bb78f9c2c7e08d4689f8ff6220d684dbe8dcd83cc172282c58d695d784
+ WEB_SITE=http://pyyaml.org/wiki/LibYAML
+ ENTERED=20120417
+ LICENSE[0]=MIT
+ KEYWORDS="lib"
+ SHORT="YAML parser and emitter written in C"
+cat << EOF
+yaml parser and emitter written in C
+EOF
diff --git a/lib/libyaml/HISTORY b/lib/libyaml/HISTORY
new file mode 100644
index 0000000..fc80446
--- /dev/null
+++ b/lib/libyaml/HISTORY
@@ -0,0 +1,3 @@
+2012-04-17 David Kowis<dkowis AT shlrm.org>
+ * DETAILS,HISTORY: created libyaml spell
+
diff --git a/libs/libbsd/DETAILS b/libs/libbsd/DETAILS
index bd258ae..c8895ae 100755
--- a/libs/libbsd/DETAILS
+++ b/libs/libbsd/DETAILS
@@ -1,8 +1,8 @@
SPELL=libbsd
- VERSION=0.4.1
+ VERSION=0.4.2
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_URL[0]=http://${SPELL}.freedesktop.org/releases/${SOURCE}
-
SOURCE_HASH=sha512:9b986e96ab64c96b66fc06b25c5ad198064f12019434e24e75efca427f57619f4d4f755f83e5238fb6cc0ef1eac528a7a77baab964a7635f57e019c16a635c15
+
SOURCE_HASH=sha512:973d07b39040d9a0f3ee6b347c23a7a2dee0ec9490532909e8e815679d4bbe6d2f8caedc6f84162cf684bef3819a5ad5883f41e64675c9fb7d8be4db0aa1e619
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://libbsd.freedesktop.org";
LICENSE[0]=BSD
diff --git a/libs/libbsd/HISTORY b/libs/libbsd/HISTORY
index 6a0dc99..bac003f 100644
--- a/libs/libbsd/HISTORY
+++ b/libs/libbsd/HISTORY
@@ -1,3 +1,6 @@
+2012-07-05 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.4.2
+
2012-06-03 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.4.1
* BUILD: removed
diff --git a/libs/upower/DETAILS b/libs/upower/DETAILS
index 9ccd4e6..665eb28 100755
--- a/libs/upower/DETAILS
+++ b/libs/upower/DETAILS
@@ -1,6 +1,6 @@
SPELL=upower
- VERSION=0.9.16
-
SOURCE_HASH=sha512:a38fa82b376a12c3ef17ea6998a4ad6c0410f0371ddd4403c68f6dc2edf3c762243f1721189dc8d884b74fadd74a31a5b096fa4abe2ffb84c44496cad16346bd
+ VERSION=0.9.17
+
SOURCE_HASH=sha512:f8a279d3da048164bb7bc720bb0cd590bd00ef79e1b56f211b5025acbf46016fcabc39c91ae8a16577b8c383a751c43204a49893bdbd64adb0a6259aa1e2bccd
SOURCE=$SPELL-$VERSION.tar.xz
# SOURCE_GPG=gurus.gpg:$SOURCE.sig
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/libs/upower/HISTORY b/libs/upower/HISTORY
index 3d599b0..e0fdc59 100644
--- a/libs/upower/HISTORY
+++ b/libs/upower/HISTORY
@@ -1,3 +1,6 @@
+2012-07-08 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.9.17
+
2012-05-01 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.9.16
* PRE_BUILD: removed
diff --git a/net/dhcp/BUILD b/net/dhcp/BUILD
new file mode 100755
index 0000000..9d4a7ed
--- /dev/null
+++ b/net/dhcp/BUILD
@@ -0,0 +1,5 @@
+OPTS="$DHCP_OPTS $OPTS" &&
+
+make_single &&
+default_build &&
+make_normal
diff --git a/net/dhcp/CONFIGURE b/net/dhcp/CONFIGURE
deleted file mode 100755
index 2982532..0000000
--- a/net/dhcp/CONFIGURE
+++ /dev/null
@@ -1 +0,0 @@
-config_query DHCP_DBUS "Do you want to apply the dbus patches for dhcdbd?" n
diff --git a/net/dhcp/DEPENDS b/net/dhcp/DEPENDS
index 46eeddb..cff9be0 100755
--- a/net/dhcp/DEPENDS
+++ b/net/dhcp/DEPENDS
@@ -1,6 +1,14 @@
depends groff &&
-if [[ "$DHCP_DBUS" == "y" ]]
-then
-depends dbus &&
-depends dbus-glib
-fi
+
+optional_depends openldap \
+ "--with-ldap" \
+ "--without-ldap" \
+ "for OpenLDAP support in dhcpd" &&
+
+if is_depends_enabled $SPELL openldap; then
+ config_query_option DHCP_OPTS "Enable OpenLDAP crypto support in dhcpd
(needs openldap compiled with TLS/SSL)?" n \
+ "--with-ldapcrypto" \
+ "--without-ldapcrypto"
+fi &&
+
+suggest_depends dbus "" "" "for D-Bus support in DHCP client"
diff --git a/net/dhcp/DETAILS b/net/dhcp/DETAILS
index 9e0aa53..379b72a 100755
--- a/net/dhcp/DETAILS
+++ b/net/dhcp/DETAILS
@@ -1,10 +1,11 @@
SPELL=dhcp
- VERSION=4.1.1
+ VERSION=4.2.4
+ SECURITY_PATCH=1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SPELL-$VERSION.tar.gz.asc
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=ftp://ftp.isc.org/isc/dhcp/$SOURCE
- SOURCE2_URL[0]=ftp://ftp.isc.org/isc/dhcp/$SOURCE2
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+ SOURCE_URL[0]=ftp://ftp.isc.org/isc/dhcp/$VERSION/$SOURCE
+ SOURCE2_URL[0]=ftp://ftp.isc.org/isc/dhcp/$VERSION/$SOURCE2
SOURCE_GPG=isc.gpg:$SOURCE2:UPSTREAM_KEY
WEB_SITE=http://www.isc.org/products/DHCP
LICENSE=http://www.isc.org/products/DHCP/dhcp-copyright.html
diff --git a/net/dhcp/HISTORY b/net/dhcp/HISTORY
index 9f96e7c..72c5a23 100644
--- a/net/dhcp/HISTORY
+++ b/net/dhcp/HISTORY
@@ -1,3 +1,19 @@
+2012-07-04 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 4.2.4; SECURITY_PATCH++ (several CVEs
since
+ 4.1.1); updated source urls; quoting paths
+ * CONFIGURE: dropped; dbus support for dhclient was added by upstream
+ * dhcp-3.0.3-dhclient-dbus.patch, dhcp-3.0.3-x-option.patch: removed
+ deprecated patches
+ * PRE_BUILD: dropped, not needed anymore
+ * DEPENDS: added missing openldap optional dependency; removed
dbus-glib
+ * INSTALL: use INSTALL_ROOT
+ * SUB_DEPENDS: only dbus is required to check here
+ * BUILD: added, to use DHCP_OPTS and fix multijob build
+ * init.d/dhcp: corrected leases path; added DHCPD_ARGS; force -q flag
+ (suppresses printing copyright message and other useless info for
init)
+ * init.d/dhcp.conf: added DHCPD_ARGS; corrected description (multiple
+ interfaces can be used)
+
2010-05-25 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* isc.gpg: removed, as it was still incomplete and there is a section
level one
diff --git a/net/dhcp/INSTALL b/net/dhcp/INSTALL
index 464282e..67f5531 100755
--- a/net/dhcp/INSTALL
+++ b/net/dhcp/INSTALL
@@ -1,3 +1,4 @@
-make LIBDIR=/usr/lib INCDIR=/usr/include install &&
+make LIBDIR="$INSTALL_ROOT/usr/lib" \
+ INCDIR="$INSTALL_ROOT/usr/include" install &&
install -m 644 client/dhclient.conf
$INSTALL_ROOT/etc/dhclient.conf.example &&
install -m 644 server/dhcpd.conf $INSTALL_ROOT/etc/dhcpd.conf.example
diff --git a/net/dhcp/PRE_BUILD b/net/dhcp/PRE_BUILD
deleted file mode 100755
index e2f74c8..0000000
--- a/net/dhcp/PRE_BUILD
+++ /dev/null
@@ -1,7 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-if [[ $DHCP_DBUS == y ]] ||
- [[ $DHCP_DBUS1 == y ]]; then
-patch -p0 < $SPELL_DIRECTORY/dhcp-3.0.3-dhclient-dbus.patch &&
-patch -p1 < $SPELL_DIRECTORY/dhcp-3.0.3-x-option.patch
-fi
diff --git a/net/dhcp/SUB_DEPENDS b/net/dhcp/SUB_DEPENDS
index 9df58ba..411d255 100755
--- a/net/dhcp/SUB_DEPENDS
+++ b/net/dhcp/SUB_DEPENDS
@@ -1,9 +1,6 @@
-persistent_add DHCP_DBUS1
case "$THIS_SUB_DEPENDS" in
- DBUS) message "Requested sub_depends"
- DHCP_DBUS1=y &&
- depends dbus &&
- depends dbus-glib
+ DBUS) message "Requested sub_depends" &&
+ depends dbus
;;
*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
return 1;;
diff --git a/net/dhcp/dhcp-3.0.3-dhclient-dbus.patch
b/net/dhcp/dhcp-3.0.3-dhclient-dbus.patch
deleted file mode 100644
index 579d72f..0000000
--- a/net/dhcp/dhcp-3.0.3-dhclient-dbus.patch
+++ /dev/null
@@ -1,84 +0,0 @@
---- client/scripts/bsdos
-+++ client/scripts/bsdos
-@@ -47,6 +47,11 @@
- . /etc/dhcp/dhclient-exit-hooks
- fi
- # probably should do something with exit status of the local script
-+ if [ x$dhc_dbus != x -a $exit_status -eq 0 ]; then
-+ dbus-send --system --dest=com.redhat.dhcp \
-+ --type=method_call /com/redhat/dhcp/$interface com.redhat.dhcp.set \
-+ 'string:'"`env | grep -Ev '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`"
-+ fi
- exit $exit_status
- }
-
---- client/scripts/freebsd
-+++ client/scripts/freebsd
-@@ -57,6 +57,11 @@
- . /etc/dhcp/dhclient-exit-hooks
- fi
- # probably should do something with exit status of the local script
-+ if [ x$dhc_dbus != x -a $exit_status -eq 0 ]; then
-+ dbus-send --system --dest=com.redhat.dhcp \
-+ --type=method_call /com/redhat/dhcp/$interface com.redhat.dhcp.set \
-+ 'string:'"`env | grep -Ev '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`"
-+ fi
- exit $exit_status
- }
-
---- client/scripts/linux
-+++ client/scripts/linux
-@@ -69,6 +69,11 @@
- . /etc/dhcp/dhclient-exit-hooks
- fi
- # probably should do something with exit status of the local script
-+ if [ x$dhc_dbus != x -a $exit_status -eq 0 ]; then
-+ dbus-send --system --dest=com.redhat.dhcp \
-+ --type=method_call /com/redhat/dhcp/$interface com.redhat.dhcp.set \
-+ 'string:'"`env | grep -Ev '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`"
-+ fi
- exit $exit_status
- }
-
---- client/scripts/netbsd
-+++ client/scripts/netbsd
-@@ -47,6 +47,11 @@
- . /etc/dhcp/dhclient-exit-hooks
- fi
- # probably should do something with exit status of the local script
-+ if [ x$dhc_dbus != x -a $exit_status -eq 0 ]; then
-+ dbus-send --system --dest=com.redhat.dhcp \
-+ --type=method_call /com/redhat/dhcp/$interface com.redhat.dhcp.set \
-+ 'string:'"`env | grep -Ev '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`"
-+ fi
- exit $exit_status
- }
-
---- client/scripts/openbsd
-+++ client/scripts/openbsd
-@@ -47,6 +47,11 @@
- . /etc/dhcp/dhclient-exit-hooks
- fi
- # probably should do something with exit status of the local script
-+ if [ x$dhc_dbus != x -a $exit_status -eq 0 ]; then
-+ dbus-send --system --dest=com.redhat.dhcp \
-+ --type=method_call /com/redhat/dhcp/$interface com.redhat.dhcp.set \
-+ 'string:'"`env | grep -Ev '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`"
-+ fi
- exit $exit_status
- }
-
---- client/scripts/solaris
-+++ client/scripts/solaris
-@@ -47,6 +47,11 @@
- . /etc/dhcp/dhclient-exit-hooks
- fi
- # probably should do something with exit status of the local script
-+ if [ x$dhc_dbus != x -a $exit_status -eq 0 ]; then
-+ dbus-send --system --dest=com.redhat.dhcp \
-+ --type=method_call /com/redhat/dhcp/$interface com.redhat.dhcp.set \
-+ 'string:'"`env | grep -Ev '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`"
-+ fi
- exit $exit_status
- }
-
diff --git a/net/dhcp/dhcp-3.0.3-x-option.patch
b/net/dhcp/dhcp-3.0.3-x-option.patch
deleted file mode 100644
index 5f5c1a8..0000000
--- a/net/dhcp/dhcp-3.0.3-x-option.patch
+++ /dev/null
@@ -1,216 +0,0 @@
---- dhcp-3.0.2/common/parse.c.extended_option_environment 2005-04-05
17:49:36.513062562 -0400
-+++ dhcp-3.0.2/common/parse.c 2005-04-05 17:49:36.580052656 -0400
-@@ -1270,6 +1270,10 @@
- option_hash_add (option -> universe -> hash,
- (const char *)option -> name,
- 0, option, MDL);
-+#ifdef EXTENDED_NEW_OPTION_INFO
-+ if ( new_option_info_tree != 0L )
-+ add_new_option_info( option );
-+#endif
- return 1;
- }
-
---- dhcp-3.0.2/common/tables.c.extended_option_environment 2004-09-01
13:06:35.000000000 -0400
-+++ dhcp-3.0.2/common/tables.c 2005-04-05 18:04:23.915838623 -0400
-@@ -1238,3 +1238,40 @@
- fqdn_universe.name, 0,
- &fqdn_universe, MDL);
- }
-+
-+#ifdef EXTENDED_NEW_OPTION_INFO
-+#include <search.h>
-+
-+void *new_option_info_tree = 0L;
-+
-+static int new_option_info_comparator( const void* p1, const void *p2 )
-+{
-+ uint32_t ocode1 = (((const struct option*)p1)->universe->index << 8)
-+ |(((const struct option*)p1)->code),
-+ ocode2 = (((const struct option*)p2)->universe->index << 8)
-+ |(((const struct option*)p2)->code);
-+ return( (ocode1 == ocode2)
-+ ? 0
-+ :( ( ocode1 > ocode2 )
-+ ? 1
-+ : -1
-+ )
-+ );
-+}
-+
-+void *add_new_option_info( struct option *option )
-+{
-+ if ( option->universe->index >= fqdn_universe.index )
-+ return 0L;
-+ if ( new_option_info_tree == GENERATE_NEW_OPTION_INFO )
-+ new_option_info_tree = (void*)0L;
-+ return tsearch( option, &(new_option_info_tree),
new_option_info_comparator );
-+}
-+
-+void *lookup_new_option_info( struct option *option )
-+{
-+ if ( new_option_info_tree == GENERATE_NEW_OPTION_INFO )
-+ return 0L;
-+ return tfind( option, &(new_option_info_tree),
new_option_info_comparator );
-+}
-+#endif
---- dhcp-3.0.2/includes/dhcpd.h.extended_option_environment 2004-11-24
12:39:16.000000000 -0500
-+++ dhcp-3.0.2/includes/dhcpd.h 2005-04-05 17:49:36.613047777 -0400
-@@ -1800,6 +1800,13 @@
- void initialize_common_option_spaces PROTO ((void));
- struct universe *config_universe;
-
-+#ifdef EXTENDED_NEW_OPTION_INFO
-+#define GENERATE_NEW_OPTION_INFO ((void*)1)
-+extern void *new_option_info_tree;
-+extern void *add_new_option_info( struct option*);
-+extern void *lookup_new_option_info( struct option *);
-+#endif
-+
- /* stables.c */
- #if defined (FAILOVER_PROTOCOL)
- extern failover_option_t null_failover_option;
---- dhcp-3.0.2/client/dhclient.c.extended_option_environment 2005-04-05
17:49:36.566054726 -0400
-+++ dhcp-3.0.2/client/dhclient.c 2005-04-05 17:49:36.617047185 -0400
-@@ -74,7 +74,9 @@
- int onetry=0;
- int quiet=0;
- int nowait=0;
--
-+#ifdef EXTENDED_NEW_OPTION_INFO
-+int extended_option_environment = 0;
-+#endif
- static void usage PROTO ((void));
-
- void do_release(struct client_state *);
-@@ -204,6 +206,11 @@
- } else if (!strcmp (argv [i], "--version")) {
- log_info ("isc-dhclient-%s", DHCP_VERSION);
- exit (0);
-+#ifdef EXTENDED_NEW_OPTION_INFO
-+ } else if (!strcmp (argv [i], "-x")) {
-+ extended_option_environment = 1;
-+ new_option_info_tree = GENERATE_NEW_OPTION_INFO;
-+#endif
- } else if (argv [i][0] == '-') {
- usage ();
- } else {
-@@ -572,7 +579,11 @@
- log_info (arr);
- log_info (url);
-
-+#ifdef EXTENDED_NEW_OPTION_INFO
-+ log_error ("Usage: dhclient [-1dqr] [-nwx] [-p <port>] %s",
-+#else
- log_error ("Usage: dhclient [-1dqr] [-nw] [-p <port>] %s",
-+#endif
- "[-s server]");
- log_error (" [-cf config-file] [-lf lease-file]%s",
- "[-pf pid-file] [-e VAR=val]");
-@@ -2529,8 +2540,28 @@
- struct envadd_state {
- struct client_state *client;
- const char *prefix;
-+ struct universe *universe;
- };
-
-+#ifdef EXTENDED_NEW_OPTION_INFO
-+static
-+void build_universe_info_envvar
-+( struct option_cache *oc,
-+ struct packet *p, struct lease *l,
-+ struct client_state *client,
-+ struct option_state *in_o,
-+ struct option_state *cf_o,
-+ struct binding_scope **scope,
-+ struct universe *u, void *es
-+)
-+{
-+ char info_name[512], info_data[512];
-+ snprintf(info_name, 512, "%s._universe_.", oc->option->universe->name);
-+ snprintf(info_data, 512, "%u:%s", oc->option->code,oc->option->format);
-+ client_envadd( client, info_name, oc->option->name, info_data );
-+}
-+#endif
-+
- void client_option_envadd (struct option_cache *oc,
- struct packet *packet, struct lease *lease,
- struct client_state *client_state,
-@@ -2547,6 +2578,31 @@
- in_options, cfg_options, scope, oc, MDL)) {
- if (data.len) {
- char name [256];
-+#ifdef EXTENDED_NEW_OPTION_INFO
-+ if ( extended_option_environment )
-+ {
-+ if( ( oc->option->universe != &dhcp_universe
)
-+ &&( oc->option->universe->index >
fqdn_universe.index )
-+ &&( es->universe != oc->option->universe )
-+ )
-+ {
-+ es->universe = oc->option->universe;
-+ (*(es->universe->foreach))
-+ ( (struct packet *)0, (struct
lease *)0,
-+ client_state,
-+ in_options, cfg_options,
-+ scope, es->universe, es,
-+ build_universe_info_envvar
-+ );
-+ }else
-+ if ( lookup_new_option_info(oc->option) != 0L
)
-+ build_universe_info_envvar
-+ ( oc, packet, lease,
client_state,
-+ in_options, cfg_options,
scope,
-+ oc->option->universe, es
-+ );
-+ }
-+#endif
- if (dhcp_option_ev_name (name, sizeof name,
- oc -> option)) {
- client_envadd (es -> client, es -> prefix,
-@@ -2575,6 +2631,7 @@
-
- es.client = client;
- es.prefix = prefix;
-+ es.universe = 0L;
-
- client_envadd (client,
- prefix, "ip_address", "%s", piaddr (lease -> address));
-@@ -2788,7 +2845,14 @@
- s = option -> name;
- if (j + 1 == buflen)
- return 0;
-+#ifdef EXTENDED_NEW_OPTION_INFO
-+ if ( ! extended_option_environment )
-+ buf [j++] = '_';
-+ else
-+ buf [j++] = '.';
-+#else
- buf [j++] = '_';
-+#endif
- }
- ++i;
- } while (i != 2);
---- dhcp-3.0.2/client/dhclient.8.extended_option_environment 2004-09-29
19:01:46.000000000 -0400
-+++ dhcp-3.0.2/client/dhclient.8 2005-04-05 17:49:36.619046889 -0400
-@@ -78,6 +78,9 @@
- .B -w
- ]
- [
-+.B -x
-+]
-+[
- .I if0
- [
- .I ...ifN
-@@ -252,6 +255,10 @@
- supplying the
- .B -nw
- flag.
-+.PP
-+The -x argument enables eXtended option information to be created in the
-+-s dhclient-script environment, which would allow applications running
-+in that environment to handle options they do not know about in advance.
- .SH CONFIGURATION
- The syntax of the dhclient.conf(5) file is discussed separately.
- .SH OMAPI
diff --git a/net/dhcp/init.d/dhcp b/net/dhcp/init.d/dhcp
index 0890691..4607cc1 100644
--- a/net/dhcp/init.d/dhcp
+++ b/net/dhcp/init.d/dhcp
@@ -4,11 +4,11 @@

RUNLEVEL=3
PROGRAM=/usr/sbin/dhcpd
-ARGS="$DEVICE"
+ARGS="-q $DHCPD_ARGS $DEVICE"
NEEDS="+network +remote_fs"

. /etc/init.d/smgl_init

-if [ ! -f /var/state/dhcp/dhcpd.leases ] ; then
- touch /var/state/dhcp/dhcpd.leases
+if [ ! -f /var/db/dhcpd.leases ] ; then
+ touch /var/db/dhcpd.leases
fi
diff --git a/net/dhcp/init.d/dhcp.conf b/net/dhcp/init.d/dhcp.conf
index 61a2b07..1a0898c 100644
--- a/net/dhcp/init.d/dhcp.conf
+++ b/net/dhcp/init.d/dhcp.conf
@@ -1,3 +1,6 @@
-# Device which you want the DHCP server to listen on
+# Device(s) which you want the DHCP server to listen on
# Leave blank if you want to listen on all devices
-DEVICE=eth1
+DEVICE="eth1"
+
+# For the arguments and description see dhcpd(8)
+DHCPD_ARGS=""
diff --git a/net/ethtool/DETAILS b/net/ethtool/DETAILS
index 2630273..503f878 100755
--- a/net/ethtool/DETAILS
+++ b/net/ethtool/DETAILS
@@ -1,9 +1,9 @@
SPELL=ethtool
- VERSION=3.2
+ VERSION=3.4.1
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$KERNEL_URL/pub/software/network/ethtool/$SOURCE
-
SOURCE_HASH=sha512:ecb23d68c40014bf61cb7e592e593e5cd52bdf4e8073991d33fff1d070e76908275442b2609c093b6a3ccd950352ce152b941d1f25953b1e7758eb74ad1ae3f5
+
SOURCE_HASH=sha512:10dcd1594b41a8aba34975d3b751237419c77741d11f28e18bf35db90fc6aa0b85d35a378b40c092175e32721a7062edd2649fe0e5f6af8776d895aac7cf18af
WEB_SITE=http://www.kernel.org/pub/software/network/ethtool/
LICENSE[0]=GPL
ENTERED=20040702
diff --git a/net/ethtool/HISTORY b/net/ethtool/HISTORY
index 407905f..6fa39ef 100644
--- a/net/ethtool/HISTORY
+++ b/net/ethtool/HISTORY
@@ -1,3 +1,6 @@
+2012-07-09 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 3.4.1
+
2012-01-16 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 3.2

diff --git a/net/hostapd/BUILD b/net/hostapd/BUILD
new file mode 100755
index 0000000..93af546
--- /dev/null
+++ b/net/hostapd/BUILD
@@ -0,0 +1,43 @@
+cd "$SOURCE_DIRECTORY/hostapd" &&
+
+local VARS="CONFIG_DEBUG_FILE CONFIG_DRIVER_HOSTAP CONFIG_DRIVER_NL80211 \
+ CONFIG_DRIVER_NONE CONFIG_DRIVER_RADIUS_ACL CONFIG_DRIVER_WIRED \
+ CONFIG_EAP CONFIG_EAP_AKA CONFIG_EAP_AKA_PRIME CONFIG_EAP_GPSK \
+ CONFIG_EAP_GPSK_SHA256 CONFIG_EAP_GTC CONFIG_EAP_IKEV2 \
+ CONFIG_EAP_MD5 CONFIG_EAP_MSCHAPV2 CONFIG_EAP_PAX
CONFIG_EAP_PEAP \
+ CONFIG_EAP_PSK CONFIG_EAP_PWD CONFIG_EAP_SAKE CONFIG_EAP_SIM \
+ CONFIG_EAP_TLS CONFIG_EAP_TNC CONFIG_EAP_TTLS \
+ CONFIG_FULL_DYNAMIC_VLAN CONFIG_IAPP CONFIG_IEEE80211N \
+ CONFIG_IEEE80211R CONFIG_IEEE80211W CONFIG_INTERWORKING
CONFIG_IPV6 \
+ CONFIG_LIBNL32 CONFIG_NO_ACCOUNTING CONFIG_NO_DUMP_STATE \
+ CONFIG_NO_RADIUS CONFIG_NO_RANDOM_POOL CONFIG_NO_STDOUT_DEBUG \
+ CONFIG_NO_VLAN CONFIG_PEERKEY CONFIG_PKCS12 CONFIG_RADIUS_SERVER
\
+ CONFIG_RSN_PREAUTH CONFIG_WPA_TRACE CONFIG_WPS CONFIG_WPS2 \
+ CONFIG_WPS_UPNP" &&
+
+# TLS support
+VARS="CONFIG_TLS CONFIG_TLSV11 $VARS" &&
+
+# untested
+#if [[ $CONFIG_DRIVER_MADWIFI == y ]]; then
+# VARS="CONFIG_DRIVER_MADWIFI $VARS" &&
+# echo "CFLAGS += -I/usr/include/madwifi" >> .config
+#fi &&
+
+if [[ $CONFIG_DRIVER_NL80211 == y ]]; then
+ persistent_add CONFIG_LIBNL32 &&
+ CONFIG_LIBNL32=y &&
+ echo "CFLAGS += -I$INSTALL_ROOT/usr/include/libnl3" >> .config
+fi &&
+
+# Create .config file for make
+for v in $VARS; do
+ if [[ -n ${!v} && ${!v} != n ]]; then
+ echo "$v=${!v:-y}" >> .config
+ fi
+done &&
+
+# Print config for sorcery compile log
+cat .config &&
+
+make
diff --git a/net/hostapd/CONFIGURE b/net/hostapd/CONFIGURE
new file mode 100755
index 0000000..d175881
--- /dev/null
+++ b/net/hostapd/CONFIGURE
@@ -0,0 +1,100 @@
+config_query_list CONFIG_TLS "Select TLS library to use:" \
+ openssl \
+ gnutls \
+ nss \
+ internal \
+ none &&
+
+config_query CONFIG_TLSV11 "Enable TLS v1.1 to get a stronger construction
of messages when block ciphers are used?" n &&
+
+#
+# Drivers
+#
+config_query CONFIG_DRIVER_HOSTAP "Build driver interface for Host AP
driver?" y &&
+config_query CONFIG_DRIVER_WIRED "Build driver interface for wired
authenticator?" n &&
+config_query CONFIG_DRIVER_NL80211 "Build driver interface for drivers using
the nl80211 kernel interface?" y &&
+config_query CONFIG_DRIVER_NONE "Build driver interface for no driver (e.g.,
RADIUS server only)?" n &&
+# untested
+#config_query CONFIG_DRIVER_MADWIFI "Build driver interface for madwifi
driver?" n &&
+
+#
+# IEEE 802.11 options
+#
+config_query CONFIG_IAPP "Enable IEEE 802.11F/IAPP support?" y &&
+config_query CONFIG_RSN_PREAUTH "Enable WPA2/IEEE 802.11i RSN
pre-authentication support?" y &&
+config_query CONFIG_PEERKEY "Enable PeerKey handshake for Station to Station
Link (IEEE 802.11e DLS) support?" y &&
+config_query CONFIG_IEEE80211W "Enable IEEE 802.11w (management frame
protection) support (experimental)?" n &&
+
+#
+# EAP server
+#
+config_query CONFIG_EAP "Build integrated EAP server?" y &&
+
+if [[ $CONFIG_EAP == y ]]; then
+ config_query CONFIG_EAP_MD5 "Enable EAP-MD5 support for the integrated EAP
server?" y &&
+ config_query CONFIG_EAP_TLS "Enable EAP-TLS support for the integrated EAP
server?" y &&
+ config_query CONFIG_EAP_MSCHAPV2 "Enable EAP-MSCHAPv2 support for the
integrated EAP server" y &&
+ config_query CONFIG_EAP_PEAP "Enable EAP-PEAP support for the integrated
EAP server?" y &&
+ config_query CONFIG_EAP_GTC "Enable EAP-GTC support for the integrated EAP
server?" y &&
+ config_query CONFIG_EAP_TTLS "Enable EAP-TTLS support for the integrated
EAP server?" y &&
+ config_query CONFIG_EAP_SIM "Enable EAP-SIM support for the integrated EAP
server?" n &&
+ config_query CONFIG_EAP_AKA "Enable EAP-AKA support for the integrated EAP
server?" n &&
+
+ if [[ $CONFIG_EAP_AKA == y ]]; then
+ config_query CONFIG_EAP_AKA_PRIME "Enable EAP-AKA' support for the
integrated EAP server?" n
+ fi &&
+
+ config_query CONFIG_EAP_PAX "Enable EAP-PAX support for the integrated EAP
server?" n &&
+ config_query CONFIG_EAP_PSK "Enable EAP-PSK support for the integrated EAP
server?" n &&
+ config_query CONFIG_EAP_PWD "Enable EAP-pwd support for the integrated EAP
server (secure authentication with a password)?" n &&
+ config_query CONFIG_EAP_SAKE "Enable EAP-SAKE support for the integrated
EAP server?" n &&
+ config_query CONFIG_EAP_GPSK "Enable EAP-GPSK support for the integrated
EAP server?" n &&
+
+ if [[ $CONFIG_EAP_GPSK == y ]]; then
+ config_query CONFIG_EAP_GPSK_SHA256 "Include support for optional SHA256
cipher suite in EAP-GPSK?" n
+ fi &&
+
+ config_query CONFIG_EAP_IKEV2 "Enable EAP-IKEv2 support?" n &&
+ config_query CONFIG_EAP_TNC "Enable Trusted Network Connect (EAP-TNC)
support?" n
+
+ config_query CONFIG_WPS "Enable Wi-Fi Protected Setup (WPS)?" n &&
+
+ if [[ $CONFIG_WPS == y ]]; then
+ config_query CONFIG_WPS2 "Enable WSC 2.0 support?" n &&
+ config_query CONFIG_WPS_UPNP "Enable UPnP support for external WPS
Registrars?" n
+ fi &&
+
+ config_query CONFIG_PKCS12 "Enable PKCS#12 (PFX) support?" y &&
+
+ config_query CONFIG_NO_RADIUS "Remove support for RADIUS?" n &&
+
+ if [[ $CONFIG_NO_RADIUS == n ]]; then
+ config_query CONFIG_RADIUS_SERVER "Enable RADIUS authentication server
(provides access to the integrated EAP server from external hosts using
RADIUS)?" n &&
+
+ if [[ $CONFIG_RADIUS_SERVER == y ]]; then
+ config_query CONFIG_IPV6 "Build IPv6 support for RADIUS operations?" y
+ fi &&
+
+ config_query CONFIG_DRIVER_RADIUS_ACL "Use the hostapd's IEEE 802.11
authentication (ACL), but without the IEEE 802.11 Management capability?" n
+ config_query CONFIG_NO_ACCOUNTING "Remove support for RADIUS
accounting?" n
+ fi &&
+
+ config_query CONFIG_IEEE80211R "Enable IEEE Std 802.11r-2008 (Fast BSS
Transition)?" n &&
+ config_query CONFIG_IEEE80211N "Enable IEEE 802.11n (High Throughput)
support?" n &&
+
+ config_query CONFIG_NO_VLAN "Remove support for VLANs?" n &&
+
+ if [[ $CONFIG_NO_VLAN == n ]]; then
+ config_query CONFIG_FULL_DYNAMIC_VLAN "Enable support for fully dynamic
VLANs (enables hostapd to automatically create bridge and VLAN interfaces if
necessary)?" n
+ fi
+fi &&
+
+#
+# Debugging/OS options
+#
+config_query CONFIG_NO_STDOUT_DEBUG "Remove debugging code that is printing
out debug messages to stdout?" n &&
+config_query CONFIG_DEBUG_FILE "Add support for writing debug log to a
file?" n &&
+config_query CONFIG_NO_DUMP_STATE "Remove support for dumping state into a
file on SIGUSR1 signal?" n &&
+config_query CONFIG_WPA_TRACE "Enable tracing code for developer debugging?"
n &&
+config_query CONFIG_NO_RANDOM_POOL "Disable internal hostapd random pool in
favour of /dev/urandom?" n &&
+config_query CONFIG_INTERWORKING "Enable Interworking (IEEE 802.11u)
support?" n
diff --git a/net/hostapd/DEPENDS b/net/hostapd/DEPENDS
new file mode 100755
index 0000000..203504e
--- /dev/null
+++ b/net/hostapd/DEPENDS
@@ -0,0 +1,16 @@
+# untested
+#if [[ $CONFIG_DRIVER_MADWIFI == y ]]; then
+# depends madwifi
+#fi &&
+
+if [[ $CONFIG_DRIVER_NL80211 == y ]]; then
+ depends libnl
+fi &&
+
+if [[ $CONFIG_TLS != internal && $CONFIG_TLS != none ]]; then
+ depends $CONFIG_TLS
+fi &&
+
+if [[ $CONFIG_EAP_SIM == y || $CONFIG_EAP_AKA == y ]]; then
+ depends pcsc-lite
+fi
diff --git a/net/hostapd/DETAILS b/net/hostapd/DETAILS
new file mode 100755
index 0000000..9529ff5
--- /dev/null
+++ b/net/hostapd/DETAILS
@@ -0,0 +1,21 @@
+ SPELL=hostapd
+ VERSION=1.0
+ SOURCE=$SPELL-$VERSION.tar.gz
+ SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+ SOURCE_URL[0]=http://hostap.epitest.fi/releases/$SOURCE
+ LICENSE[0]=GPL
+ DOCS="README*"
+ WEB_SITE=http://hostap.epitest.fi/hostapd/
+ ENTERED=20120705
+ SHORT="IEEE 802.11 AP, IEEE 802.1X/WPA/WPA2/EAP/RADIUS
Authenticator"
+cat << EOF
+hostapd is a user space daemon for access point and authentication servers.
+It implements IEEE 802.11 access point management, IEEE 802.1X/WPA/WPA2/EAP
+Authenticators, RADIUS client, EAP server, and RADIUS authentication server.
+
+hostapd is designed to be a "daemon" program that runs in the background and
acts
+as the backend component controlling authentication. hostapd supports
separate
+frontend programs and an example text-based frontend, hostapd_cli, is
included
+with hostapd.
+EOF
diff --git a/net/hostapd/FINAL b/net/hostapd/FINAL
new file mode 100755
index 0000000..4d77b56
--- /dev/null
+++ b/net/hostapd/FINAL
@@ -0,0 +1,4 @@
+message "${MESSAGE_COLOR}If you installed the init script you probably" \
+ "need to edit\n/etc/sysconfig/hostapd and" \
+ "/etc/hostapd/hostapd.conf\nto configure hardware and network" \
+ "settings.${DEFAULT_COLOR}"
diff --git a/net/hostapd/HISTORY b/net/hostapd/HISTORY
new file mode 100644
index 0000000..7a610d3
--- /dev/null
+++ b/net/hostapd/HISTORY
@@ -0,0 +1,3 @@
+2012-07-05 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS, {PRE_,}BUILD, CONFIGURE, DEPENDS, FINAL, INSTALL,
+ init.d/hostapd{,.conf}: spell created
diff --git a/net/hostapd/INSTALL b/net/hostapd/INSTALL
new file mode 100755
index 0000000..de421c1
--- /dev/null
+++ b/net/hostapd/INSTALL
@@ -0,0 +1,20 @@
+cd "$SOURCE_DIRECTORY/hostapd" &&
+
+make DESTDIR="$INSTALL_ROOT" install &&
+
+install -vm 755 -d "$INSTALL_ROOT/usr/share/man/man1" \
+ "$INSTALL_ROOT/usr/share/man/man8"
+
+install -vm 644 *.1 "$INSTALL_ROOT/usr/share/man/man1" &&
+install -vm 644 *.8 "$INSTALL_ROOT/usr/share/man/man8" &&
+
+install -vm 755 -d "$INSTALL_ROOT/usr/share/doc/hostapd" &&
+
+for c in hostapd.accept hostapd.conf hostapd.deny hostapd.eap_user
wired.conf \
+ hostapd.radius_clients hostapd.sim_db hostapd.vlan hostapd.wpa_psk;
do
+ install -vm 644 "$c" "$INSTALL_ROOT/usr/share/doc/hostapd/$c"
+done &&
+
+if [[ $INIT_INSTALLED ]]; then
+ install_config_file hostapd.conf "$INSTALL_ROOT/etc/hostapd/hostapd.conf"
+fi
diff --git a/net/hostapd/PRE_BUILD b/net/hostapd/PRE_BUILD
new file mode 100755
index 0000000..8053703
--- /dev/null
+++ b/net/hostapd/PRE_BUILD
@@ -0,0 +1,8 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+# /etc/hostapd.* -> /etc/hostapd/hostapd.*
+sedit "s:/etc/hostapd:/etc/hostapd/hostapd:g" hostapd/hostapd.conf &&
+
+# INSTALL_ROOT will be used in INSTALL
+sedit "s:/usr/local:/usr:g" hostapd/Makefile
diff --git a/net/hostapd/hostapd-1.0.tar.gz.sig
b/net/hostapd/hostapd-1.0.tar.gz.sig
new file mode 100644
index 0000000..c82f348
Binary files /dev/null and b/net/hostapd/hostapd-1.0.tar.gz.sig differ
diff --git a/net/hostapd/init.d/hostapd b/net/hostapd/init.d/hostapd
new file mode 100755
index 0000000..bbbd5fb
--- /dev/null
+++ b/net/hostapd/init.d/hostapd
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+. /etc/sysconfig/hostapd
+
+PROGRAM=/usr/bin/hostapd
+PIDFILE=/var/run/hostapd.pid
+ARGS="-B -P $PIDFILE $HOSTAPD_ARGS /etc/hostapd/hostapd.conf"
+NEEDS="+network"
+RUNLEVEL=3
+
+. /etc/init.d/smgl_init
diff --git a/net/hostapd/init.d/hostapd.conf b/net/hostapd/init.d/hostapd.conf
new file mode 100644
index 0000000..b316863
--- /dev/null
+++ b/net/hostapd/init.d/hostapd.conf
@@ -0,0 +1,2 @@
+# For the arguments and description see hostapd(8)
+HOSTAPD_ARGS=""
diff --git a/python-pypi/alembic/DETAILS b/python-pypi/alembic/DETAILS
index aa83ca7..b7f7f67 100755
--- a/python-pypi/alembic/DETAILS
+++ b/python-pypi/alembic/DETAILS
@@ -1,6 +1,6 @@
SPELL=alembic
- VERSION=0.3.4
-
SOURCE_HASH=sha512:e776d746225614b953d1bf3feaa2de7ca3ad04919a470e9c6454101598a10f1b78a87b07ba29e22ec968637884ffb6f4971b8b9600a7388f3ad088a55ba5e2f9
+ VERSION=0.3.5
+
SOURCE_HASH=sha512:e86fb3e8268afcf31f409576fc84c3bddf6184dd4338e1fa20b4c642f05aae0053e7f49c0b5fd8af3916c693284aae20515b6447c13a164fafe0997dfa0576ef
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=http://pypi.python.org/packages/source/a/$SPELL/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/python-pypi/alembic/HISTORY b/python-pypi/alembic/HISTORY
index de594be..c1ad44f 100644
--- a/python-pypi/alembic/HISTORY
+++ b/python-pypi/alembic/HISTORY
@@ -1,3 +1,6 @@
+2012-07-09 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.3.5
+
2012-06-03 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.3.4

diff --git a/security-libs/linux-pam/CONFIGURE
b/security-libs/linux-pam/CONFIGURE
index 7be2652..2d2a55e 100755
--- a/security-libs/linux-pam/CONFIGURE
+++ b/security-libs/linux-pam/CONFIGURE
@@ -13,5 +13,4 @@ config_query PAM_CHKPWD_SUID
\
$chkpwd_suid_default &&

config_query PAM_SECTTY "Install a default /etc/securetty?" n &&
-config_query PAM_SELINUX "Enable selinux support?" n &&
config_query PAM_DOCS "Build documentation?" n
diff --git a/security-libs/linux-pam/DEPENDS b/security-libs/linux-pam/DEPENDS
index 624982e..dac999b 100755
--- a/security-libs/linux-pam/DEPENDS
+++ b/security-libs/linux-pam/DEPENDS
@@ -4,13 +4,10 @@ depends cracklib &&
depends gnupg &&
depends smgl-fhs &&

-if [ "${PAM_SELINUX}" == "y" ]; then
- depends libselinux
-fi &&
-
if [ "${PAM_DOCS}" == "y" ]; then
depends texlive &&
depends linuxdoc-tools
fi

+optional_depends libselinux "--enable-selinux" "--disable-selinux" "for
selinux support" &&
optional_depends libprelude "--enable-prelude" "--disable-prelude" "for
prelude ids support"
diff --git a/security-libs/linux-pam/HISTORY b/security-libs/linux-pam/HISTORY
index a06b8d7..de5fc5c 100644
--- a/security-libs/linux-pam/HISTORY
+++ b/security-libs/linux-pam/HISTORY
@@ -1,3 +1,9 @@
+2012-07-07 Sukneet Basuta <sukneet AT sourcemage.org>
+ * CONFIGURE: remove config_query for SELINUX
+ * DEPENDS: switch to optional_depends for selinux to pass proper
flags
+ * INSTALL: fix commented out check for libselinux in case
+ someone needs it
+
2011-12-25 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.1.5, SECURITY_PATCH=3
http://www.redhat.com/archives/pam-list/2011-October/msg00019.html
diff --git a/security-libs/linux-pam/INSTALL b/security-libs/linux-pam/INSTALL
index 05d02bc..131a9f3 100755
--- a/security-libs/linux-pam/INSTALL
+++ b/security-libs/linux-pam/INSTALL
@@ -6,7 +6,7 @@ fi &&

# this is a BUG, the SA should decide if/when selinux is configured
# properly. Activating it before that breaks login, which is BAD.
-#if [ "$PAM_SELINUX" == "y" ]; then
+#if is_depends_enabled $SPELL libselinux; then
# echo "session required pam_selinux.so multiple" >>
/etc/pam.d/login
#fi &&

diff --git a/utils/colordiff/DETAILS b/utils/colordiff/DETAILS
index 5db3972..97a1cbd 100755
--- a/utils/colordiff/DETAILS
+++ b/utils/colordiff/DETAILS
@@ -1,10 +1,10 @@
SPELL=colordiff
- VERSION=1.0.9
+ VERSION=1.0.10
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://colordiff.sourceforge.net/$SOURCE
# SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:d7f7c4655c87cd20c70a030beb3d286b5db3aaf22c2a37a797b2b1329a56d7aea0af3d32a2159dc64e71ba8fe318b238917117a94e55ca2a751e5556110ce8a8
+
SOURCE_HASH=sha512:b9dfba651adde06c62b83a127a5c6ced2a8cfd0c3619d9abe58a25c18c55c17dec818d477c065f3971a784836ec63895cf150c48491fa7dafebbe92596a515ca
WEB_SITE=http://colordiff.sourceforge.net/
ENTERED=20050902
LICENSE[0]=GPL
diff --git a/utils/colordiff/HISTORY b/utils/colordiff/HISTORY
index f7d48e5..485414b 100644
--- a/utils/colordiff/HISTORY
+++ b/utils/colordiff/HISTORY
@@ -1,3 +1,6 @@
+2012-07-09 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.0.10
+
2009-04-25 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.0.9

diff --git a/utils/dbus-glib/DETAILS b/utils/dbus-glib/DETAILS
index e329db7..0352b80 100755
--- a/utils/dbus-glib/DETAILS
+++ b/utils/dbus-glib/DETAILS
@@ -1,6 +1,6 @@
SPELL=dbus-glib
- VERSION=0.98
-
SOURCE_HASH=sha512:aaa63b46f09340b68655378b2890c20a359336ba43e6113bea801a1b219e459df909d518cfacae2ebd10a6a1470f362f915c372e2d905baa1510eddd2aced544
+ VERSION=0.100
+
SOURCE_HASH=sha512:b1b9687ba0ce60393cd5b7b71804669a95f22b1c659d4bf02cc67c3e85302732b954009e24987c6ce3694eb31eebcc439e1d8222a3d4bd8631106e4015a35228
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://dbus.freedesktop.org/releases/$SPELL/$SOURCE
diff --git a/utils/dbus-glib/HISTORY b/utils/dbus-glib/HISTORY
index 06ee377..d277fc5 100644
--- a/utils/dbus-glib/HISTORY
+++ b/utils/dbus-glib/HISTORY
@@ -1,3 +1,6 @@
+2012-07-09 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.100
+
2011-10-06 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.98

diff --git a/utils/dbus-python/DETAILS b/utils/dbus-python/DETAILS
index 3f6c409..c526a2a 100755
--- a/utils/dbus-python/DETAILS
+++ b/utils/dbus-python/DETAILS
@@ -1,6 +1,6 @@
SPELL=dbus-python
- VERSION=1.1.0
-
SOURCE_HASH=sha512:e5a3a771ca4a94c4f0fdc0db319c0ac166f2b2772436cf0d8ce763ff1e71381e5cd39e3251970dfc2497c0f6eefeb36e7baf0d3235c95723afe2e3742916dee0
+ VERSION=1.1.1
+
SOURCE_HASH=sha512:6ac128594b616e6b1b523a9395d38752f241d14dc888616c5ec3622d49b9641fff8784cda3ab1941f49bb55df05f74ae72a88ec739a7688189e2feae84b855da
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://dbus.freedesktop.org/releases/$SPELL/$SOURCE
diff --git a/utils/dbus-python/HISTORY b/utils/dbus-python/HISTORY
index 9f2f79f..bf418e6 100644
--- a/utils/dbus-python/HISTORY
+++ b/utils/dbus-python/HISTORY
@@ -1,3 +1,6 @@
+2012-07-09 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.1.1
+
2012-05-13 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.1.0

diff --git a/utils/dbus/DETAILS b/utils/dbus/DETAILS
index 2fe1449..e9b90a9 100755
--- a/utils/dbus/DETAILS
+++ b/utils/dbus/DETAILS
@@ -1,6 +1,6 @@
SPELL=dbus
- VERSION=1.6.0
-
SOURCE_HASH=sha512:1011bf1bf43e795cfd39a5d2d092bbae8b4679d9f9a6a6565d9ca0246c484d7fb413c7f7e64c39e532741140d214393847b7db1c6a8d50cacd42ccbbff6ff0ba
+ VERSION=1.6.2
+
SOURCE_HASH=sha512:c53b3cc2251ccf88918f8080a922a10d6cb755900a78978df8ba5c19e100c94adafb8e0790d9a753c20d81e1fb5fda5d02b52653acedc5dddb60d8f65c061d7c
SECURITY_PATCH=7
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/utils/dbus/HISTORY b/utils/dbus/HISTORY
index 5777021..0c2f8c5 100644
--- a/utils/dbus/HISTORY
+++ b/utils/dbus/HISTORY
@@ -1,3 +1,6 @@
+2012-07-09 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.6.2
+
2012-06-17 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.6.0

diff --git a/utils/usbutils/DETAILS b/utils/usbutils/DETAILS
index e85358e..eb32c79 100755
--- a/utils/usbutils/DETAILS
+++ b/utils/usbutils/DETAILS
@@ -1,11 +1,12 @@
SPELL=usbutils
- VERSION=004
+ VERSION=006
SOURCE=$SPELL-$VERSION.tar.bz2
- SOURCE2=$SOURCE.sign
-
SOURCE_URL[0]=http://ftp.sunet.se/pub/Linux/kernel.org/linux/utils/usb/usbutils/$SOURCE
- SOURCE2_URL[0]=$SOURCE_URL.sign
- SOURCE_GPG=kernel.gpg:$SOURCE2:UPSTREAM_KEY
- SOURCE2_IGNORE=signature
+# SOURCE2=$SOURCE.sign
+ SOURCE_URL[0]=$KERNEL_URL/pub/linux/utils/usb/usbutils/$SOURCE
+
SOURCE_HASH=sha512:0f903065a86a9fca353c04cc8074c6f145331fd5e7409769e35286722b2d78902f9be089b14e66368b34265149431d2d4d6288edfd5ce8a3d63ffbefb12941e4
+# SOURCE2_URL[0]=$SOURCE_URL.sign
+# SOURCE_GPG=kernel.gpg:$SOURCE2:UPSTREAM_KEY
+# SOURCE2_IGNORE=signature
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://www.linux-usb.org/
ENTERED=20021218
diff --git a/utils/usbutils/HISTORY b/utils/usbutils/HISTORY
index baa2f93..39d767a 100644
--- a/utils/usbutils/HISTORY
+++ b/utils/usbutils/HISTORY
@@ -1,3 +1,6 @@
+2012-07-08 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 006, SOURCE_URL[0] updated
+
2012-05-09 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: libusb => LIBUSB

diff --git a/video/totem/DEPENDS b/video/totem/DEPENDS
index aef5db9..8f303b3 100755
--- a/video/totem/DEPENDS
+++ b/video/totem/DEPENDS
@@ -1,13 +1,13 @@
depends pylint &&
depends glib2 &&
depends gmime &&
-depends gtk+2 &&
+depends gtk+3 &&
depends gnome-vfs2 &&
depends gnome-desktop &&
depends gnome-icon-theme &&
depends iso-codes &&
depends totem-pl-parser &&
-depends gst-plugins-good &&
+depends gst-plugins-base &&
depends libxslt &&
depends libpeas &&

@@ -64,4 +64,12 @@ optional_depends dbus-glib \
"" \
"for dbus remote control" &&

-optional_depends libgdata "" "" "for youtube plugin"
+optional_depends libgdata "" "" "for youtube plugin" &&
+
+suggest_depends gst-plugins-good "" "" "The plug-ins for most Open formats
(Highly recommended)" &&
+
+suggest_depends gst-plugins-ugly "" "" "for good-quality plug-ins that might
pose distribution problems, needed for DVD playback" &&
+
+suggest_depends gst-plugins-bad "" "" "a set of plug-ins that need more
work, needed for DVD playback as well" &&
+
+suggest_depends gst-ffmpeg "" "" "FFmpeg-based plug-in, contains all the
basic decoders for popular codecs, such as DivX and WMV"
diff --git a/video/totem/DETAILS b/video/totem/DETAILS
index 2bbb53f..b4b0ef4 100755
--- a/video/totem/DETAILS
+++ b/video/totem/DETAILS
@@ -1,5 +1,5 @@
SPELL=totem
- VERSION=3.4.2
+ VERSION=3.4.3
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/video/totem/HISTORY b/video/totem/HISTORY
index 86e8b9b..376421a 100644
--- a/video/totem/HISTORY
+++ b/video/totem/HISTORY
@@ -1,3 +1,11 @@
+2012-07-05 Sukneet Basuta <sukneet AT sourcemage.org>
+ * DETAILS: updated spell to 3.4.3
+ * DEPENDS: gtk+2 -> gtk+3
+ Removed depends gst-plugins-good.
+ Added depends gst-plugins-base.
+ Added suggest depends gst-plugins-good, gst-plugins-ugly,
+ gst-plugins-bad, and gst-ffmpeg.
+
2012-05-17 Sukneet Basuta <sukneet AT sourcemage.org>
* DETAILS: updated spell to 3.4.2

diff --git a/video/totem/totem-3.4.2.tar.xz.sig
b/video/totem/totem-3.4.2.tar.xz.sig
deleted file mode 100644
index 5fa7718..0000000
Binary files a/video/totem/totem-3.4.2.tar.xz.sig and /dev/null differ
diff --git a/video/totem/totem-3.4.3.tar.xz.sig
b/video/totem/totem-3.4.3.tar.xz.sig
new file mode 100644
index 0000000..09a05db
Binary files /dev/null and b/video/totem/totem-3.4.3.tar.xz.sig differ
diff --git a/video/vlc/HISTORY b/video/vlc/HISTORY
index 8c007d4..51867b5 100644
--- a/video/vlc/HISTORY
+++ b/video/vlc/HISTORY
@@ -1,3 +1,8 @@
+2012-07-06 Sukneet Basuta <sukneet AT sourcemage.org>
+ * PRE_BUILD: apply lua 5.2 fixes
+ * lua.patch, lua-scripts.patch: added, applies fixes for lua 5.2
+ from upstream. I assume this will be in the next major update
+
2012-06-30 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.0.2, SECURITY_PATCH=24
* PRE_BUILD, glx.patch: patch removed
diff --git a/video/vlc/PRE_BUILD b/video/vlc/PRE_BUILD
index 02c2ea1..9d792f5 100755
--- a/video/vlc/PRE_BUILD
+++ b/video/vlc/PRE_BUILD
@@ -1,6 +1,10 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&

+# lua 5.2 patchs from upstream
+patch -p1 < $SPELL_DIRECTORY/lua.patch &&
+patch -p1 < $SPELL_DIRECTORY/lua-scripts.patch &&
+
MOZ_MAKEFILE="projects/mozilla/Makefile.in" &&
if test "$(get_spell_provider $SPELL GECKO)" = firefox; then
sedit 's:$(libdir)/mozilla:$(libdir)/firefox:' $MOZ_MAKEFILE
diff --git a/video/vlc/lua-scripts.patch b/video/vlc/lua-scripts.patch
new file mode 100644
index 0000000..9bba02c
--- /dev/null
+++ b/video/vlc/lua-scripts.patch
@@ -0,0 +1,131 @@
+From a957114421fd2e875432e5fde0448ffc1ae60cfd Mon Sep 17 00:00:00 2001
+From: Kelly Anderson <kelly AT silka.with-linux.com>
+Date: Thu, 5 Jan 2012 06:23:35 -0700
+Subject: [PATCH 1/1] Cleanup lua script escape sequences for lua 5.2.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=utf8
+Content-Transfer-Encoding: 8bit
+
+Converting \ to %, since 5.2 no longer accepts \.
+
+Signed-off-by: Rémi Denis-Courmont <remi AT remlab.net>
+---
+ share/lua/extensions/imdb.lua | 2 +-
+ share/lua/playlist/appletrailers.lua | 6 +++---
+ share/lua/playlist/extreme.lua | 10 +++++-----
+ share/lua/playlist/katsomo.lua | 2 +-
+ share/lua/playlist/mpora.lua | 4 ++--
+ share/lua/playlist/pinkbike.lua | 4 ++--
+ 6 files changed, 14 insertions(+), 14 deletions(-)
+
+diff --git a/share/lua/playlist/appletrailers.lua
b/share/lua/playlist/appletrailers.lua
+index 8bd4bea..4d0f5e7 100644
+--- a/share/lua/playlist/appletrailers.lua
++++ b/share/lua/playlist/appletrailers.lua
+@@ -67,7 +67,7 @@ function parse()
+ description = find( line, "h%d.->(.-)</h%d") .. ' '
+ end
+ if string.match( line, 'img src=') then
+- for img in string.gmatch(line, '<img src="(http://.*\.jpg)" ')
do
++ for img in string.gmatch(line, '<img src="(http://.*%.jpg)" ')
do
+ art_url = img
+ end
+ for i,value in pairs(playlist) do
+@@ -76,8 +76,8 @@ function parse()
+ else break end
+ end
+ end
+- if string.match( line, "class=\"hd\".-\.mov") then
+- for urlline,resolution in string.gmatch(line,
"class=\"hd\".-href=\"(.-.mov)\".-(%d+.-p)") do
++ if string.match( line, 'class="hd".-%.mov') then
++ for urlline,resolution in string.gmatch(line,
'class="hd".-href="(.-%.mov)".-(%d+.-p)') do
+ urlline = string.gsub( urlline, "_"..resolution,
"_h"..resolution )
+ table.insert( playlist, { path = urlline,
+ name = description .. '(' ..
resolution .. ')',
+diff --git a/share/lua/playlist/extreme.lua b/share/lua/playlist/extreme.lua
+index 6fd7251..f5949ce 100644
+--- a/share/lua/playlist/extreme.lua
++++ b/share/lua/playlist/extreme.lua
+@@ -34,14 +34,14 @@ end
+ -- Probe function.
+ function probe()
+ return vlc.access == "http"
+- and string.match( vlc.path, "extreme.com/." )
+- or string.match( vlc.path, "freecaster.tv/." )
+- or string.match( vlc.path, "player.extreme.com/info/.")
++ and string.match( vlc.path, "extreme%.com/." )
++ or string.match( vlc.path, "freecaster%.tv/." )
++ or string.match( vlc.path, "player%.extreme%.com/info/.")
+ end
+
+ -- Parse function.
+ function parse()
+- if (string.match( vlc.path, "extreme\.com/." ) or string.match(
vlc.path, "freecaster\.tv/." )) and not string.match( vlc.path,
"player.extreme.com/info/") then
++ if (string.match( vlc.path, "extreme%.com/." ) or string.match(
vlc.path, "freecaster%.tv/." )) and not string.match( vlc.path,
"player%.extreme%.com/info/") then
+ while true do
+ line = vlc.readline()
+ if not line then break end
+@@ -54,7 +54,7 @@ function parse()
+ return { { path = "http://player.extreme.com/info/"; .. vid; name =
"extreme.com video"; } }
+ end
+
+- if string.match( vlc.path, "player.extreme.com/info/." ) then
++ if string.match( vlc.path, "player%.extreme%.com/info/." ) then
+ prefres = get_prefres()
+ gostraight = true
+ while true do
+diff --git a/share/lua/playlist/katsomo.lua b/share/lua/playlist/katsomo.lua
+index bf461c7..6965e4e 100644
+--- a/share/lua/playlist/katsomo.lua
++++ b/share/lua/playlist/katsomo.lua
+@@ -57,7 +57,7 @@ function parse()
+ then
+ arturl = "http://www.katsomo.fi"..find( line, " src=\"(.-)\"
alt=" )
+ end
+- for treeid,name in string.gmatch( line,
"/\?treeId=(%d+)\">([^<]+)</a") do
++ for treeid,name in string.gmatch( line,
'/%?treeId=(%d+)">([^<]+)</a') do
+ name = vlc.strings.resolve_xml_special_chars( name )
+ name = vlc.strings.from_charset( "ISO_8859-1", name )
+ path = "http://www.katsomo.fi/?treeId="..treeid
+diff --git a/share/lua/playlist/mpora.lua b/share/lua/playlist/mpora.lua
+index cfee5d0..d48c1e6 100644
+--- a/share/lua/playlist/mpora.lua
++++ b/share/lua/playlist/mpora.lua
+@@ -23,7 +23,7 @@
+ -- Probe function.
+ function probe()
+ return vlc.access == "http"
+- and string.match( vlc.path, "video.mpora.com/watch/" )
++ and string.match( vlc.path, "video%.mpora%.com/watch/" )
+ end
+
+ -- Parse function.
+@@ -40,7 +40,7 @@ function parse()
+ _,_,arturl = string.find( line, "image_src\" href=\"(.*)\" />" )
+ end
+ if string.match( line, "video_src" ) then
+- _,_,video = string.find( line,
"href=\"http://video\.mpora\.com/ep/(.*).swf\" />" )
++ _,_,video = string.find( line,
'href="http://video%.mpora%.com/ep/(.*)%.swf" />' )
+ end
+
+ end
+diff --git a/share/lua/playlist/pinkbike.lua
b/share/lua/playlist/pinkbike.lua
+index 06105d7..f6787c8 100644
+--- a/share/lua/playlist/pinkbike.lua
++++ b/share/lua/playlist/pinkbike.lua
+@@ -45,10 +45,10 @@ function parse()
+ end
+ -- Try to find server which has our video
+ if string.match( line, "<link rel=\"videothumbnail\"
href=\"http://(.*)/vt/svt-") then
+- _,_,server = string.find (line, "<link
rel=\"videothumbnail\"\ href=\"http://(.*)/vt/svt-" )
++ _,_,server = string.find (line, '<link
rel="videothumbnail" href="http://(.*)/vt/svt-' )
+ end
+ if string.match( line, "<link rel=\"videothumbnail\"
href=\"(.*)\" type=\"image/jpeg\"") then
+- _,_,arturl = string.find (line, "<link
rel=\"videothumbnail\" href=\"(.*)\"\ type=\"image/jpeg\"")
++ _,_,arturl = string.find (line, '<link
rel="videothumbnail" href="(.*)" type="image/jpeg"')
+ end
+ end
+
+--
+1.7.10
+
diff --git a/video/vlc/lua.patch b/video/vlc/lua.patch
new file mode 100644
index 0000000..1e76119
--- /dev/null
+++ b/video/vlc/lua.patch
@@ -0,0 +1,411 @@
+From c0f44d25b394418bbbe0f436c67b5872f7f44f5d Mon Sep 17 00:00:00 2001
+From: Kelly Anderson <kelly AT silka.with-linux.com>
+Date: Thu, 5 Jan 2012 06:23:36 -0700
+Subject: [PATCH] Consolidate lua includes in vlc.h
+MIME-Version: 1.0
+Content-Type: text/plain; charset=utf8
+Content-Transfer-Encoding: 8bit
+
+So lua 5.2 compatibility declarations can be made in one place.
+
+Signed-off-by: Rémi Denis-Courmont <remi AT remlab.net>
+---
+ modules/lua/intf.c | 4 ----
+ modules/lua/libs/acl.c | 3 ---
+ modules/lua/libs/configuration.c | 3 ---
+ modules/lua/libs/dialog.c | 3 ---
+ modules/lua/libs/equalizer.c | 3 ---
+ modules/lua/libs/gettext.c | 4 ----
+ modules/lua/libs/httpd.c | 4 ----
+ modules/lua/libs/input.c | 4 +---
+ modules/lua/libs/input.h | 2 ++
+ modules/lua/libs/messages.c | 4 ----
+ modules/lua/libs/misc.c | 4 ----
+ modules/lua/libs/net.c | 3 ---
+ modules/lua/libs/objects.c | 3 ---
+ modules/lua/libs/osd.c | 3 ---
+ modules/lua/libs/playlist.c | 3 ---
+ modules/lua/libs/sd.c | 4 ----
+ modules/lua/libs/stream.c | 3 ---
+ modules/lua/libs/strings.c | 3 ---
+ modules/lua/libs/variables.c | 4 ----
+ modules/lua/libs/video.c | 3 ---
+ modules/lua/libs/vlm.c | 3 ---
+ modules/lua/libs/volume.c | 4 ----
+ modules/lua/libs/xml.c | 3 ---
+ modules/lua/vlc.c | 4 ----
+ modules/lua/vlc.h | 6 ++++++
+ 25 files changed, 9 insertions(+), 78 deletions(-)
+
+diff --git a/modules/lua/intf.c b/modules/lua/intf.c
+index 3b01727..61fe362 100644
+--- a/modules/lua/intf.c
++++ b/modules/lua/intf.c
+@@ -37,10 +37,6 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+
+-#include <lua.h> /* Low level lua C API */
+-#include <lauxlib.h> /* Higher level C API */
+-#include <lualib.h> /* Lua libs */
+-
+ #include "vlc.h"
+ #include "libs.h"
+
+diff --git a/modules/lua/libs/acl.c b/modules/lua/libs/acl.c
+index 4deb66e..693137d 100644
+--- a/modules/lua/libs/acl.c
++++ b/modules/lua/libs/acl.c
+@@ -35,9 +35,6 @@
+ #include <vlc_common.h>
+ #include <vlc_acl.h>
+
+-#include <lua.h> /* Low level lua C API */
+-#include <lauxlib.h> /* Higher level C API */
+-
+ #include "../vlc.h"
+ #include "../libs.h"
+
+diff --git a/modules/lua/libs/configuration.c
b/modules/lua/libs/configuration.c
+index 7a4785f..7b5f732 100644
+--- a/modules/lua/libs/configuration.c
++++ b/modules/lua/libs/configuration.c
+@@ -34,9 +34,6 @@
+
+ #include <vlc_common.h>
+
+-#include <lua.h> /* Low level lua C API */
+-#include <lauxlib.h> /* Higher level C API */
+-
+ #include "../vlc.h"
+ #include "../libs.h"
+
+diff --git a/modules/lua/libs/dialog.c b/modules/lua/libs/dialog.c
+index 3ca67b2..55468f3 100644
+--- a/modules/lua/libs/dialog.c
++++ b/modules/lua/libs/dialog.c
+@@ -35,9 +35,6 @@
+ #include <vlc_common.h>
+ #include <vlc_extensions.h>
+
+-#include <lua.h> /* Low level lua C API */
+-#include <lauxlib.h> /* Higher level C API */
+-
+ #include "../vlc.h"
+ #include "../libs.h"
+
+diff --git a/modules/lua/libs/equalizer.c b/modules/lua/libs/equalizer.c
+index 75b2334..e698c6f 100644
+--- a/modules/lua/libs/equalizer.c
++++ b/modules/lua/libs/equalizer.c
+@@ -38,9 +38,6 @@
+ #include <vlc_input.h>
+ #include <vlc_charset.h>
+
+-#include <lua.h> /* Low level lua C API */
+-#include <lauxlib.h> /* Higher level C API */
+-
+ #include "input.h"
+ #include "../libs.h"
+ #include "../vlc.h"
+diff --git a/modules/lua/libs/gettext.c b/modules/lua/libs/gettext.c
+index b461e73..2781d35 100644
+--- a/modules/lua/libs/gettext.c
++++ b/modules/lua/libs/gettext.c
+@@ -32,10 +32,6 @@
+ # include "config.h"
+ #endif
+
+-#include <lua.h> /* Low level lua C API */
+-#include <lauxlib.h> /* Higher level C API */
+-#include <lualib.h> /* Lua libs */
+-
+ #include "../vlc.h"
+ #include "../libs.h"
+
+diff --git a/modules/lua/libs/httpd.c b/modules/lua/libs/httpd.c
+index b4520d9..85a38cc 100644
+--- a/modules/lua/libs/httpd.c
++++ b/modules/lua/libs/httpd.c
+@@ -35,10 +35,6 @@
+ #include <vlc_common.h>
+ #include <vlc_httpd.h>
+
+-#include <lua.h> /* Low level lua C API */
+-#include <lauxlib.h> /* Higher level C API */
+-#include <lualib.h> /* Lua libs */
+-
+ #include "../vlc.h"
+ #include "../libs.h"
+
+diff --git a/modules/lua/libs/input.c b/modules/lua/libs/input.c
+index 60211fd..7b413e2 100644
+--- a/modules/lua/libs/input.c
++++ b/modules/lua/libs/input.c
+@@ -37,13 +37,11 @@
+
+ #include <vlc_playlist.h>
+
+-#include <lua.h> /* Low level lua C API */
+-#include <lauxlib.h> /* Higher level C API */
+ #include <assert.h>
+
++#include "../vlc.h"
+ #include "input.h"
+ #include "playlist.h"
+-#include "../vlc.h"
+ #include "../libs.h"
+ #include "../extension.h"
+
+diff --git a/modules/lua/libs/input.h b/modules/lua/libs/input.h
+index dbe76df..903134a 100644
+--- a/modules/lua/libs/input.h
++++ b/modules/lua/libs/input.h
+@@ -24,6 +24,8 @@
+ #ifndef VLC_LUA_INPUT_H
+ #define VLC_LUA_INPUT_H
+
++#include "../vlc.h"
++
+ input_thread_t * vlclua_get_input_internal( lua_State * );
+
+ #endif
+diff --git a/modules/lua/libs/messages.c b/modules/lua/libs/messages.c
+index 9c40e53..589d162 100644
+--- a/modules/lua/libs/messages.c
++++ b/modules/lua/libs/messages.c
+@@ -38,10 +38,6 @@
+ #include <vlc_meta.h>
+ #include <vlc_aout.h>
+
+-#include <lua.h> /* Low level lua C API */
+-#include <lauxlib.h> /* Higher level C API */
+-#include <lualib.h> /* Lua libs */
+-
+ #include "../vlc.h"
+ #include "../libs.h"
+
+diff --git a/modules/lua/libs/misc.c b/modules/lua/libs/misc.c
+index f98d28a..5b793bd 100644
+--- a/modules/lua/libs/misc.c
++++ b/modules/lua/libs/misc.c
+@@ -41,10 +41,6 @@
+ #include <vlc_interface.h>
+ #include <vlc_keys.h>
+
+-#include <lua.h> /* Low level lua C API */
+-#include <lauxlib.h> /* Higher level C API */
+-#include <lualib.h> /* Lua libs */
+-
+ #include "../vlc.h"
+ #include "../libs.h"
+
+diff --git a/modules/lua/libs/net.c b/modules/lua/libs/net.c
+index 1c7cd12..0e832cc 100644
+--- a/modules/lua/libs/net.c
++++ b/modules/lua/libs/net.c
+@@ -41,9 +41,6 @@
+ #include <vlc_url.h>
+ #include <vlc_fs.h>
+
+-#include <lua.h> /* Low level lua C API */
+-#include <lauxlib.h> /* Higher level C API */
+-
+ #ifdef HAVE_POLL
+ #include <poll.h> /* poll structures and defines */
+ #endif
+diff --git a/modules/lua/libs/objects.c b/modules/lua/libs/objects.c
+index c3543d6..bcdb43e 100644
+--- a/modules/lua/libs/objects.c
++++ b/modules/lua/libs/objects.c
+@@ -35,9 +35,6 @@
+ #include <vlc_common.h>
+ #include <vlc_vout.h>
+
+-#include <lua.h> /* Low level lua C API */
+-#include <lauxlib.h> /* Higher level C API */
+-
+ #include "../vlc.h"
+ #include "../libs.h"
+ #include "objects.h"
+diff --git a/modules/lua/libs/osd.c b/modules/lua/libs/osd.c
+index fb36ed5..e06646b 100644
+--- a/modules/lua/libs/osd.c
++++ b/modules/lua/libs/osd.c
+@@ -35,9 +35,6 @@
+ #include <vlc_vout.h>
+ #include <vlc_osd.h>
+
+-#include <lua.h> /* Low level lua C API */
+-#include <lauxlib.h> /* Higher level C API */
+-
+ #include "../vlc.h"
+ #include "../libs.h"
+ #include "input.h"
+diff --git a/modules/lua/libs/playlist.c b/modules/lua/libs/playlist.c
+index ae610f3..2336a37 100644
+--- a/modules/lua/libs/playlist.c
++++ b/modules/lua/libs/playlist.c
+@@ -37,9 +37,6 @@
+ #include <vlc_interface.h>
+ #include <vlc_playlist.h>
+
+-#include <lua.h> /* Low level lua C API */
+-#include <lauxlib.h> /* Higher level C API */
+-
+ #include "../vlc.h"
+ #include "../libs.h"
+ #include "playlist.h"
+diff --git a/modules/lua/libs/sd.c b/modules/lua/libs/sd.c
+index 7ca9476..d88cab2 100644
+--- a/modules/lua/libs/sd.c
++++ b/modules/lua/libs/sd.c
+@@ -38,10 +38,6 @@
+ #include <vlc_playlist.h>
+ #include <vlc_charset.h>
+
+-#include <lua.h> /* Low level lua C API */
+-#include <lauxlib.h> /* Higher level C API */
+-#include <lualib.h> /* Lua libs */
+-
+ #include "../vlc.h"
+ #include "../libs.h"
+ #include "playlist.h"
+diff --git a/modules/lua/libs/stream.c b/modules/lua/libs/stream.c
+index ef7187c..6a366f1 100644
+--- a/modules/lua/libs/stream.c
++++ b/modules/lua/libs/stream.c
+@@ -38,9 +38,6 @@
+ #include <vlc_meta.h>
+ #include <vlc_aout.h>
+
+-#include <lua.h> /* Low level lua C API */
+-#include <lauxlib.h> /* Higher level C API */
+-
+ #include "../vlc.h"
+ #include "../libs.h"
+
+diff --git a/modules/lua/libs/strings.c b/modules/lua/libs/strings.c
+index ab8e435..88c5f0e 100644
+--- a/modules/lua/libs/strings.c
++++ b/modules/lua/libs/strings.c
+@@ -39,9 +39,6 @@
+ #include <vlc_aout.h>
+ #include <vlc_charset.h>
+
+-#include <lua.h> /* Low level lua C API */
+-#include <lauxlib.h> /* Higher level C API */
+-
+ #include "../vlc.h"
+ #include "../libs.h"
+
+diff --git a/modules/lua/libs/variables.c b/modules/lua/libs/variables.c
+index f3becae..aad5ae1 100644
+--- a/modules/lua/libs/variables.c
++++ b/modules/lua/libs/variables.c
+@@ -34,10 +34,6 @@
+
+ #include <vlc_common.h>
+
+-#include <lua.h> /* Low level lua C API */
+-#include <lauxlib.h> /* Higher level C API */
+-#include <lualib.h> /* Lua libs */
+-
+ #include "../vlc.h"
+ #include "../libs.h"
+ #include "variables.h"
+diff --git a/modules/lua/libs/video.c b/modules/lua/libs/video.c
+index eb914b5..258e0d2 100644
+--- a/modules/lua/libs/video.c
++++ b/modules/lua/libs/video.c
+@@ -34,9 +34,6 @@
+
+ #include <vlc_vout.h>
+
+-#include <lua.h> /* Low level lua C API */
+-#include <lauxlib.h> /* Higher level C API */
+-
+ #include "../vlc.h"
+ #include "../libs.h"
+ #include "input.h"
+diff --git a/modules/lua/libs/vlm.c b/modules/lua/libs/vlm.c
+index d48755c..7b2b708 100644
+--- a/modules/lua/libs/vlm.c
++++ b/modules/lua/libs/vlm.c
+@@ -35,9 +35,6 @@
+ #include <vlc_common.h>
+ #include <vlc_vlm.h>
+
+-#include <lua.h> /* Low level lua C API */
+-#include <lauxlib.h> /* Higher level C API */
+-
+ #include "../vlc.h"
+ #include "../libs.h"
+
+diff --git a/modules/lua/libs/volume.c b/modules/lua/libs/volume.c
+index 3aab542..bae1534 100644
+--- a/modules/lua/libs/volume.c
++++ b/modules/lua/libs/volume.c
+@@ -38,10 +38,6 @@
+ #include <vlc_meta.h>
+ #include <vlc_aout_intf.h>
+
+-#include <lua.h> /* Low level lua C API */
+-#include <lauxlib.h> /* Higher level C API */
+-#include <lualib.h> /* Lua libs */
+-
+ #include "../vlc.h"
+ #include "../libs.h"
+ #include "playlist.h"
+diff --git a/modules/lua/libs/xml.c b/modules/lua/libs/xml.c
+index f8b0afe..80f53fb 100644
+--- a/modules/lua/libs/xml.c
++++ b/modules/lua/libs/xml.c
+@@ -35,9 +35,6 @@
+ #include <vlc_common.h>
+ #include <vlc_xml.h>
+
+-#include <lua.h> /* Low level lua C API */
+-#include <lauxlib.h> /* Higher level C API */
+-
+ #include "../vlc.h"
+ #include "../libs.h"
+
+diff --git a/modules/lua/vlc.c b/modules/lua/vlc.c
+index 5433eb8..a0132cf 100644
+--- a/modules/lua/vlc.c
++++ b/modules/lua/vlc.c
+@@ -45,10 +45,6 @@
+ #include <vlc_stream.h>
+ #include <sys/stat.h>
+
+-#include <lua.h> /* Low level lua C API */
+-#include <lauxlib.h> /* Higher level C API */
+-#include <lualib.h> /* Lua libs */
+-
+ #include "vlc.h"
+
+
/*****************************************************************************
+diff --git a/modules/lua/vlc.h b/modules/lua/vlc.h
+index 5d87914..2b8fbff 100644
+--- a/modules/lua/vlc.h
++++ b/modules/lua/vlc.h
+@@ -36,9 +36,15 @@
+ #include <vlc_strings.h>
+ #include <vlc_stream.h>
+
++#define LUA_COMPAT_MODULE
+ #include <lua.h> /* Low level lua C API */
+ #include <lauxlib.h> /* Higher level C API */
+ #include <lualib.h> /* Lua libs */
++#if LUA_VERSION_NUM >= 502
++#define lua_equal(L,idx1,idx2)
lua_compare(L,(idx1),(idx2),LUA_OPEQ)
++#define lua_objlen(L,idx) lua_rawlen(L,idx)
++#define lua_strlen(L,idx) lua_rawlen(L,idx)
++#endif
+
+
/*****************************************************************************
+ * Module entry points
+--
+1.7.10
+
diff --git a/x11-libs/wine/DETAILS b/x11-libs/wine/DETAILS
index 5633339..6c3917c 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_BRANCH == devel ]]; then
- VERSION=1.5.6
+ VERSION=1.5.8
else
VERSION=1.4.1
fi
diff --git a/x11-libs/wine/HISTORY b/x11-libs/wine/HISTORY
index 2db2457..d58412f 100644
--- a/x11-libs/wine/HISTORY
+++ b/x11-libs/wine/HISTORY
@@ -1,3 +1,6 @@
+2012-07-09 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated devel to 1.5.8
+
2012-06-18 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.4.1




  • [SM-Commit] GIT changes to devel-xorg-modular grimoire by Eric Sandall (8a2a9d7dcfbc1e75ebbb5949cbf08bb93a13669c), Eric Sandall, 07/09/2012

Archive powered by MHonArc 2.6.24.

Top of Page