Skip to Content.
Sympa Menu

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

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to devel-xorg-modular grimoire by Vlad Glagolev (312cfe18f7d6d6e4340e4e9c7bda890387bebbad)
  • Date: Fri, 6 Mar 2015 14:29:42 -0600

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

crypto/libressl/BUILD | 3
crypto/libressl/CONFIGURE | 3
crypto/libressl/DETAILS | 23 +-
crypto/libressl/HISTORY | 19 +
crypto/libressl/INSTALL | 9
crypto/libressl/PREPARE | 7
crypto/libressl/UP_TRIGGERS | 9
crypto/libressl/libressl.gpg |binary
crypto/openssl/HISTORY | 6
crypto/openssl/PREPARE | 5
crypto/openssl/PRE_REMOVE | 25 ++
crypto/openssl/REPAIR^none^PRE_REMOVE | 25 ++
crypto/openssl/UP_TRIGGERS | 6
crypto/putty/DETAILS | 7
crypto/putty/HISTORY | 4
dev/null |binary
devel/python/HISTORY | 4
devel/python/PRE_BUILD | 11 -
devel/python/libressl.patch | 83 +++++++
devel/rust/BUILD | 3
devel/rust/DEPENDS | 1
devel/rust/DETAILS | 9
devel/rust/HISTORY | 5
http/cadaver/DEPENDS | 4
http/cadaver/HISTORY | 4
http/links-twibright/HISTORY | 4
http/links-twibright/PRE_BUILD | 7
http/links-twibright/libressl.patch | 17 +
kernels/kmod/DETAILS | 4
kernels/kmod/HISTORY | 3
libs/ldns/CONFIGURE | 5
libs/ldns/DEPENDS | 4
libs/ldns/HISTORY | 3
libs/libtasn1/DETAILS | 2
libs/libtasn1/HISTORY | 3
libs/pcre/BUILD | 3
libs/pcre/HISTORY | 4
libs/pcre/PRE_BUILD | 2
libs/pcre/cve-2014-8964 | 15 -
libs/pcre/cve-2014-8964.patch | 15 +
mail/exim/CONFIGURE | 2
mail/exim/DEPENDS | 2
mail/exim/HISTORY | 3
net/socat/HISTORY | 5
net/socat/PRE_BUILD | 7
net/socat/libressl.patch | 174
++++++++++++++++
net/stunnel/HISTORY | 4
net/stunnel/PRE_BUILD | 2
net/stunnel/libressl.patch | 18 +
python-pypi/pyopenssl/DETAILS | 3
python-pypi/pyopenssl/HISTORY | 9
python-pypi/pyopenssl/PRE_BUILD | 7
python-pypi/pyopenssl/libressl.patch | 94 ++++++++
x11-libs/wine/DETAILS | 2
x11-libs/wine/HISTORY | 3
xfce-plugins/thunar-volman/DEPENDS | 2
xfce-plugins/thunar-volman/DETAILS | 4
xfce-plugins/thunar-volman/HISTORY | 6
xfce/exo/DETAILS | 4
xfce/exo/HISTORY | 3
xfce/garcon/DETAILS | 4
xfce/garcon/HISTORY | 3
xfce/garcon/garcon-0.4.0.tar.bz2.sig |binary
xfce/gtk-xfce-engine/DEPENDS | 12 +
xfce/gtk-xfce-engine/DETAILS | 4
xfce/gtk-xfce-engine/HISTORY | 5
xfce/libxfce4ui/DEPENDS | 7
xfce/libxfce4ui/DETAILS | 5
xfce/libxfce4ui/HISTORY | 4
xfce/libxfce4util/DETAILS | 4
xfce/libxfce4util/HISTORY | 3
xfce/libxfce4util/libxfce4util-4.12.1.tar.bz2.sig |binary
xfce/parole/DEPENDS | 5
xfce/parole/DETAILS | 4
xfce/parole/HISTORY | 4
xfce/parole/parole-0.8.0.tar.bz2.sig |binary
xfce/thunar/DEPENDS | 2
xfce/thunar/DETAILS | 4
xfce/thunar/HISTORY | 6
xfce/thunar/Thunar-1.6.6.tar.bz2.sig |binary
xfce/tumbler/DEPENDS | 2
xfce/tumbler/DETAILS | 4
xfce/tumbler/HISTORY | 4
xfce/tumbler/tumbler-0.1.31.tar.bz2.sig |binary
xfce/xfburn/BUILD | 14 -
xfce/xfburn/DEPENDS | 11 -
xfce/xfburn/DETAILS | 4
xfce/xfburn/HISTORY | 8
xfce/xfburn/PRE_BUILD | 4
xfce/xfburn/glib232.patch | 10
xfce/xfce4-appfinder/DEPENDS | 7
xfce/xfce4-appfinder/DETAILS | 4
xfce/xfce4-appfinder/HISTORY | 4
xfce/xfce4-appfinder/xfce4-appfinder-4.12.0.tar.bz2.sig |binary
xfce/xfce4-dev-tools/DETAILS | 4
xfce/xfce4-dev-tools/HISTORY | 3
xfce/xfce4-panel/DEPENDS | 7
xfce/xfce4-panel/DETAILS | 4
xfce/xfce4-panel/HISTORY | 4
xfce/xfce4-panel/xfce4-panel-4.12.0.tar.bz2.sig |binary
xfce/xfce4-power-manager/DEPENDS | 1
xfce/xfce4-power-manager/DETAILS | 4
xfce/xfce4-power-manager/HISTORY | 4
xfce/xfce4-session/DETAILS | 4
xfce/xfce4-session/HISTORY | 3
xfce/xfce4-session/xfce4-session-4.12.0.tar.bz2.sig |binary
xfce/xfce4-settings/DEPENDS | 12 +
xfce/xfce4-settings/DETAILS | 4
xfce/xfce4-settings/HISTORY | 4
xfce/xfce4-settings/xfce4-settings-4.12.0.tar.bz2.sig |binary
xfce/xfconf/DETAILS | 5
xfce/xfconf/HISTORY | 3
xfce/xfdesktop/DETAILS | 4
xfce/xfdesktop/HISTORY | 3
xfce/xfwm4/DEPENDS | 7
xfce/xfwm4/DETAILS | 4
xfce/xfwm4/HISTORY | 4
xfce/xfwm4/xfwm4-4.12.0.tar.bz2.sig |binary
118 files changed, 810 insertions(+), 150 deletions(-)

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

libressl: added proper upgrading procedure from openssl

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

openssl: added proper upgrading procedure to libressl

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

wine: => 1.7.38

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

ldns: added libressl build support

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

pyopenssl: corrected work with libressl

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

exim: use SSL provider (build against libressl confirmed)

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

links-twibright: fixed build with libressl

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

python: fixed build with libressl

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

socat: fixed build with LibreSSL

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

pcre: re-enabled build of static libraries

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

libressl: post-update fixes

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

stunnel: fixed build with libressl

commit 1a1badccf11db23fe0287031152a558216efedb1
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

xfce/parole: version 0.8.0

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

libressl: PREPARE -> UP_TRIGGERS

commit 92cafb76e2ceef0e44c000436e7e54e8a4373a82
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

xfce/exo/HISTORY: removed a typo

commit 016205e8ee6fd678fc1ef15104fa8535291c8532
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

xfce/xfburn: updated to 0.5.2, some cleanups

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

kmod: => 20

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

libtasn1: => 4.2

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

libressl: added SOURCE2 for gpg signature

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

cadaver: use SSL provider

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

Revert "cadaver: depends SSL"

This reverts commit fff8ea025a4113fee15d08bfc1ef76c66a5c8119.

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

libressl: => 2.1.4

commit 3cd4255868b638dadbb16a7381c8ee6b5d65cb33
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

xfce/xfce4-power-manager: version 1.4.3

commit 9c99136c47151c43cb0c6cddb2174e4aa36ed542
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

xfce/tumvler: version 0.1.31

commit 40b5480760388c5d4e9a86786693da50968e67e7
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

xfce-plugins/thunar-volman: version 0.8.1

commit d848b33ffb95ad658264763a44fd37b6161d10ff
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

xfce/thunar: version 1.6.6

commit 591e81071f22f68a0c152284f4915f379da306cd
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

xfce/xfce4-appfinder: version 4.12.0

commit 9987a1de99f868f53d8b4d339b592d88bb042131
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

xfce/xfce4-dev-tools: version 4.12.0

commit b9251b9603b7b4bb2b2fedd1ca48a01531efb017
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

xfce/xfce4-session: version 4.12.0

commit 314438aff3651672e3fbcb6b2944f01f34cb040a
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

xfce/xfce4-panel: version 4.12.0

commit 93ecb3372cc5fdc08a03cbe244f3bd0b77fdfb18
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

xfce/xfce4-settings: version 4.12.0

commit 7dd0d88d4ba0e206e56a0ef4fee6cbec604bc9a9
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

xfce/xfwm4: version 4.12.0

commit 5749013f647fa562c566cddf508d912dcbdfd612
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

xfce/xfdesktop: version 4.12.0

commit 2e514aeab79708dd8082e808877fb91553725db4
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

xfce/gtk-xfce-engine: version 3.2.0

commit d85be74b3e2e4a51285972bb453f778576971cd5
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

xfce/libxfce4ui: version 4.12.0

commit a281d5b3e12b6b6127310e99ab4552e4d094db02
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

xfce/xfconf: version 4.12.0

commit 32dfad631220e2ccff5e19a97493f8c71e9a1d66
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

xfce/libxfce4util: version 4.12.1

commit 6b9896591553c66b598a95b1ec866b3d8fa35f09
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

xfce/garcon: version 0.4.0

commit ea71c1d94d5956bf417b8ae1eaabf1b9a5952bab
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

xfce/exo: version 0.10.3

commit e766420946dd5c9a218559079e62f1668556add5
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

rust 1.0.0-alpha.2

commit a418e0de9765132fa8d6b8450d3ada503edd75cd
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

putty 0.64, SECURITY_PATCH++

diff --git a/crypto/libressl/BUILD b/crypto/libressl/BUILD
new file mode 100755
index 0000000..1bbd905
--- /dev/null
+++ b/crypto/libressl/BUILD
@@ -0,0 +1,3 @@
+OPTS="$LIBRESSL_OPTS $OPTS" &&
+
+default_build
diff --git a/crypto/libressl/CONFIGURE b/crypto/libressl/CONFIGURE
new file mode 100755
index 0000000..17095fc
--- /dev/null
+++ b/crypto/libressl/CONFIGURE
@@ -0,0 +1,3 @@
+config_query_option LIBRESSL_OPTS "Enable building the libtls library?" n \
+ "--enable-libtls" \
+ "--disable-libtls"
diff --git a/crypto/libressl/DETAILS b/crypto/libressl/DETAILS
index cf8a250..9eb1f12 100755
--- a/crypto/libressl/DETAILS
+++ b/crypto/libressl/DETAILS
@@ -1,14 +1,25 @@
SPELL=libressl
- VERSION=2.1.3
-
SOURCE_HASH=sha512:d2806f6d147e4145a3ef7795d3a17bc6553b2673d488c47fec4d9ac87babeae3d8710f910d5ccb27e57a3d34c6e4cb7d94cd3862d92f378fa3376a6d2ebc6cd9
+ VERSION=2.1.4
+ SECURITY_PATCH=2
SOURCE=$SPELL-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- WEB_SITE=http://www.libressl.org/
+ SOURCE2=$SOURCE.asc
SOURCE_URL[0]=http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/$SOURCE
+ SOURCE_URL[1]=http://sourcemage.ru/mirror/$SPELL/$SOURCE
+ SOURCE2_URL[0]=$SOURCE_URL.asc
+ SOURCE2_URL[1]=${SOURCE_URL[1]}.asc
+ SOURCE_GPG=libressl.gpg:$SOURCE2:UPSTREAM_KEY
+ SOURCE2_IGNORE=signature
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+ WEB_SITE=http://www.libressl.org/
LICENSE[0]=BSD
+ LICENSE[1]=APACHE
+ LICENSE[2]=ISC
+ LICENSE[3]=PD
ENTERED=20140819
- KEYWORDS=""
+ KEYWORDS="ssl tls"
SHORT="SSL/TLS protocol"
cat << EOF
-LibreSSL is a FREE version of the SSL/TLS protocol forked from OpenSSL
+LibreSSL is a version of the TLS/crypto stack forked from OpenSSL in 2014,
with
+goals of modernizing the codebase, improving security, and applying best
+practice development processes.
EOF
diff --git a/crypto/libressl/HISTORY b/crypto/libressl/HISTORY
index 2dbd18c..176af7c 100644
--- a/crypto/libressl/HISTORY
+++ b/crypto/libressl/HISTORY
@@ -1,3 +1,22 @@
+2015-03-06 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: SECURITY_PATCH++ (CVE-2015-0205, CVE-2014-3570,
+ CVE-2014-8275, CVE-2014-3572); added missing licenses; updated long
+ description
+ * INSTALL: added, to install config file
+ * PREPARE: added, for proper upgrading procedure from openssl
+
+2015-03-05 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.1.4; added forgotten SECURITY_PATCH for
+ 2.1.3 (CVE-2015-0206); quoting paths; updated KEYWORDS; converted to
+ upstream gpg checking; added the 2nd mirror
+ * PROVIDES: chmod +x
+ * BUILD: added, use LIBRESSL_OPTS
+ * CONFIGURE: added, for missing configure options
+ * UP_TRIGGERS: removed senseless triggers
+ * PREPARE: removed, moved to UP_TRIGGERS
+ * libressl.gpg: added, imported D5E4D8D5 public key (Brent Cook
+ <bcook AT rapid7.com>)
+
2015-03-01 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.1.3

diff --git a/crypto/libressl/INSTALL b/crypto/libressl/INSTALL
new file mode 100755
index 0000000..b92c43c
--- /dev/null
+++ b/crypto/libressl/INSTALL
@@ -0,0 +1,9 @@
+default_install &&
+
+local SSL_CONFDIR="$INSTALL_ROOT/etc/ssl" &&
+
+if [[ ! -d "$SSL_CONFDIR" ]]; then
+ install -vm 755 -d "$SSL_CONFDIR"
+fi &&
+
+install_config_file apps/openssl.cnf "$SSL_CONFDIR/openssl.cnf"
diff --git a/crypto/libressl/PREPARE b/crypto/libressl/PREPARE
index c9924b3..eb0676c 100755
--- a/crypto/libressl/PREPARE
+++ b/crypto/libressl/PREPARE
@@ -1,5 +1,4 @@
-if spell_ok openssl;then
- for each in $(show_up_depends openssl 1); do
- up_trigger $each cast_self
- done
+if spell_ok openssl; then
+ # should be replaced with something less hacky
+ export WGET_RECAST_REQUIRED="y"
fi
diff --git a/crypto/libressl/PROVIDES b/crypto/libressl/PROVIDES
old mode 100644
new mode 100755
diff --git a/crypto/libressl/UP_TRIGGERS b/crypto/libressl/UP_TRIGGERS
index 5e5a48a..c9924b3 100755
--- a/crypto/libressl/UP_TRIGGERS
+++ b/crypto/libressl/UP_TRIGGERS
@@ -1,10 +1,5 @@
-# this makes ABI changes automatically cast those that depend on libressl
via an up_trigger
-
-spell_ok $SPELL && local OLD_SPELL_VERSION="$(installed_version $SPELL)" ||
return 0
-
-if [ "${VERSION/[a-z]*/}" != "${OLD_SPELL_VERSION/[a-z]*/}" ] || \
- [ "${VERSION%.*}" != "${OLD_SPELL_VERSION%.*}" ]; then
- for each in $(show_up_depends $SPELL 1); do
+if spell_ok openssl;then
+ for each in $(show_up_depends openssl 1); do
up_trigger $each cast_self
done
fi
diff --git a/crypto/libressl/libressl.gpg b/crypto/libressl/libressl.gpg
new file mode 100644
index 0000000..f8cb3e4
Binary files /dev/null and b/crypto/libressl/libressl.gpg differ
diff --git a/crypto/openssl/HISTORY b/crypto/openssl/HISTORY
index 9f30f37..1e19e22 100644
--- a/crypto/openssl/HISTORY
+++ b/crypto/openssl/HISTORY
@@ -1,3 +1,9 @@
+2015-03-06 Vlad Glagolev <stealth AT sourcemage.org>
+ * PROVIDES: changed mode to 755
+ * PREPARE: move triggering to UP_TRIGGERS
+ * {REPAIR^none^,}PRE_REMOVE: added, for proper upgrading procedure to
+ libressl
+
2015-01-16 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.9.8ze, 1.0.1l

diff --git a/crypto/openssl/PREPARE b/crypto/openssl/PREPARE
index e142d81..60fb53b 100755
--- a/crypto/openssl/PREPARE
+++ b/crypto/openssl/PREPARE
@@ -1,6 +1 @@
config_query_list OPENSSL_BRANCH "Which branch of OpenSSL do you want to
build?" DEFAULT 0.9 1.0
-if spell_ok libressl;then
- for each in $(show_up_depends libressl 1); do
- up_trigger $each cast_self
- done
-fi
diff --git a/crypto/openssl/PRE_REMOVE b/crypto/openssl/PRE_REMOVE
new file mode 100755
index 0000000..adceeb8
--- /dev/null
+++ b/crypto/openssl/PRE_REMOVE
@@ -0,0 +1,25 @@
+# check for exported variable by libressl
+if [[ -n "$WGET_RECAST_REQUIRED" ]] && is_depends_enabled wget
$(get_spell_provider wget SSL); then
+ message "${MESSAGE_COLOR}Building static wget now so that it doesn't get
borked${DEFAULT_COLOR}" &&
+
+ # make sure wget sources are in-place
+ summon wget &&
+
+ RUN_COMPILER_DIR="${RUN_COMPILER_DIR:-/var/lib/sorcery/build}" &&
+ PATH="${PATH//$RUN_COMPILER_DIR:/}" &&
+ (
+ # this links statically against old libraries still
+ export OPTS="--with-ssl=openssl --disable-pcre" && # TODO: our pcre
spell doesn't install a static library yet
+ export CUSTOM_CFLAGS="-static" &&
+ # $4 is grimoire version, not installed version -- internal sorcery
interface, too?
+ local TMP_WGET_DIR="$BUILD_DIRECTORY/wget-$(gaze version wget | awk '{if
(NR == 3) print $4}')" &&
+
+ delve -c start config_loc wget &&
+ # LDFLAGS+="-ldl" is required for static linking
+ sedit "s:@LIBS@:@LIBS@ -ldl:" "$TMP_WGET_DIR/src/Makefile.in" &&
+ # get a new wget binary built
+ delve BUILD wget &&
+ # and installed
+ install -vm 755 "$TMP_WGET_DIR/src/wget" "$INSTALL_ROOT/usr/bin/wget"
+ ) || exit 1 # for some reason 'return 1' doesn't work here
+fi
diff --git a/crypto/openssl/PROVIDES b/crypto/openssl/PROVIDES
old mode 100644
new mode 100755
diff --git a/crypto/openssl/REPAIR^none^PRE_REMOVE
b/crypto/openssl/REPAIR^none^PRE_REMOVE
new file mode 100755
index 0000000..adceeb8
--- /dev/null
+++ b/crypto/openssl/REPAIR^none^PRE_REMOVE
@@ -0,0 +1,25 @@
+# check for exported variable by libressl
+if [[ -n "$WGET_RECAST_REQUIRED" ]] && is_depends_enabled wget
$(get_spell_provider wget SSL); then
+ message "${MESSAGE_COLOR}Building static wget now so that it doesn't get
borked${DEFAULT_COLOR}" &&
+
+ # make sure wget sources are in-place
+ summon wget &&
+
+ RUN_COMPILER_DIR="${RUN_COMPILER_DIR:-/var/lib/sorcery/build}" &&
+ PATH="${PATH//$RUN_COMPILER_DIR:/}" &&
+ (
+ # this links statically against old libraries still
+ export OPTS="--with-ssl=openssl --disable-pcre" && # TODO: our pcre
spell doesn't install a static library yet
+ export CUSTOM_CFLAGS="-static" &&
+ # $4 is grimoire version, not installed version -- internal sorcery
interface, too?
+ local TMP_WGET_DIR="$BUILD_DIRECTORY/wget-$(gaze version wget | awk '{if
(NR == 3) print $4}')" &&
+
+ delve -c start config_loc wget &&
+ # LDFLAGS+="-ldl" is required for static linking
+ sedit "s:@LIBS@:@LIBS@ -ldl:" "$TMP_WGET_DIR/src/Makefile.in" &&
+ # get a new wget binary built
+ delve BUILD wget &&
+ # and installed
+ install -vm 755 "$TMP_WGET_DIR/src/wget" "$INSTALL_ROOT/usr/bin/wget"
+ ) || exit 1 # for some reason 'return 1' doesn't work here
+fi
diff --git a/crypto/openssl/UP_TRIGGERS b/crypto/openssl/UP_TRIGGERS
index db2fa68..bfc94e2 100755
--- a/crypto/openssl/UP_TRIGGERS
+++ b/crypto/openssl/UP_TRIGGERS
@@ -7,4 +7,10 @@ if [ "${VERSION/[a-z]*/}" != "${OLD_SPELL_VERSION/[a-z]*/}"
] || \
for each in $(show_up_depends $SPELL 1); do
up_trigger $each cast_self
done
+fi &&
+
+if spell_ok libressl; then
+ for each in $(show_up_depends libressl 1); do
+ up_trigger $each cast_self
+ done
fi
diff --git a/crypto/putty/DETAILS b/crypto/putty/DETAILS
index 14998b5..c692465 100755
--- a/crypto/putty/DETAILS
+++ b/crypto/putty/DETAILS
@@ -1,13 +1,12 @@
SPELL=putty
- VERSION=0.62
- SECURITY_PATCH=1
+ VERSION=0.64
+ SECURITY_PATCH=2
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://the.earth.li/~sgtatham/putty/latest/$SOURCE
-
SOURCE_HASH=sha512:b08f521c8af2da3a7a309199576e2ea8ddf90012f98aa695b9a79ad5f7609d26d92239d159391c370cf63da9d9c3bc1c7243052b3ef4c17b81ff51426f5fbfdd
+
SOURCE_HASH=sha512:ba4d4086b8edcb6388924bf3d9b018841be36a9dbf298271c9d2ed063aae9854093e9ff6808bd1f65669d78369548639eb3c95fdec5e3f0daee4b1c7bb603051
WEB_SITE=http://www.chiark.greenend.org.uk/~sgtatham/putty/
ENTERED=20040721
- PATCHLEVEL=0
LICENSE[0]=MIT
KEYWORDS="telnet ssh crypto"
SHORT="Telnet and SSH client"
diff --git a/crypto/putty/HISTORY b/crypto/putty/HISTORY
index da65c3f..e2fee7d 100644
--- a/crypto/putty/HISTORY
+++ b/crypto/putty/HISTORY
@@ -1,3 +1,7 @@
+2015-03-04 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 0.64
+ SECURITY_PATCH++
+
2011-12-20 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.62, SECURITY_PATCH=1

diff --git a/devel/python/HISTORY b/devel/python/HISTORY
index 3dbb794..1f58bcf 100644
--- a/devel/python/HISTORY
+++ b/devel/python/HISTORY
@@ -1,3 +1,7 @@
+2015-03-06 Vlad Glagolev <stealth AT sourcemage.org>
+ * PRE_BUILD: apply a patch; quoting paths
+ * libressl.patch: added, backported official patch from OpenBSD
+
2014-12-11 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 2.7.9; SECURITY_PATCH++ (CVE-2013-1753,
CVE-2013-1752, CVE-2013-1752)
diff --git a/devel/python/PRE_BUILD b/devel/python/PRE_BUILD
index ee53ba4..e5c77c5 100755
--- a/devel/python/PRE_BUILD
+++ b/devel/python/PRE_BUILD
@@ -1,4 +1,11 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY/Lib &&
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+# the patch drops EGD support for LibreSSL, so make it optional
+if is_depends_enabled $SPELL $(get_spell_provider $SPELL SSL) && [[
$(get_spell_provider $SPELL SSL) == "libressl" ]]; then
+ patch -p0 < "$SPELL_DIRECTORY/libressl.patch"
+fi &&
+
+cd "$SOURCE_DIRECTORY/Lib" &&

cp -R plat-linux2 plat-linux3
diff --git a/devel/python/libressl.patch b/devel/python/libressl.patch
new file mode 100644
index 0000000..82cea83
--- /dev/null
+++ b/devel/python/libressl.patch
@@ -0,0 +1,83 @@
+$OpenBSD: patch-Lib_ssl_py,v 1.2 2014/12/14 08:32:55 rpointel Exp $
+--- Lib/ssl.py.orig Wed Dec 10 16:59:40 2014
++++ Lib/ssl.py Sat Dec 13 12:15:08 2014
+@@ -106,7 +106,7 @@ from _ssl import CERT_NONE, CERT_OPTIONAL, CERT_REQUIR
+ from _ssl import (VERIFY_DEFAULT, VERIFY_CRL_CHECK_LEAF,
VERIFY_CRL_CHECK_CHAIN,
+ VERIFY_X509_STRICT)
+ from _ssl import txt2obj as _txt2obj, nid2obj as _nid2obj
+-from _ssl import RAND_status, RAND_egd, RAND_add
++from _ssl import RAND_status, RAND_add
+
+ def _import_symbols(prefix):
+ for n in dir(_ssl):
+$OpenBSD: patch-Modules__ssl_c,v 1.3 2014/12/14 08:32:55 rpointel Exp $
+--- Modules/_ssl.c.orig Wed Dec 10 16:59:53 2014
++++ Modules/_ssl.c Sat Dec 13 12:16:17 2014
+@@ -3301,32 +3301,6 @@ Returns 1 if the OpenSSL PRNG has been seeded with eno
+ It is necessary to seed the PRNG with RAND_add() on some platforms before\n\
+ using the ssl() function.");
+
+-static PyObject *
+-PySSL_RAND_egd(PyObject *self, PyObject *arg)
+-{
+- int bytes;
+-
+- if (!PyString_Check(arg))
+- return PyErr_Format(PyExc_TypeError,
+- "RAND_egd() expected string, found %s",
+- Py_TYPE(arg)->tp_name);
+- bytes = RAND_egd(PyString_AS_STRING(arg));
+- if (bytes == -1) {
+- PyErr_SetString(PySSLErrorObject,
+- "EGD connection failed or EGD did not return "
+- "enough data to seed the PRNG");
+- return NULL;
+- }
+- return PyInt_FromLong(bytes);
+-}
+-
+-PyDoc_STRVAR(PySSL_RAND_egd_doc,
+-"RAND_egd(path) -> bytes\n\
+-\n\
+-Queries the entropy gather daemon (EGD) on the socket named by 'path'.\n\
+-Returns number of bytes read. Raises SSLError if connection to EGD\n\
+-fails or if it does not provide enough data to seed PRNG.");
+-
+ #endif /* HAVE_OPENSSL_RAND */
+
+
+@@ -3720,8 +3694,6 @@ static PyMethodDef PySSL_methods[] = {
+ #ifdef HAVE_OPENSSL_RAND
+ {"RAND_add", PySSL_RAND_add, METH_VARARGS,
+ PySSL_RAND_add_doc},
+- {"RAND_egd", PySSL_RAND_egd, METH_VARARGS,
+- PySSL_RAND_egd_doc},
+ {"RAND_status", (PyCFunction)PySSL_RAND_status, METH_NOARGS,
+ PySSL_RAND_status_doc},
+ #endif
+$OpenBSD: patch-Lib_socket_py,v 1.1 2014/04/19 14:17:47 espie Exp $
+--- Lib/socket.py.orig Sat Apr 19 16:07:48 2014
++++ Lib/socket.py Sat Apr 19 16:07:54 2014
+@@ -67,7 +67,6 @@ else:
+ from _ssl import SSLError as sslerror
+ from _ssl import \
+ RAND_add, \
+- RAND_egd, \
+ RAND_status, \
+ SSL_ERROR_ZERO_RETURN, \
+ SSL_ERROR_WANT_READ, \
+$OpenBSD: patch-Lib_test_test_ssl_py,v 1.2 2014/12/14 08:32:55 rpointel Exp $
+
+No RAND_egd on OpenBSD.
+
+--- Lib/test/test_ssl.py.orig Wed Dec 10 16:59:47 2014
++++ Lib/test/test_ssl.py Sat Dec 13 12:13:40 2014
+@@ -169,8 +169,6 @@ class BasicSocketTests(unittest.TestCase):
+ sys.stdout.write("\n RAND_status is %d (%s)\n"
+ % (v, (v and "sufficient randomness") or
+ "insufficient randomness"))
+- self.assertRaises(TypeError, ssl.RAND_egd, 1)
+- self.assertRaises(TypeError, ssl.RAND_egd, 'foo', 1)
+ ssl.RAND_add("this is a random string", 75.0)
+
+ def test_parse_cert(self):
diff --git a/devel/rust/BUILD b/devel/rust/BUILD
index 2870463..aa8a5fa 100755
--- a/devel/rust/BUILD
+++ b/devel/rust/BUILD
@@ -1,2 +1,3 @@
-./configure --prefix=/usr --disable-docs &&
+CXXFLAGS="${CXXFLAGS//-DPIC}" &&
+./configure --prefix="$INSTALL_ROOT"/usr --disable-docs $OPTS &&
make
diff --git a/devel/rust/DEPENDS b/devel/rust/DEPENDS
new file mode 100755
index 0000000..f33eacf
--- /dev/null
+++ b/devel/rust/DEPENDS
@@ -0,0 +1 @@
+depends llvm
diff --git a/devel/rust/DETAILS b/devel/rust/DETAILS
index e51912e..335e155 100755
--- a/devel/rust/DETAILS
+++ b/devel/rust/DETAILS
@@ -1,8 +1,9 @@
SPELL=rust
- VERSION=0.6
-
SOURCE_HASH=sha512:de8837bc0d280b2341b164d787caf907c669daaccf54eb9af8e515115577bd8a4a0165bc5ec7f7f927736224a9f50f9366ce3e9002bec4d9752dfeb3a6b6f16d
- SOURCE=$SPELL-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ SPELLX=rustc
+ VERSION=1.0.0-alpha.2
+
SOURCE_HASH=sha512:54e12917a829eaa8d84777564ba91013bb1cef021c2fbcf88688d718ded15718f1063828b453eb66e8a750290bf1b45039669e7185963defd32334b2b69d881b
+ SOURCE=$SPELLX-$VERSION-src.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
SOURCE_URL[0]=http://static.rust-lang.org/dist/$SOURCE
WEB_SITE=http://www.rust-lang.org/
ENTERED=20130529
diff --git a/devel/rust/HISTORY b/devel/rust/HISTORY
index d794a19..8d3eeff 100644
--- a/devel/rust/HISTORY
+++ b/devel/rust/HISTORY
@@ -1,2 +1,7 @@
+2015-03-04 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD: Removed -DPIC, breaks build
+ * DEPENDS: Depends on llvm
+ * DETAILS: updated spell to 1.0.0-alpha.2
+
2013-05-29 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS, BUILD: spell created, version 0.6
diff --git a/http/cadaver/DEPENDS b/http/cadaver/DEPENDS
index a0cef80..d73d74b 100755
--- a/http/cadaver/DEPENDS
+++ b/http/cadaver/DEPENDS
@@ -6,13 +6,13 @@ optional_depends -sub DAV neon \
if ! is_depends_enabled $SPELL neon; then
config_query_list CADAVER_SSL "Which SSL backend do you want for SSL
support?" \
none \
- SSL \
+ openssl \
gnutls &&

case $CADAVER_SSL in
none) OPTS="--without-ssl $OPTS"
;;
- SSL) depends openssl "--with-ssl=openssl"
+ openssl) depends SSL "--with-ssl=openssl"
;;
gnutls) depends gnutls "--with-ssl=gnutls"
;;
diff --git a/http/cadaver/HISTORY b/http/cadaver/HISTORY
index d354f5e..5c3e592 100644
--- a/http/cadaver/HISTORY
+++ b/http/cadaver/HISTORY
@@ -1,5 +1,5 @@
-2014-08-19 Treeve Jelbert <treeve AT sourcemage.org>
- * DEPENDS: openssl => SSL
+2015-03-05 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: use SSL provider

2012-05-24 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: use DAV subdependency from neon
diff --git a/http/links-twibright/HISTORY b/http/links-twibright/HISTORY
index 673b553..4a74038 100644
--- a/http/links-twibright/HISTORY
+++ b/http/links-twibright/HISTORY
@@ -1,3 +1,7 @@
+2015-03-06 Vlad Glagolev <stealth AT sourcemage.org>
+ * PRE_BUILD: optionally apply a patch
+ * libressl.patch: added, to fix build with libressl
+
2014-12-25 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.9

diff --git a/http/links-twibright/PRE_BUILD b/http/links-twibright/PRE_BUILD
new file mode 100755
index 0000000..6efb37b
--- /dev/null
+++ b/http/links-twibright/PRE_BUILD
@@ -0,0 +1,7 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+# the patch drops EGD support for LibreSSL, so make it optional
+if is_depends_enabled $SPELL $(get_spell_provider $SPELL SSL) && [[
$(get_spell_provider $SPELL SSL) == "libressl" ]]; then
+ patch -p1 < "$SPELL_DIRECTORY/libressl.patch"
+fi
diff --git a/http/links-twibright/libressl.patch
b/http/links-twibright/libressl.patch
new file mode 100644
index 0000000..2b89393
--- /dev/null
+++ b/http/links-twibright/libressl.patch
@@ -0,0 +1,17 @@
+diff -Naur links-2.8/https.c links-2.8-1/https.c
+--- links-2.8/https.c 2013-09-20 23:17:00.000000000 +0200
++++ links-2.8-1/https.c 2014-07-17 10:24:34.338197062 +0200
+@@ -36,11 +36,8 @@
+ unsigned os_pool_size;
+
+ const unsigned char *f = (const unsigned char
*)RAND_file_name(cast_char f_randfile, sizeof(f_randfile));
+- if (f && RAND_egd(cast_const_char f) < 0) {
+- /* Not an EGD, so read and write to it */
+- if (RAND_load_file(cast_const_char f_randfile, -1))
+- RAND_write_file(cast_const_char f_randfile);
+- }
++ if (RAND_load_file(cast_const_char f_randfile, -1))
++ RAND_write_file(cast_const_char f_randfile);
+
+ os_seed_random(&os_pool, &os_pool_size);
+ if (os_pool_size) RAND_add(os_pool, os_pool_size,
os_pool_size);
diff --git a/kernels/kmod/DETAILS b/kernels/kmod/DETAILS
index d7f4052..c3deac2 100755
--- a/kernels/kmod/DETAILS
+++ b/kernels/kmod/DETAILS
@@ -1,6 +1,6 @@
SPELL=kmod
- VERSION=19
-
SOURCE_HASH=sha512:317aebbfe12e2bd8f610d799642499d411e017cbda6082d0de92b1597753d29f42c4a2faac574879166e8cda8d7fd42ad2f98086b169e85b238cf024887ec0ee
+ VERSION=20
+
SOURCE_HASH=sha512:1026d80486e6c823fc74a439d15a8b1e4a501140f67568165904b43a73130133d6c84075ec8a7981a5d4a187d5fbd21afd197de4e81cc05a66506711865edf96
SOURCE=$SPELL-$VERSION.tar.xz
# SOURCE2=$SOURCE.sign
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/kernels/kmod/HISTORY b/kernels/kmod/HISTORY
index 292a155..6b8d76f 100644
--- a/kernels/kmod/HISTORY
+++ b/kernels/kmod/HISTORY
@@ -1,3 +1,6 @@
+2015-03-02 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 20
+
2014-11-18 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 19

diff --git a/libs/ldns/CONFIGURE b/libs/ldns/CONFIGURE
index b9daa76..dd586c4 100755
--- a/libs/ldns/CONFIGURE
+++ b/libs/ldns/CONFIGURE
@@ -12,14 +12,15 @@ config_query_option LDNS_OPTS "Enable DANE support?" y \
"--enable-dane" \
"--disable-dane" &&

-if spell_ok openssl && is_version_less $(installed_version openssl) 1.0; then
+if spell_ok openssl && is_version_less $(installed_version openssl) 1.0 ||
spell_ok libressl; then
message "${MESSAGE_COLOR}WARNING: GOST support requires OpenSSL 1.0, which
is not installed. If you need it," &&
message "select 1.0 below to replace current
${DEFAULT_COLOR}$(installed_version openssl)${MESSAGE_COLOR} version with one
from OpenSSL 1.0 branch.${DEFAULT_COLOR}"
fi &&

config_query_list LDNS_OPENSSL "Which OpenSSL branch?" \
0.9 \
- 1.0 &&
+ 1.0 \
+ libressl &&

config_query_option LDNS_DRILL "Build and install drill?" n \
"--with-drill" "--without-drill" &&
diff --git a/libs/ldns/DEPENDS b/libs/ldns/DEPENDS
index 03e6093..4fd2a14 100755
--- a/libs/ldns/DEPENDS
+++ b/libs/ldns/DEPENDS
@@ -7,8 +7,10 @@ if [[ $LDNS_OPENSSL == "1.0" ]]; then
config_query_option LDNS_OPTS "Enable GOST support?" y \
"--enable-gost" \
"--disable-gost"
-else
+elif [[ $LDNS_OPENSSL == "0.9" ]]; then
depends openssl '--disable-gost'
+else
+ depends libressl '--disable-gost'
fi &&

optional_depends -sub PYTHON swig \
diff --git a/libs/ldns/HISTORY b/libs/ldns/HISTORY
index 352fc25..86d00d2 100644
--- a/libs/ldns/HISTORY
+++ b/libs/ldns/HISTORY
@@ -1,3 +1,6 @@
+2015-03-06 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS, CONFIGURE: added libressl build support
+
2014-11-22 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: PATCHLEVEL++
* CONFIGURE: added missing options; corrected GOST notice
diff --git a/libs/libtasn1/DETAILS b/libs/libtasn1/DETAILS
index 035faae..f557184 100755
--- a/libs/libtasn1/DETAILS
+++ b/libs/libtasn1/DETAILS
@@ -1,5 +1,5 @@
SPELL=libtasn1
- VERSION=4.0
+ VERSION=4.2
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
SOURCE2_IGNORE=signature
diff --git a/libs/libtasn1/HISTORY b/libs/libtasn1/HISTORY
index 9477d4e..c84b23d 100644
--- a/libs/libtasn1/HISTORY
+++ b/libs/libtasn1/HISTORY
@@ -1,3 +1,6 @@
+2015-03-02 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 4.2
+
2014-07-24 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 4.0

diff --git a/libs/pcre/BUILD b/libs/pcre/BUILD
index 5f9466f..f124548 100755
--- a/libs/pcre/BUILD
+++ b/libs/pcre/BUILD
@@ -1,4 +1,5 @@
-OPTS+=" --disable-static $JIT $PCRE8 $PCRE16" &&
+OPTS="$JIT $PCRE8 $PCRE16 $OPTS" &&
+
if [[ $BUILDUTF == y ]]; then
OPTS="$OPTS --enable-utf"
if [[ $UTFPROPERTIES == y ]]; then
diff --git a/libs/pcre/HISTORY b/libs/pcre/HISTORY
index a90e71b..9ab5a89 100644
--- a/libs/pcre/HISTORY
+++ b/libs/pcre/HISTORY
@@ -1,3 +1,7 @@
+2015-03-06 Vlad Glagolev <stealth AT sourcemage.org>
+ * BUILD: re-enabled build of static libraries
+ * cve-2014-8964: renamed to cve-2014-8964.patch
+
2014-11-22 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 8.36
SECURITY_PATCH++, upstream patch
diff --git a/libs/pcre/PRE_BUILD b/libs/pcre/PRE_BUILD
index fe4a475..dccf52e 100755
--- a/libs/pcre/PRE_BUILD
+++ b/libs/pcre/PRE_BUILD
@@ -1,3 +1,3 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-patch -p0 < $SPELL_DIRECTORY/cve-2014-8964
+patch -p0 < $SPELL_DIRECTORY/cve-2014-8964.patch
diff --git a/libs/pcre/cve-2014-8964 b/libs/pcre/cve-2014-8964
deleted file mode 100644
index e15e0b0..0000000
--- a/libs/pcre/cve-2014-8964
+++ /dev/null
@@ -1,15 +0,0 @@
-+++ pcre_exec.c (working copy)
-@@ -1404,8 +1404,11 @@
- condition = TRUE;
-
- /* Advance ecode past the assertion to the start of the first
branch,
-- but adjust it so that the general choosing code below works. */
--
-+ but adjust it so that the general choosing code below works. If the
-+ assertion has a quantifier that allows zero repeats we must skip
over
-+ the BRAZERO. This is a lunatic thing to do, but somebody did! */
-+
-+ if (*ecode == OP_BRAZERO) ecode++;
- ecode += GET(ecode, 1);
- while (*ecode == OP_ALT) ecode += GET(ecode, 1);
- ecode += 1 + LINK_SIZE - PRIV(OP_lengths)[condcode];
diff --git a/libs/pcre/cve-2014-8964.patch b/libs/pcre/cve-2014-8964.patch
new file mode 100644
index 0000000..e15e0b0
--- /dev/null
+++ b/libs/pcre/cve-2014-8964.patch
@@ -0,0 +1,15 @@
++++ pcre_exec.c (working copy)
+@@ -1404,8 +1404,11 @@
+ condition = TRUE;
+
+ /* Advance ecode past the assertion to the start of the first
branch,
+- but adjust it so that the general choosing code below works. */
+-
++ but adjust it so that the general choosing code below works. If the
++ assertion has a quantifier that allows zero repeats we must skip
over
++ the BRAZERO. This is a lunatic thing to do, but somebody did! */
++
++ if (*ecode == OP_BRAZERO) ecode++;
+ ecode += GET(ecode, 1);
+ while (*ecode == OP_ALT) ecode += GET(ecode, 1);
+ ecode += 1 + LINK_SIZE - PRIV(OP_lengths)[condcode];
diff --git a/mail/exim/CONFIGURE b/mail/exim/CONFIGURE
index 1f55766..e045f4d 100755
--- a/mail/exim/CONFIGURE
+++ b/mail/exim/CONFIGURE
@@ -54,7 +54,7 @@ fi &&
if spell_ok gnutls; then
config_query_list EXIM_TLS 'Enable GNU TLS support?' \
gnutls openssl
-elif spell_ok openssl; then
+elif spell_ok openssl || spell_ok libressl; then
config_query_list EXIM_TLS 'Enable GNU TLS support?' \
openssl gnutls
else
diff --git a/mail/exim/DEPENDS b/mail/exim/DEPENDS
index 9124750..e09b55a 100755
--- a/mail/exim/DEPENDS
+++ b/mail/exim/DEPENDS
@@ -19,7 +19,7 @@ if [[ "$EXIM_TLS" == "gnutls" ]]; then
depends libgcrypt &&
depends libtasn1
elif [[ "$EXIM_TLS" == "openssl" ]]; then
- depends openssl
+ depends SSL
fi &&

optional_depends cyrus-sasl \
diff --git a/mail/exim/HISTORY b/mail/exim/HISTORY
index 1fa693b..1217ba0 100644
--- a/mail/exim/HISTORY
+++ b/mail/exim/HISTORY
@@ -1,3 +1,6 @@
+2015-03-06 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS, CONFIGURE: use SSL provider
+
2014-11-28 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS, BUILD: added ability to build with experimental SPF support

diff --git a/net/socat/HISTORY b/net/socat/HISTORY
index 8f25c14..30c1e35 100644
--- a/net/socat/HISTORY
+++ b/net/socat/HISTORY
@@ -1,3 +1,8 @@
+2015-03-06 Vlad Glagolev <stealth AT sourcemage.org>
+ * PRE_BUILD: added, optionally apply a patch
+ * libressl.patch, added, backported official patch from OpenBSD and
+ Sabotage Linux with my tiny correction for xio-openssl.c
+
2015-02-03 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.7.3.0; SECURITY_PATCH++ (CVE-2015-1379)
* DEPENDS: fixed openssl flag
diff --git a/net/socat/PRE_BUILD b/net/socat/PRE_BUILD
new file mode 100755
index 0000000..d96764b
--- /dev/null
+++ b/net/socat/PRE_BUILD
@@ -0,0 +1,7 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+# the patch drops EGD support for LibreSSL, so make it optional
+if is_depends_enabled $SPELL $(get_spell_provider $SPELL SSL) && [[
$(get_spell_provider $SPELL SSL) == "libressl" ]]; then
+ patch -p0 < "$SPELL_DIRECTORY/libressl.patch"
+fi
diff --git a/net/socat/libressl.patch b/net/socat/libressl.patch
new file mode 100644
index 0000000..b7e293f
--- /dev/null
+++ b/net/socat/libressl.patch
@@ -0,0 +1,174 @@
+$OpenBSD: patch-doc_xio_help,v 1.1 2014/04/24 15:17:08 sthen Exp $
+--- doc/xio.help.orig Sun Jun 23 07:16:48 2013
++++ doc/xio.help Sat Apr 19 15:47:37 2014
+@@ -4566,19 +4566,6 @@ must contain certificates in PEM format and their hash
+ documentation)
+
+
+-Option: openssl-egd=file
+-Aliases: egd
+-
+-Type: FILENAME
+-Option group: OPENSSL
+-Phase: SPEC
+-Platforms: (depends on openssl installation)
+-
+-On some systems, openssl requires an explicit source of random data. Specify
+-the socket name where an entropy gathering daemon like egd provides random
+-data, e.g. /dev/egd-pool.
+-
+-
+ Option: openssl-pseudo
+ Aliases: pseudo
+
+$OpenBSD: patch-sslcls_c,v 1.2 2014/07/12 14:30:20 pascal Exp $
+--- sslcls.c.orig Sat Feb 8 20:23:33 2014
++++ sslcls.c Sat Jul 12 16:01:25 2014
+@@ -275,14 +275,6 @@ void sycSSL_free(SSL *ssl) {
+ return;
+ }
+
+-int sycRAND_egd(const char *path) {
+- int result;
+- Debug1("RAND_egd(\"%s\")", path);
+- result = RAND_egd(path);
+- Debug1("RAND_egd() -> %d", result);
+- return result;
+-}
+-
+ DH *sycPEM_read_bio_DHparams(BIO *bp, DH **x, pem_password_cb *cb, void *u)
{
+ DH *result;
+ Debug4("PEM_read_bio_DHparams(%p, %p, %p, %p)",
+@@ -319,7 +311,7 @@ int sycFIPS_mode_set(int onoff) {
+ }
+ #endif /* WITH_FIPS */
+
+-#if OPENSSL_VERSION_NUMBER >= 0x00908000L
++#if (OPENSSL_VERSION_NUMBER >= 0x00908000L) && !defined(OPENSSL_NO_COMP)
+ const COMP_METHOD *sycSSL_get_current_compression(SSL *ssl) {
+ const COMP_METHOD *result;
+ Debug1("SSL_get_current_compression(%p)", ssl);
+$OpenBSD: patch-sslcls_h,v 1.2 2014/07/12 14:30:20 pascal Exp $
+--- sslcls.h.orig Sun Jun 23 08:16:48 2013
++++ sslcls.h Sat Jul 12 15:59:58 2014
+@@ -41,7 +41,6 @@ X509 *sycSSL_get_peer_certificate(SSL *ssl);
+ int sycSSL_shutdown(SSL *ssl);
+ void sycSSL_CTX_free(SSL_CTX *ctx);
+ void sycSSL_free(SSL *ssl);
+-int sycRAND_egd(const char *path);
+
+ DH *sycPEM_read_bio_DHparams(BIO *bp, DH **x, pem_password_cb *cb, void *u);
+
+@@ -49,7 +48,7 @@ BIO *sycBIO_new_file(const char *filename, const char
+
+ int sycFIPS_mode_set(int onoff);
+
+-#if OPENSSL_VERSION_NUMBER >= 0x00908000L
++#if (OPENSSL_VERSION_NUMBER >= 0x00908000L) && !defined(OPENSSL_NO_COMP)
+ const COMP_METHOD *sycSSL_get_current_compression(SSL *ssl);
+ const COMP_METHOD *sycSSL_get_current_expansion(SSL *ssl);
+ const char *sycSSL_COMP_get_name(const COMP_METHOD *comp);
+@@ -92,7 +91,6 @@ const char *sycSSL_COMP_get_name(const COMP_METHOD *co
+ #define sycSSL_shutdown(s) SSL_shutdown(s)
+ #define sycSSL_CTX_free(c) SSL_CTX_free(c)
+ #define sycSSL_free(s) SSL_free(s)
+-#define sycRAND_egd(p) RAND_egd(p)
+
+ #define sycPEM_read_bio_DHparams(b,x,p,u) PEM_read_bio_DHparams(b,x,p,u)
+
+--- xio-openssl.c.orig 2015-01-24 17:33:42.000000000 +0300
++++ xio-openssl.c 2015-03-06 12:01:49.062183359 +0300
+@@ -108,7 +108,6 @@
+ const struct optdesc opt_openssl_dhparam = { "openssl-dhparam",
"dh", OPT_OPENSSL_DHPARAM, GROUP_OPENSSL, PH_SPEC, TYPE_FILENAME,
OFUNC_SPEC };
+ const struct optdesc opt_openssl_cafile = { "openssl-cafile",
"cafile", OPT_OPENSSL_CAFILE, GROUP_OPENSSL, PH_SPEC, TYPE_FILENAME,
OFUNC_SPEC };
+ const struct optdesc opt_openssl_capath = { "openssl-capath",
"capath", OPT_OPENSSL_CAPATH, GROUP_OPENSSL, PH_SPEC, TYPE_FILENAME,
OFUNC_SPEC };
+-const struct optdesc opt_openssl_egd = { "openssl-egd",
"egd", OPT_OPENSSL_EGD, GROUP_OPENSSL, PH_SPEC, TYPE_FILENAME,
OFUNC_SPEC };
+ const struct optdesc opt_openssl_pseudo = { "openssl-pseudo",
"pseudo", OPT_OPENSSL_PSEUDO, GROUP_OPENSSL, PH_SPEC, TYPE_BOOL,
OFUNC_SPEC };
+ #if OPENSSL_VERSION_NUMBER >= 0x00908000L
+ const struct optdesc opt_openssl_compress = { "openssl-compress",
"compress", OPT_OPENSSL_COMPRESS, GROUP_OPENSSL, PH_SPEC, TYPE_STRING,
OFUNC_SPEC };
+@@ -147,7 +146,7 @@
+ static void openssl_conn_loginfo(SSL *ssl) {
+ Notice1("SSL connection using %s", SSL_get_cipher(ssl));
+
+-#if OPENSSL_VERSION_NUMBER >= 0x00908000L
++#if (OPENSSL_VERSION_NUMBER >= 0x00908000L) && !defined(OPENSSL_NO_COMP)
+ {
+ const COMP_METHOD *comp, *expansion;
+
+@@ -722,7 +721,6 @@
+ char *opt_dhparam = NULL; /* file name of DH params */
+ char *opt_cafile = NULL; /* certificate authority file */
+ char *opt_capath = NULL; /* certificate authority directory */
+- char *opt_egd = NULL; /* entropy gathering daemon socket path */
+ #if OPENSSL_VERSION_NUMBER >= 0x00908000L
+ char *opt_compress = NULL; /* compression method */
+ #endif
+@@ -741,7 +739,6 @@
+ retropt_string(opts, OPT_OPENSSL_CAPATH, &opt_capath);
+ retropt_string(opts, OPT_OPENSSL_KEY, &opt_key);
+ retropt_string(opts, OPT_OPENSSL_DHPARAM, &opt_dhparam);
+- retropt_string(opts, OPT_OPENSSL_EGD, &opt_egd);
+ retropt_bool(opts,OPT_OPENSSL_PSEUDO, &opt_pseudo);
+ #if OPENSSL_VERSION_NUMBER >= 0x00908000L
+ retropt_string(opts, OPT_OPENSSL_COMPRESS, &opt_compress);
+@@ -877,10 +874,6 @@
+ }
+ }
+
+- if (opt_egd) {
+- sycRAND_egd(opt_egd);
+- }
+-
+ if (opt_pseudo) {
+ long int randdata;
+ /* initialize libc random from actual microseconds */
+@@ -1098,7 +1091,7 @@
+ if (e == ((ERR_LIB_RAND<<24)|
+ (RAND_F_SSLEAY_RAND_BYTES<<12)|
+ (RAND_R_PRNG_NOT_SEEDED)) /*0x24064064*/) {
+- Error("too few entropy; use options \"egd\" or \"pseudo\"");
++ Error("too few entropy; use option \"pseudo\"");
+ stat = STAT_NORETRY;
+ } else {
+ Msg2(level, "%s(): %s", funcname, ERR_error_string(e, buf));
+$OpenBSD: patch-xio-openssl_h,v 1.1 2014/04/24 15:17:08 sthen Exp $
+--- xio-openssl.h.orig Sun Jun 23 07:16:48 2013
++++ xio-openssl.h Sat Apr 19 15:58:21 2014
+@@ -21,7 +21,6 @@ extern const struct optdesc opt_openssl_key;
+ extern const struct optdesc opt_openssl_dhparam;
+ extern const struct optdesc opt_openssl_cafile;
+ extern const struct optdesc opt_openssl_capath;
+-extern const struct optdesc opt_openssl_egd;
+ extern const struct optdesc opt_openssl_pseudo;
+ #if OPENSSL_VERSION_NUMBER >= 0x00908000L
+ extern const struct optdesc opt_openssl_compress;
+$OpenBSD: patch-xioopts_c,v 1.1 2014/04/24 15:17:08 sthen Exp $
+--- xioopts.c.orig Sun Mar 9 14:51:39 2014
++++ xioopts.c Sat Apr 19 15:43:29 2014
+@@ -409,7 +409,6 @@ const struct optname optionnames[] = {
+ #ifdef ECHOPRT
+ IF_TERMIOS("echoprt", &opt_echoprt)
+ #endif
+- IF_OPENSSL("egd", &opt_openssl_egd)
+ IF_ANY ("end-close", &opt_end_close)
+ IF_TERMIOS("eof", &opt_veof)
+ IF_TERMIOS("eol", &opt_veol)
+@@ -1098,7 +1097,6 @@ const struct optname optionnames[] = {
+ IF_OPENSSL("openssl-compress", &opt_openssl_compress)
+ #endif
+ IF_OPENSSL("openssl-dhparam", &opt_openssl_dhparam)
+- IF_OPENSSL("openssl-egd", &opt_openssl_egd)
+ #if WITH_FIPS
+ IF_OPENSSL("openssl-fips", &opt_openssl_fips)
+ #endif
+$OpenBSD: patch-xioopts_h,v 1.1 2014/04/24 15:17:08 sthen Exp $
+--- xioopts.h.orig Sun Jun 23 07:16:48 2013
++++ xioopts.h Sat Apr 19 15:55:57 2014
+@@ -477,7 +477,6 @@ enum e_optcode {
+ OPT_OPENSSL_COMPRESS,
+ #endif
+ OPT_OPENSSL_DHPARAM,
+- OPT_OPENSSL_EGD,
+ OPT_OPENSSL_FIPS,
+ OPT_OPENSSL_KEY,
+ OPT_OPENSSL_METHOD,
diff --git a/net/stunnel/HISTORY b/net/stunnel/HISTORY
index 20e2ca0..50910a1 100644
--- a/net/stunnel/HISTORY
+++ b/net/stunnel/HISTORY
@@ -1,3 +1,7 @@
+2015-03-06 Vlad Glagolev <stealth AT sourcemage.org>
+ * PRE_BUILD: apply a patch
+ * libressl.patch: added, to fix build with libressl
+
2015-02-03 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 5.10

diff --git a/net/stunnel/PRE_BUILD b/net/stunnel/PRE_BUILD
index 40fdf4a..c3c2124 100755
--- a/net/stunnel/PRE_BUILD
+++ b/net/stunnel/PRE_BUILD
@@ -1,6 +1,8 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

+patch -p1 < "$SPELL_DIRECTORY/libressl.patch" &&
+
# fixed default paths in configuration file
sedit "s:@prefix@::g" tools/stunnel.conf-sample.in &&

diff --git a/net/stunnel/libressl.patch b/net/stunnel/libressl.patch
new file mode 100644
index 0000000..85b9007
--- /dev/null
+++ b/net/stunnel/libressl.patch
@@ -0,0 +1,18 @@
+--- stunnel-5.02.org/src/ssl.c 2014-07-12 06:13:07.356889656 +0000
++++ stunnel-5.02/src/ssl.c 2014-07-12 06:15:39.032889896 +0000
+@@ -195,6 +195,7 @@
+ }
+ s_log(LOG_DEBUG, "RAND_screen failed to sufficiently seed PRNG");
+ #else
++#ifdef HAVE_RAND_EGD
+ if(global->egd_sock) {
+ if((bytes=RAND_egd(global->egd_sock))==-1) {
+ s_log(LOG_WARNING, "EGD Socket %s failed", global->egd_sock);
+@@ -207,6 +208,7 @@
+ so no need to check if seeded sufficiently */
+ }
+ }
++#endif
+ /* try the good-old default /dev/urandom, if available */
+ totbytes+=add_rand_file(global, "/dev/urandom");
+ if(RAND_status())
diff --git a/python-pypi/pyopenssl/DETAILS b/python-pypi/pyopenssl/DETAILS
index 313b6e6..b4b48d4 100755
--- a/python-pypi/pyopenssl/DETAILS
+++ b/python-pypi/pyopenssl/DETAILS
@@ -1,8 +1,9 @@
SPELL=pyopenssl
SPELLX=pyOpenSSL
VERSION=0.14
-
SOURCE_HASH=sha512:afd14aad8f7313425b9f0d79d80fbc17feaf128204cbda21db4116c8ce6e08e77e865110971c02bdc99b27a2d43402cc87f04586375167f41c61d0f474109512
SECURITY_PATCH=1
+ PATCHLEVEL=1
+
SOURCE_HASH=sha512:afd14aad8f7313425b9f0d79d80fbc17feaf128204cbda21db4116c8ce6e08e77e865110971c02bdc99b27a2d43402cc87f04586375167f41c61d0f474109512
SOURCE=$SPELLX-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
SOURCE_URL[0]=http://pypi.python.org/packages/source/p/$SPELLX/$SOURCE
diff --git a/python-pypi/pyopenssl/HISTORY b/python-pypi/pyopenssl/HISTORY
index a818a58..827ccaf 100644
--- a/python-pypi/pyopenssl/HISTORY
+++ b/python-pypi/pyopenssl/HISTORY
@@ -1,5 +1,10 @@
-2014-08-19 Treeve Jelbert <treeve AT sourcemage.org>
- * DEPENDS: openssl => SSL
+2015-03-06 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: PATCHLEVEL=1
+ * PRE_BUILD: added, to optionally apply a patch
+ * libressl.patch: added, to correct usage with libressl
+
+2014-08-19 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: openssl => SSL

2014-05-25 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 0.14
diff --git a/python-pypi/pyopenssl/PRE_BUILD b/python-pypi/pyopenssl/PRE_BUILD
new file mode 100755
index 0000000..66d995c
--- /dev/null
+++ b/python-pypi/pyopenssl/PRE_BUILD
@@ -0,0 +1,7 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+# the patch drops EGD support for LibreSSL, so make it optional
+if [[ $(get_spell_provider $SPELL SSL) == "libressl" ]]; then
+ patch -p0 < "$SPELL_DIRECTORY/libressl.patch"
+fi
diff --git a/python-pypi/pyopenssl/libressl.patch
b/python-pypi/pyopenssl/libressl.patch
new file mode 100644
index 0000000..f244daf
--- /dev/null
+++ b/python-pypi/pyopenssl/libressl.patch
@@ -0,0 +1,94 @@
+--- doc/api/rand.rst.orig
++++ doc/api/rand.rst
+@@ -31,13 +31,6 @@
+ This is a wrapper for the C function :py:func:`RAND_cleanup`.
+
+
+-.. py:function:: egd(path[, bytes])
+-
+- Query the `Entropy Gathering Daemon
<http://www.lothar.com/tech/crypto/>`_ on
+- socket *path* for *bytes* bytes of random data and uses :py:func:`add`
to
+- seed the PRNG. The default value of *bytes* is 255.
+-
+-
+ .. py:function:: load_file(path[, bytes])
+
+ Read *bytes* bytes (or all of it, if *bytes* is negative) of data from
the
+--- OpenSSL/rand.py.orig
++++ OpenSSL/rand.py
+@@ -93,29 +93,6 @@
+
+
+
+-def egd(path, bytes=_unspecified):
+- """
+- Query an entropy gathering daemon (EGD) for random data and add it to
the
+- PRNG. I haven't found any problems when the socket is missing, the
function
+- just returns 0.
+-
+- :param path: The path to the EGD socket
+- :param bytes: (optional) The number of bytes to read, default is 255
+- :returns: The number of bytes read (NB: a value of 0 isn't necessarily
an
+- error, check rand.status())
+- """
+- if not isinstance(path, _builtin_bytes):
+- raise TypeError("path must be a byte string")
+-
+- if bytes is _unspecified:
+- bytes = 255
+- elif not isinstance(bytes, int):
+- raise TypeError("bytes must be an integer")
+-
+- return _lib.RAND_egd_bytes(path, bytes)
+-
+-
+-
+ def cleanup():
+ """
+ Erase the memory used by the PRNG.
+--- OpenSSL/test/test_rand.py.orig
++++ OpenSSL/test/test_rand.py
+@@ -103,43 +103,6 @@
+ self.assertTrue(rand.status() in (1, 2))
+
+
+- def test_egd_wrong_args(self):
+- """
+- :py:obj:`OpenSSL.rand.egd` raises :py:obj:`TypeError` when called
with the wrong
+- number of arguments or with arguments not of type :py:obj:`str` and
:py:obj:`int`.
+- """
+- self.assertRaises(TypeError, rand.egd)
+- self.assertRaises(TypeError, rand.egd, None)
+- self.assertRaises(TypeError, rand.egd, "foo", None)
+- self.assertRaises(TypeError, rand.egd, None, 3)
+- self.assertRaises(TypeError, rand.egd, "foo", 3, None)
+-
+-
+- def test_egd_missing(self):
+- """
+- :py:obj:`OpenSSL.rand.egd` returns :py:obj:`0` or :py:obj:`-1` if
the
+- EGD socket passed to it does not exist.
+- """
+- result = rand.egd(self.mktemp())
+- expected = (-1, 0)
+- self.assertTrue(
+- result in expected,
+- "%r not in %r" % (result, expected))
+-
+-
+- def test_egd_missing_and_bytes(self):
+- """
+- :py:obj:`OpenSSL.rand.egd` returns :py:obj:`0` or :py:obj:`-1` if
the
+- EGD socket passed to it does not exist even if a size argument is
+- explicitly passed.
+- """
+- result = rand.egd(self.mktemp(), 1024)
+- expected = (-1, 0)
+- self.assertTrue(
+- result in expected,
+- "%r not in %r" % (result, expected))
+-
+-
+ def test_cleanup_wrong_args(self):
+ """
+ :py:obj:`OpenSSL.rand.cleanup` raises :py:obj:`TypeError` when
called with any
diff --git a/x11-libs/wine/DETAILS b/x11-libs/wine/DETAILS
index d7e79ec..e763f86 100755
--- a/x11-libs/wine/DETAILS
+++ b/x11-libs/wine/DETAILS
@@ -9,7 +9,7 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git"
FORCE_DOWNLOAD=1
else
if [[ $WINE_BRANCH == devel ]]; then
- VERSION=1.7.36
+ VERSION=1.7.38
else
VERSION=1.6.1
fi
diff --git a/x11-libs/wine/HISTORY b/x11-libs/wine/HISTORY
index 7684d56..876d9f6 100644
--- a/x11-libs/wine/HISTORY
+++ b/x11-libs/wine/HISTORY
@@ -1,3 +1,6 @@
+2015-03-06 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.7.38 (devel)
+
2015-02-07 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.7.36 (devel)

diff --git a/xfce-plugins/thunar-volman/DEPENDS
b/xfce-plugins/thunar-volman/DEPENDS
index 9a8de05..6f96e23 100755
--- a/xfce-plugins/thunar-volman/DEPENDS
+++ b/xfce-plugins/thunar-volman/DEPENDS
@@ -3,7 +3,7 @@ depends gtk+2 &&
depends libxfce4ui &&
depends libxfce4util &&
depends xfconf &&
-depends -sub GUDEV UDEV &&
+depends -sub GUDEV DEVICE-MANAGER &&

optional_depends libnotify \
"--enable-notifications" \
diff --git a/xfce-plugins/thunar-volman/DETAILS
b/xfce-plugins/thunar-volman/DETAILS
index b3e80f3..765ae35 100755
--- a/xfce-plugins/thunar-volman/DETAILS
+++ b/xfce-plugins/thunar-volman/DETAILS
@@ -1,11 +1,11 @@
SPELL=thunar-volman
- VERSION=0.8.0
+ VERSION=0.8.1
BRANCH=`echo $VERSION | cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://archive.xfce.org/src/apps/$SPELL/$BRANCH/$SOURCE

WEB_SITE=http://goodies.xfce.org/projects/thunar-plugins/thunar-volman
-
SOURCE_HASH=sha512:c953f06c82f10c5d8585662a3123cec84384b55aef45e258968d01624c1d1badc094f839dd930eb6fd5580264f5aa54f26c80df133d40c4f89fd4750116eb70f
+
SOURCE_HASH=sha512:a82c019b028277d97e7903dcbeaf4704cb7fc1e95b0ea18c6290a7a8581355691990cbdb5fa0c234ed5dd51c1ba7f1bca9a495e60f9f8597a993845481113bb6
LICENSE[0]=GPL
ENTERED=20070128
KEYWORDS="xfce"
diff --git a/xfce-plugins/thunar-volman/HISTORY
b/xfce-plugins/thunar-volman/HISTORY
index ecec2a3..6c79e8b 100644
--- a/xfce-plugins/thunar-volman/HISTORY
+++ b/xfce-plugins/thunar-volman/HISTORY
@@ -1,4 +1,8 @@
-2013-07-28 Treeve Jelbert <treeve AT sourcemage.org>
+2015-03-04 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: updated spell to 0.8.1
+ * DEPENDS: UDEV -> DEVICE-MANAGER
+
+2013-07-28 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: udev => UDEV

2012-04-29 Ismael Luceno <ismael AT sourcemage.org>
diff --git a/xfce/exo/DETAILS b/xfce/exo/DETAILS
index 33c11f1..b735327 100755
--- a/xfce/exo/DETAILS
+++ b/xfce/exo/DETAILS
@@ -1,10 +1,10 @@
SPELL=exo
- VERSION=0.10.2
+ VERSION=0.10.3
BRANCH=`echo $VERSION | cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://archive.xfce.org/src/xfce/$SPELL/$BRANCH/$SOURCE
-
SOURCE_HASH=sha512:91a5a7f7b893c427ef10ee6ce248a6b6f8e2aba4281e406a60bc8fe7fa50196eb79d8b0ad6609ab48371acf77425df8cb67124ab11b7c4ff08d1dc83bb180eae
+
SOURCE_HASH=sha512:ec6893c4340e8b345f00037df4667b7e05c3907a5f2aacb36314c48822644e757df2bb3ffd2b665afc21f8619e0f1ab3a5115374701d3c7150c3a5b73edbc331
WEB_SITE=http://thunar.xfce.org/
ENTERED=20050101
LICENSE=LGPL
diff --git a/xfce/exo/HISTORY b/xfce/exo/HISTORY
index bf29710..a603897 100644
--- a/xfce/exo/HISTORY
+++ b/xfce/exo/HISTORY
@@ -1,3 +1,6 @@
+2015-03-04 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: version 0.10.3
+
2013-03-08 Sukneet Basuta <sukneet AT sourcemage.org>
* CONFLICTS: removed, removed exo-0.5

diff --git a/xfce/garcon/DETAILS b/xfce/garcon/DETAILS
index 60abf95..e19b4bb 100755
--- a/xfce/garcon/DETAILS
+++ b/xfce/garcon/DETAILS
@@ -1,8 +1,8 @@
SPELL=garcon
- VERSION=0.2.1
+ VERSION=0.4.0
BRANCH=`echo $VERSION | cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig:UPSTREAM_HASH"
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig:"
SOURCE_URL[0]=http://archive.xfce.org/src/libs/$SPELL/$BRANCH/$SOURCE
#
SOURCE_HASH=sha512:1d3d446f8a8b7902e431fd34b77b6be8bbc92a065d319b8425adb78a62d75ec145486b768e6f823afe3cce7370f63b31d7cd6246a496d00c235bd08e34bca04f
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/xfce/garcon/HISTORY b/xfce/garcon/HISTORY
index 6d515fa..9116458 100644
--- a/xfce/garcon/HISTORY
+++ b/xfce/garcon/HISTORY
@@ -1,3 +1,6 @@
+2015-03-04 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: version 0.4.0, UPSTRAM_HASH -> WORKS_FOR_ME
+
2014-08-24 Thomas Orgis <sobukus AT sourcemage.org>
* DEPENDS: libxfce4util

diff --git a/xfce/garcon/garcon-0.2.1.tar.bz2.sig
b/xfce/garcon/garcon-0.2.1.tar.bz2.sig
deleted file mode 100644
index 00f7a12..0000000
Binary files a/xfce/garcon/garcon-0.2.1.tar.bz2.sig and /dev/null differ
diff --git a/xfce/garcon/garcon-0.4.0.tar.bz2.sig
b/xfce/garcon/garcon-0.4.0.tar.bz2.sig
new file mode 100644
index 0000000..b27bb5f
Binary files /dev/null and b/xfce/garcon/garcon-0.4.0.tar.bz2.sig differ
diff --git a/xfce/gtk-xfce-engine/DEPENDS b/xfce/gtk-xfce-engine/DEPENDS
index edffa0e..76ce898 100755
--- a/xfce/gtk-xfce-engine/DEPENDS
+++ b/xfce/gtk-xfce-engine/DEPENDS
@@ -1 +1,11 @@
-depends gtk+2
+optional_depends gtk+2 \
+ "--enable-gtk2" \
+ "--disable-gtk2" \
+ "for GTK+ 2 support" &&
+optional_depends gtk+3 \
+ "--enable-gtk3" \
+ "--disable-gtk3" \
+ "for GTK+ 3 support" &&
+if ! is_depends_enabled $SPELL gtk+2; then
+ depends gtk+3 "--enable-gtk3"
+fi
diff --git a/xfce/gtk-xfce-engine/DETAILS b/xfce/gtk-xfce-engine/DETAILS
index 3502f13..9e49305 100755
--- a/xfce/gtk-xfce-engine/DETAILS
+++ b/xfce/gtk-xfce-engine/DETAILS
@@ -1,11 +1,11 @@
SPELL=gtk-xfce-engine
- VERSION=3.0.1
+ VERSION=3.2.0
BRANCH=`echo $VERSION | cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://archive.xfce.org/src/xfce/$SPELL/$BRANCH/$SOURCE
WEB_SITE=http://www.xfce.org/
-
SOURCE_HASH=sha512:0cd701cc485fcf7e112221c550f58078ca63773b0dd8c22d052b55564ad7954c721398735fbcf85b72f2b56ac5c65c1648522c1238fe97c274093d90f80af058
+
SOURCE_HASH=sha512:c965e597c1b4aa04f3b474f3c4cea249aa6e753be697d5d3d7a19184adca650fc084f39acbd357f53eaf4180d96d5d3499866367e221ae445de4864fc9487012
LICENSE[0]=GPL
ENTERED=20030608
KEYWORDS="theme xfce"
diff --git a/xfce/gtk-xfce-engine/HISTORY b/xfce/gtk-xfce-engine/HISTORY
index 2aa04d8..8a11202 100644
--- a/xfce/gtk-xfce-engine/HISTORY
+++ b/xfce/gtk-xfce-engine/HISTORY
@@ -1,3 +1,8 @@
+2015-03-04 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: updated spell to 3.2.0
+ * DEPENDS: added gtk+3, it is optional unless no gtk+2 is
+ chosen/available
+
2012-12-23 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 3.0.1

diff --git a/xfce/libxfce4ui/DEPENDS b/xfce/libxfce4ui/DEPENDS
index b6e9793..9f8dc2e 100755
--- a/xfce/libxfce4ui/DEPENDS
+++ b/xfce/libxfce4ui/DEPENDS
@@ -29,6 +29,9 @@ optional_depends startup-notification \
optional_depends gtk-doc \
"--enable-gtk-doc" \
"--disable-gtk-doc" \
- "use gtk-doc to build documentation"
-
+ "use gtk-doc to build documentation" &&

+optional_depends gtk+3 \
+ "--enable-gtk3" \
+ "--disable-gtk3" \
+ "for GTK+ 3 support"
diff --git a/xfce/libxfce4ui/DETAILS b/xfce/libxfce4ui/DETAILS
index 98d623a..c3b8567 100755
--- a/xfce/libxfce4ui/DETAILS
+++ b/xfce/libxfce4ui/DETAILS
@@ -1,10 +1,9 @@
SPELL=libxfce4ui
- VERSION=4.10.0
- PATCHLEVEL=1
+ VERSION=4.12.0
BRANCH=`echo $VERSION | cut -d . -f 1,2`
SOURCE=${SPELL}-${VERSION}.tar.bz2
SOURCE_URL[0]=http://archive.xfce.org/src/xfce/$SPELL/$BRANCH/$SOURCE
-
SOURCE_HASH=sha512:18de63f3198480730460d93bbe10c17bb64cd115cfc3878be3e1c800e209f5bf1a7441b4661e7c09fc6109b76791c952a7792eac0c2b846827a89e3ddfb2292e
+
SOURCE_HASH=sha512:8ab502dc8bf7fbf44964fe1ea4c93d60fe21499e982fdf3c8610a2a8cd9aace87c962112e4ae6436ab22856c78f1c0644e0be856eb87783321b942fee3bf9c4d
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE=http://www.xfce.org/
LICENSE[0]=LGPL
diff --git a/xfce/libxfce4ui/HISTORY b/xfce/libxfce4ui/HISTORY
index 5befa89..bfe4dd2 100644
--- a/xfce/libxfce4ui/HISTORY
+++ b/xfce/libxfce4ui/HISTORY
@@ -1,3 +1,7 @@
+2015-03-04 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: version 4.12.0
+ * DEPENDS: added optionally gtk+3
+
2012-12-31 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS: removed dependencies on expat, libffi, libice, libxau,
libxcb, libxdmcp, libxext, libxrender and pcre
diff --git a/xfce/libxfce4util/DETAILS b/xfce/libxfce4util/DETAILS
index f8b8688..faab366 100755
--- a/xfce/libxfce4util/DETAILS
+++ b/xfce/libxfce4util/DETAILS
@@ -1,8 +1,8 @@
SPELL=libxfce4util
- VERSION=4.10.1
+ VERSION=4.12.1
BRANCH=`echo $VERSION | cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig:UPSTREAM_HASH"
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig:"
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://archive.xfce.org/src/xfce/$SPELL/$BRANCH/$SOURCE
#
SOURCE_HASH=sha512:af05f360d8218a0cdc28c7d9cf2f8482ece1b329cf3f3982af2e19d3356859e4648703d0587e67574c8848283fc96fd5631ce05633f9a0afd655420123875cd0
diff --git a/xfce/libxfce4util/HISTORY b/xfce/libxfce4util/HISTORY
index 030b575..c8915c2 100644
--- a/xfce/libxfce4util/HISTORY
+++ b/xfce/libxfce4util/HISTORY
@@ -1,3 +1,6 @@
+2015-03-04 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: version 4.12.1, UPSTREAM_HASH -> WORKS_FOR_ME
+
2014-08-24 Thomas Orgis <sobukus AT sourcemage.org>
* DEPENDS: intltool

diff --git a/xfce/libxfce4util/libxfce4util-4.10.1.tar.bz2.sig
b/xfce/libxfce4util/libxfce4util-4.10.1.tar.bz2.sig
deleted file mode 100644
index 665d4b3..0000000
Binary files a/xfce/libxfce4util/libxfce4util-4.10.1.tar.bz2.sig and
/dev/null differ
diff --git a/xfce/libxfce4util/libxfce4util-4.12.1.tar.bz2.sig
b/xfce/libxfce4util/libxfce4util-4.12.1.tar.bz2.sig
new file mode 100644
index 0000000..b4000d4
Binary files /dev/null and
b/xfce/libxfce4util/libxfce4util-4.12.1.tar.bz2.sig differ
diff --git a/xfce/parole/DEPENDS b/xfce/parole/DEPENDS
index ffd451a..74f3fa0 100755
--- a/xfce/parole/DEPENDS
+++ b/xfce/parole/DEPENDS
@@ -1,8 +1,7 @@
-depends libxfcegui4 &&
depends libxfce4util &&
depends dbus-glib &&
-depends gstreamer &&
-depends gst-plugins-base &&
+depends gstreamer-1.0 &&
+depends gst-plugins-base-1.0 &&
optional_depends libnotify \
"--enable-notify-plugin" \
"--disable-notify-plugin" \
diff --git a/xfce/parole/DETAILS b/xfce/parole/DETAILS
index f8320d8..e9d6292 100755
--- a/xfce/parole/DETAILS
+++ b/xfce/parole/DETAILS
@@ -1,8 +1,8 @@
SPELL=parole
- VERSION=0.5.1
+ VERSION=0.8.0
BRANCH=`echo $VERSION | cut -d . -f 1,2`
SOURCE="${SPELL}-${VERSION}.tar.bz2"
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig:UPSTREAM_HASH"
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig:"
SOURCE_URL[0]=http://archive.xfce.org/src/apps/$SPELL/$BRANCH/$SOURCE
#
SOURCE_HASH=sha512:ea079a07f5ae713d0dcf0b0d00fb62383db05983650192891bf767fe5dda0d76f808ae763e795978da68e4981cc34bf772fc1aaf6c4f940f484de296a4b11438
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
diff --git a/xfce/parole/HISTORY b/xfce/parole/HISTORY
index ccc0fd6..706ebf7 100644
--- a/xfce/parole/HISTORY
+++ b/xfce/parole/HISTORY
@@ -1,3 +1,7 @@
+2015-03-05 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: updated spell to 0.8.0, UPSTREAM_HASH -> WORKS_FOR_ME
+ * DEPENDS: removed libxfcegui4, switched to gstreamer 1.0
+
2013-06-14 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 0.5.1
SOURCE matches upstream posted SHA1
diff --git a/xfce/parole/parole-0.5.1.tar.bz2.sig
b/xfce/parole/parole-0.5.1.tar.bz2.sig
deleted file mode 100644
index 957d2ce..0000000
Binary files a/xfce/parole/parole-0.5.1.tar.bz2.sig and /dev/null differ
diff --git a/xfce/parole/parole-0.8.0.tar.bz2.sig
b/xfce/parole/parole-0.8.0.tar.bz2.sig
new file mode 100644
index 0000000..c5c6803
Binary files /dev/null and b/xfce/parole/parole-0.8.0.tar.bz2.sig differ
diff --git a/xfce/thunar/DEPENDS b/xfce/thunar/DEPENDS
index c6c6858..2130849 100755
--- a/xfce/thunar/DEPENDS
+++ b/xfce/thunar/DEPENDS
@@ -19,7 +19,7 @@ else
"for D-Bus support"
fi &&

-optional_depends -sub GUDEV UDEV \
+optional_depends -sub GUDEV DEVICE-MANAGER \
"--enable-gudev" \
"--disable-gudev" \
"for volume management via GUDev" &&
diff --git a/xfce/thunar/DETAILS b/xfce/thunar/DETAILS
index dec6da4..304853e 100755
--- a/xfce/thunar/DETAILS
+++ b/xfce/thunar/DETAILS
@@ -1,8 +1,8 @@
SPELL=thunar
- VERSION=1.6.3
+ VERSION=1.6.6
BRANCH=`echo $VERSION | cut -d . -f 1,2`
SOURCE=Thunar-$VERSION.tar.bz2
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig:UPSTREAM_HASH"
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig:"
SOURCE_DIRECTORY="$BUILD_DIRECTORY/Thunar-$VERSION"
SOURCE_URL[0]=http://archive.xfce.org/src/xfce/$SPELL/$BRANCH/$SOURCE
WEB_SITE=http://thunar.xfce.org/
diff --git a/xfce/thunar/HISTORY b/xfce/thunar/HISTORY
index b9df879..e7520e6 100644
--- a/xfce/thunar/HISTORY
+++ b/xfce/thunar/HISTORY
@@ -1,4 +1,8 @@
-2013-07-28 Treeve Jelbert <treeve AT sourcemage.org>
+2015-03-04 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: updated spell to 1.6.6, UPSTREAM_HASH -> WORKS_FOR_ME
+ * DEPENDS: UDEV -> DEVICE-MANAGER
+
+2013-07-28 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: udev => UDEV

2013-06-14 Eric Sandall <sandalle AT sourcemage.org>
diff --git a/xfce/thunar/Thunar-1.6.3.tar.bz2.sig
b/xfce/thunar/Thunar-1.6.3.tar.bz2.sig
deleted file mode 100644
index 52611de..0000000
Binary files a/xfce/thunar/Thunar-1.6.3.tar.bz2.sig and /dev/null differ
diff --git a/xfce/thunar/Thunar-1.6.6.tar.bz2.sig
b/xfce/thunar/Thunar-1.6.6.tar.bz2.sig
new file mode 100644
index 0000000..c54592e
Binary files /dev/null and b/xfce/thunar/Thunar-1.6.6.tar.bz2.sig differ
diff --git a/xfce/tumbler/DEPENDS b/xfce/tumbler/DEPENDS
index e2eafbf..e75bf63 100755
--- a/xfce/tumbler/DEPENDS
+++ b/xfce/tumbler/DEPENDS
@@ -28,7 +28,7 @@ optional_depends ffmpegthumbnailer \
"--disable-ffmpeg-thumbnailer" \
"for ffmpeg video thumbnailer plugin" &&

-optional_depends gstreamer \
+optional_depends gstreamer-1.0 \
"--enable-gstreamer-thumbnailer" \
"--disable-gstreamer-thumbnailer" \
"for GStreamer video thumbnailer plugin" &&
diff --git a/xfce/tumbler/DETAILS b/xfce/tumbler/DETAILS
index 2260d59..94ce0a8 100755
--- a/xfce/tumbler/DETAILS
+++ b/xfce/tumbler/DETAILS
@@ -1,8 +1,8 @@
SPELL=tumbler
- VERSION=0.1.29
+ VERSION=0.1.31
BRANCH=`echo $VERSION | cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig:UPSTREAM_HASH"
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig:"
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://archive.xfce.org/src/xfce/$SPELL/$BRANCH/$SOURCE
WEB_SITE=http://www.xfce.org/
diff --git a/xfce/tumbler/HISTORY b/xfce/tumbler/HISTORY
index 0363200..478a837 100644
--- a/xfce/tumbler/HISTORY
+++ b/xfce/tumbler/HISTORY
@@ -1,3 +1,7 @@
+2015-03-04 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: updated spell to 0.1.31, UPSTREAM_HASH -> WORKS_FOR_ME
+ * DEPENDS: gstreamer -> gstreamer-1.0
+
2013-06-14 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 0.1.29
SOURCE matches upstream posted SHA1
diff --git a/xfce/tumbler/tumbler-0.1.29.tar.bz2.sig
b/xfce/tumbler/tumbler-0.1.29.tar.bz2.sig
deleted file mode 100644
index ef0af85..0000000
Binary files a/xfce/tumbler/tumbler-0.1.29.tar.bz2.sig and /dev/null differ
diff --git a/xfce/tumbler/tumbler-0.1.31.tar.bz2.sig
b/xfce/tumbler/tumbler-0.1.31.tar.bz2.sig
new file mode 100644
index 0000000..98249dc
Binary files /dev/null and b/xfce/tumbler/tumbler-0.1.31.tar.bz2.sig differ
diff --git a/xfce/xfburn/BUILD b/xfce/xfburn/BUILD
index b5d4cff..45d043b 100755
--- a/xfce/xfburn/BUILD
+++ b/xfce/xfburn/BUILD
@@ -1,11 +1,5 @@
if [[ $XFBURN_BRANCH == scm ]]; then
- ./autogen.sh --prefix=${INSTALL_ROOT}/usr \
- --sysconfdir=${INSTALL_ROOT}/etc \
- --localstatedir=${INSTALL_ROOT}/var \
- --mandir=${INSTALL_ROOT}/usr/share/man \
- --infodir=${INSTALL_ROOT}/usr/share/info \
- $OPTS &&
- make
-else
- default_build
-fi
+ OPTS="--enable-maintainer-mode $OPTS"
+fi &&
+
+default_build
diff --git a/xfce/xfburn/DEPENDS b/xfce/xfburn/DEPENDS
index 6691172..5cf6399 100755
--- a/xfce/xfburn/DEPENDS
+++ b/xfce/xfburn/DEPENDS
@@ -4,7 +4,6 @@ depends exo &&
depends glib2 &&
depends gtk+2 &&
depends intltool &&
-depends libxfcegui4 &&

if [[ $XFBURN_BRANCH == scm ]]; then
depends docbook-xsl &&
@@ -24,12 +23,12 @@ optional_depends thunar \
"--enable-thunar-vfs" "--disable-thunar-vfs" \
"for Thunar's VFS layer" &&

-optional_depends gst-plugins-base \
+optional_depends gst-plugins-base-1.0 \
"--enable-gstreamer" "--disable-gstreamer" \
"for burning audio support" &&

-if is_depends_enabled $SPELL gst-plugins-base; then
- suggest_depends gst-plugins-good "" "" "for high quality plugins" &&
- suggest_depends gst-plugins-bad "" "" "for low quality plugins" &&
- suggest_depends gst-plugins-ugly "" "" "for plugins with licensing issues"
+if is_depends_enabled $SPELL gst-plugins-base-1.0; then
+ suggest_depends gst-plugins-good-1.0 "" "" "for high quality plugins" &&
+ suggest_depends gst-plugins-bad-1.0 "" "" "for low quality plugins" &&
+ suggest_depends gst-plugins-ugly-1.0 "" "" "for plugins with licensing
issues"
fi
diff --git a/xfce/xfburn/DETAILS b/xfce/xfburn/DETAILS
index 8b1c123..4f8b88d 100755
--- a/xfce/xfburn/DETAILS
+++ b/xfce/xfburn/DETAILS
@@ -8,11 +8,11 @@ if [[ $XFBURN_BRANCH == scm ]]; then
FORCE_DOWNLOAD=on
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git"
else
- VERSION=0.4.3
+ VERSION=0.5.2
BRANCH=`echo $VERSION | cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=http://archive.xfce.org/src/apps/$SPELL/$BRANCH/$SOURCE
-
SOURCE_HASH=sha512:3b82d763f6ac542eeaac0d752faa487f9f5101b6e2d11080e4ec80141496a3c80edfeb0249b37d7bef49505b37c1dd60468253758bbedbd1258a8f3f0db99205
+
SOURCE_HASH=sha512:3c6f27e2c8e5200d620bf32f938a1fb044b371a9fe0b5474ba8c1a487c79a7761e144ec8490f04c2389c96bc980b9f2bdfebce9d24dea30c5caae451bb9dcf5e
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
fi
WEB_SITE=http://www.xfce.org/projects/xfburn/
diff --git a/xfce/xfburn/HISTORY b/xfce/xfburn/HISTORY
index 1dc49a6..3073700 100644
--- a/xfce/xfburn/HISTORY
+++ b/xfce/xfburn/HISTORY
@@ -1,3 +1,11 @@
+2015-03-05 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: version 0.5.2
+ * BUILD: simplified git branch building
+ * DEPENDS: removed libxfcegui4, switched to gstreamer 1.0
+ * PRE_BUILD: removed glib232.patch, moved autogen.sh here for git
+ branch
+ * glib232.patch: removed
+
2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: Use get_scm_version

diff --git a/xfce/xfburn/PRE_BUILD b/xfce/xfburn/PRE_BUILD
index 595d651..532f0f5 100755
--- a/xfce/xfburn/PRE_BUILD
+++ b/xfce/xfburn/PRE_BUILD
@@ -1,6 +1,6 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

-if [[ $XFBURN_BRANCH != scm ]]; then
- patch -p0 < "$SPELL_DIRECTORY/glib232.patch"
+if [[ $XFBURN_BRANCH == scm ]]; then
+ NOCONFIGURE=1 ./autogen.sh
fi
diff --git a/xfce/xfburn/glib232.patch b/xfce/xfburn/glib232.patch
deleted file mode 100644
index 9e3951b..0000000
--- a/xfce/xfburn/glib232.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- xfburn/xfburn-settings.h.orig 2009-10-25 01:18:10.000000000 +0400
-+++ xfburn/xfburn-settings.h 2012-07-26 11:11:42.806567198 +0400
-@@ -24,6 +24,7 @@
- #endif /* !HAVE_CONFIG_H */
-
- #include <glib.h>
-+#include <glib-object.h>
-
- G_BEGIN_DECLS
-
diff --git a/xfce/xfce4-appfinder/DEPENDS b/xfce/xfce4-appfinder/DEPENDS
index 4c4be94..c7b1996 100755
--- a/xfce/xfce4-appfinder/DEPENDS
+++ b/xfce/xfce4-appfinder/DEPENDS
@@ -7,4 +7,9 @@ depends garcon &&
optional_depends gettext \
"--enable-nls" \
"--disable-nls" \
- "for Native Language Support"
+ "for Native Language Support" &&
+
+optional_depends gtk+3 \
+ "--enable-gtk3" \
+ "--disable-gtk3" \
+ "for GTK+ 3 support"
diff --git a/xfce/xfce4-appfinder/DETAILS b/xfce/xfce4-appfinder/DETAILS
index 5235a85..5d4f530 100755
--- a/xfce/xfce4-appfinder/DETAILS
+++ b/xfce/xfce4-appfinder/DETAILS
@@ -1,8 +1,8 @@
SPELL=xfce4-appfinder
- VERSION=4.10.1
+ VERSION=4.12.0
BRANCH=`echo $VERSION | cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig:UPSTREAM_HASH"
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig:"
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://archive.xfce.org/src/xfce/$SPELL/$BRANCH/$SOURCE
WEB_SITE=http://www.xfce.org/
diff --git a/xfce/xfce4-appfinder/HISTORY b/xfce/xfce4-appfinder/HISTORY
index fb8bc52..f10e43d 100644
--- a/xfce/xfce4-appfinder/HISTORY
+++ b/xfce/xfce4-appfinder/HISTORY
@@ -1,3 +1,7 @@
+2015-03-04 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: updated spell to 4.12.0, UPSTREAM_HASH -> WORKS_FOR_ME
+ * DEPENDS: added gtk+3, optionally
+
2013-06-14 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 4.10.1
SOURCE matches upstream posted SHA1
diff --git a/xfce/xfce4-appfinder/xfce4-appfinder-4.10.1.tar.bz2.sig
b/xfce/xfce4-appfinder/xfce4-appfinder-4.10.1.tar.bz2.sig
deleted file mode 100644
index f98f455..0000000
Binary files a/xfce/xfce4-appfinder/xfce4-appfinder-4.10.1.tar.bz2.sig and
/dev/null differ
diff --git a/xfce/xfce4-appfinder/xfce4-appfinder-4.12.0.tar.bz2.sig
b/xfce/xfce4-appfinder/xfce4-appfinder-4.12.0.tar.bz2.sig
new file mode 100644
index 0000000..0f3ea7b
Binary files /dev/null and
b/xfce/xfce4-appfinder/xfce4-appfinder-4.12.0.tar.bz2.sig differ
diff --git a/xfce/xfce4-dev-tools/DETAILS b/xfce/xfce4-dev-tools/DETAILS
index 6214045..5f417b2 100755
--- a/xfce/xfce4-dev-tools/DETAILS
+++ b/xfce/xfce4-dev-tools/DETAILS
@@ -1,9 +1,9 @@
SPELL=xfce4-dev-tools
- VERSION=4.10.0
+ VERSION=4.12.0
BRANCH=`echo $VERSION | cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=http://archive.xfce.org/src/xfce/$SPELL/$BRANCH/$SOURCE
-
SOURCE_HASH=sha512:8b08689656da8c103b1b9bfa92b34e5dc407f8a5969b04975bb48b3fe68d837af083dab389a092e2ec60319a59a46576eb6a01b7dde827d5be5092bb7ed903eb
+
SOURCE_HASH=sha512:60f90daaaac3eea355779ee1bb6a0cf24fb9e0ba70971c9c26ea681755de41560cfbca59a28241c2fd818031dc46e95c550424577451ceb7a42b1de0b0ff4a31
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://www.xfce.org/
LICENSE[0]=GPL
diff --git a/xfce/xfce4-dev-tools/HISTORY b/xfce/xfce4-dev-tools/HISTORY
index c0dcd33..7efe506 100644
--- a/xfce/xfce4-dev-tools/HISTORY
+++ b/xfce/xfce4-dev-tools/HISTORY
@@ -1,3 +1,6 @@
+2015-03-04 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: updated spell to 4.12.0
+
2012-04-29 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: updated spell to 4.10.0

diff --git a/xfce/xfce4-panel/DEPENDS b/xfce/xfce4-panel/DEPENDS
index 1fccfe7..0dfe4f1 100755
--- a/xfce/xfce4-panel/DEPENDS
+++ b/xfce/xfce4-panel/DEPENDS
@@ -21,4 +21,9 @@ optional_depends gtk-doc \
optional_depends gnome-doc-utils \
"--enable-gen-doc" \
"--disable-gen-doc" \
- "to generate HTML documentation"
+ "to generate HTML documentation" &&
+
+optional_depends gtk+3 \
+ "--enable-gtk3" \
+ "--disable-gtk3" \
+ "for GTK+ 3 support"
diff --git a/xfce/xfce4-panel/DETAILS b/xfce/xfce4-panel/DETAILS
index 7dee219..0a715c9 100755
--- a/xfce/xfce4-panel/DETAILS
+++ b/xfce/xfce4-panel/DETAILS
@@ -1,8 +1,8 @@
SPELL=xfce4-panel
- VERSION=4.10.1
+ VERSION=4.12.0
BRANCH=`echo $VERSION | cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig:UPSTREAM_HASH"
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig:"
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://archive.xfce.org/src/xfce/$SPELL/$BRANCH/$SOURCE
WEB_SITE=http://www.xfce.org/
diff --git a/xfce/xfce4-panel/HISTORY b/xfce/xfce4-panel/HISTORY
index c63bba4..7fd6439 100644
--- a/xfce/xfce4-panel/HISTORY
+++ b/xfce/xfce4-panel/HISTORY
@@ -1,3 +1,7 @@
+2015-03-04 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: updated spell to 4.12.0, UPSTREAM_HASH -> WORKS_FOR_ME
+ * DEPENDS: added gtk+3, optionally
+
2013-06-14 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 4.10.1
SOURCE matches upstream posted SHA1
diff --git a/xfce/xfce4-panel/xfce4-panel-4.10.1.tar.bz2.sig
b/xfce/xfce4-panel/xfce4-panel-4.10.1.tar.bz2.sig
deleted file mode 100644
index 4c8b33f..0000000
Binary files a/xfce/xfce4-panel/xfce4-panel-4.10.1.tar.bz2.sig and /dev/null
differ
diff --git a/xfce/xfce4-panel/xfce4-panel-4.12.0.tar.bz2.sig
b/xfce/xfce4-panel/xfce4-panel-4.12.0.tar.bz2.sig
new file mode 100644
index 0000000..978678b
Binary files /dev/null and b/xfce/xfce4-panel/xfce4-panel-4.12.0.tar.bz2.sig
differ
diff --git a/xfce/xfce4-power-manager/DEPENDS
b/xfce/xfce4-power-manager/DEPENDS
index ee6d066..b97021d 100755
--- a/xfce/xfce4-power-manager/DEPENDS
+++ b/xfce/xfce4-power-manager/DEPENDS
@@ -5,7 +5,6 @@ depends glib2 &&
depends dbus &&
depends dbus-glib &&
depends xfconf &&
-depends libxfcegui4 &&
depends libxfce4util &&
depends libnotify &&
optional_depends xfce4-panel \
diff --git a/xfce/xfce4-power-manager/DETAILS
b/xfce/xfce4-power-manager/DETAILS
index e0a709e..ffb208e 100755
--- a/xfce/xfce4-power-manager/DETAILS
+++ b/xfce/xfce4-power-manager/DETAILS
@@ -1,8 +1,8 @@
SPELL=xfce4-power-manager
- VERSION=1.4.2
+ VERSION=1.4.3
SOURCE="${SPELL}-${VERSION}.tar.bz2"

SOURCE_URL[0]=http://archive.xfce.org/src/xfce/$SPELL/${VERSION%.*}/$SOURCE
-
SOURCE_HASH=sha512:9a349167a0f4eb8701459f8170a79aba94b41b82fb183f7b1e2859449b5e0122d71fafec3f02817ecd399458c7cb0416fe26384b7cf494a9ba90dd6936562ac1
+
SOURCE_HASH=sha512:fb3643d2527f365f129e98cacee71e587786587ac070f47cecff035b85962ea7c4ba47fbc58fc64ecafc0fe9120acb20fef0b0ef90c47450740c1bf107bcb86b
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://xfce.org";
LICENSE[0]="GPL"
diff --git a/xfce/xfce4-power-manager/HISTORY
b/xfce/xfce4-power-manager/HISTORY
index 13f2484..bad76cc 100644
--- a/xfce/xfce4-power-manager/HISTORY
+++ b/xfce/xfce4-power-manager/HISTORY
@@ -1,3 +1,7 @@
+2015-03-04 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: updated spell to 1.4.3
+ * DEPENDS: removed libxfcegui4
+
2015-01-12 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: Fixed SOURCE_URL[0]
updated spell to 1.4.2
diff --git a/xfce/xfce4-session/DETAILS b/xfce/xfce4-session/DETAILS
index a239b98..f16e5ed 100755
--- a/xfce/xfce4-session/DETAILS
+++ b/xfce/xfce4-session/DETAILS
@@ -1,8 +1,8 @@
SPELL=xfce4-session
- VERSION=4.10.1
+ VERSION=4.12.0
BRANCH=`echo $VERSION | cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig:UPSTREAM_HASH"
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig:"
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://archive.xfce.org/src/xfce/$SPELL/$BRANCH/$SOURCE
WEB_SITE=http://www.xfce.org/
diff --git a/xfce/xfce4-session/HISTORY b/xfce/xfce4-session/HISTORY
index abc8a8f..0c90625 100644
--- a/xfce/xfce4-session/HISTORY
+++ b/xfce/xfce4-session/HISTORY
@@ -1,3 +1,6 @@
+2015-03-04 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: updated spell to 4.12.0, UPSTREAM_HASH -> WORKS_FOR_ME
+
2013-06-14 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 4.10.1
SOURCE matches upstream posted SHA1
diff --git a/xfce/xfce4-session/xfce4-session-4.10.1.tar.bz2.sig
b/xfce/xfce4-session/xfce4-session-4.10.1.tar.bz2.sig
deleted file mode 100644
index 8a674fc..0000000
Binary files a/xfce/xfce4-session/xfce4-session-4.10.1.tar.bz2.sig and
/dev/null differ
diff --git a/xfce/xfce4-session/xfce4-session-4.12.0.tar.bz2.sig
b/xfce/xfce4-session/xfce4-session-4.12.0.tar.bz2.sig
new file mode 100644
index 0000000..09b045a
Binary files /dev/null and
b/xfce/xfce4-session/xfce4-session-4.12.0.tar.bz2.sig differ
diff --git a/xfce/xfce4-settings/DEPENDS b/xfce/xfce4-settings/DEPENDS
index 81291d7..1ab65697 100755
--- a/xfce/xfce4-settings/DEPENDS
+++ b/xfce/xfce4-settings/DEPENDS
@@ -11,6 +11,11 @@ optional_depends gettext \
"--disable-nls" \
"for Native Language Support" &&

+optional_depends libinput \
+ "--enable-xorg-libinput" \
+ "--disable-xorg-libinput" \
+ "for libinput Xorg driver" &&
+
optional_depends libxrandr \
"--enable-xrandr" \
"--disable-xrandr" \
@@ -36,4 +41,9 @@ optional_depends libnotify \
"--disable-libnotify" \
"for notification support" &&

-optional_depends hwdata "" "" "for HWdata support"
+optional_depends hwdata "" "" "for HWdata support" &&
+
+optional_depends upower \
+ "--enable-upower-glib" \
+ "--disable-upower-glib" \
+ "for UPower support"
diff --git a/xfce/xfce4-settings/DETAILS b/xfce/xfce4-settings/DETAILS
index 96c13a6..d68df53 100755
--- a/xfce/xfce4-settings/DETAILS
+++ b/xfce/xfce4-settings/DETAILS
@@ -1,8 +1,8 @@
SPELL=xfce4-settings
- VERSION=4.10.1
+ VERSION=4.12.0
BRANCH=`echo $VERSION | cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig:UPSTREAM_HASH"
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig:"
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://archive.xfce.org/src/xfce/$SPELL/$BRANCH/$SOURCE
WEB_SITE=http://www.xfce.org/
diff --git a/xfce/xfce4-settings/HISTORY b/xfce/xfce4-settings/HISTORY
index 3a7f102..5de9d41 100644
--- a/xfce/xfce4-settings/HISTORY
+++ b/xfce/xfce4-settings/HISTORY
@@ -1,3 +1,7 @@
+2015-03-04 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: updated spell to 4.12.0, UPSTREAM_HASH -> WORKS_FOR_ME
+ * DEPENDS: added libinput and upower, both are optional
+
2013-06-14 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 4.10.1
SOURCE matches upstream posted SHA1
diff --git a/xfce/xfce4-settings/xfce4-settings-4.10.1.tar.bz2.sig
b/xfce/xfce4-settings/xfce4-settings-4.10.1.tar.bz2.sig
deleted file mode 100644
index eae63fd..0000000
Binary files a/xfce/xfce4-settings/xfce4-settings-4.10.1.tar.bz2.sig and
/dev/null differ
diff --git a/xfce/xfce4-settings/xfce4-settings-4.12.0.tar.bz2.sig
b/xfce/xfce4-settings/xfce4-settings-4.12.0.tar.bz2.sig
new file mode 100644
index 0000000..83e659e
Binary files /dev/null and
b/xfce/xfce4-settings/xfce4-settings-4.12.0.tar.bz2.sig differ
diff --git a/xfce/xfconf/DETAILS b/xfce/xfconf/DETAILS
index 4438c39..5717ba0 100755
--- a/xfce/xfconf/DETAILS
+++ b/xfce/xfconf/DETAILS
@@ -1,12 +1,11 @@
SPELL=xfconf
- VERSION=4.10.0
- PATCHLEVEL=1
+ VERSION=4.12.0
BRANCH=`echo $VERSION | cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://archive.xfce.org/src/xfce/$SPELL/$BRANCH/$SOURCE
WEB_SITE=http://www.xfce.org/
-
SOURCE_HASH=sha512:273820b358611681e634c6a8f107f9812197bd1e9162e987d0df61cbba5eb89be5e30b88a827a1538620b7ec58f0fa0619389a76aa8afc9f8483f64795308ed9
+
SOURCE_HASH=sha512:60cc37a7207b0486f7f2de665870facf8e339241df344d7540082f3db447b3ac88bddd306d6a09a3868878cb477d1696491c71470052ef56cb649d773bd55b56
LICENSE[0]=LGPL
ENTERED=20090227
KEYWORDS="xfce"
diff --git a/xfce/xfconf/HISTORY b/xfce/xfconf/HISTORY
index 4ea5169..8e1fc8f 100644
--- a/xfce/xfconf/HISTORY
+++ b/xfce/xfconf/HISTORY
@@ -1,3 +1,6 @@
+2015-03-04 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: version 4.12.0
+
2012-12-31 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS: removed dependencies on libffi, libxext and pcre

diff --git a/xfce/xfdesktop/DETAILS b/xfce/xfdesktop/DETAILS
index 18c5bb5..10517e9 100755
--- a/xfce/xfdesktop/DETAILS
+++ b/xfce/xfdesktop/DETAILS
@@ -1,10 +1,10 @@
SPELL=xfdesktop
- VERSION=4.10.3
+ VERSION=4.12.0
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"

SOURCE_URL[0]=http://archive.xfce.org/src/xfce/$SPELL/${VERSION:0:4}/$SOURCE
WEB_SITE=http://www.xfce.org/
-
SOURCE_HASH=sha512:756291c5cd850525dd2380071c2681faf42336fc81bbf6f7c6e7e77d2c351d88ba8b796221dcce3e9c78a68fbf0ea4f603a12026aa00922f8f9df791c099dca4
+
SOURCE_HASH=sha512:b027256d0b5db13651fa2e77c4d55f31cd177469e27acb4bc9ccf87cd6d395632a65bc20b536872a065fe96f1abb7219bcd83982b44dbe3944dce2e6e5a68e18
LICENSE[0]=GPL
ENTERED=20030608
KEYWORDS="xfce"
diff --git a/xfce/xfdesktop/HISTORY b/xfce/xfdesktop/HISTORY
index 7ee1597..a37cbd0 100644
--- a/xfce/xfdesktop/HISTORY
+++ b/xfce/xfdesktop/HISTORY
@@ -1,3 +1,6 @@
+2015-03-04 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: updated spell to 4.12.0
+
2014-11-16 Pol Vinogradov <vin.public AT gmail.com>
* DETAILS: updated to 4.10.3, removed BRANCH

diff --git a/xfce/xfwm4/DEPENDS b/xfce/xfwm4/DEPENDS
index 4ca780c..10356f2 100755
--- a/xfce/xfwm4/DEPENDS
+++ b/xfce/xfwm4/DEPENDS
@@ -42,4 +42,9 @@ optional_depends gnome-doc-utils \
optional_depends startup-notification \
"--enable-startup-notification" \
"--disable-startup-notification" \
- "for startup notification"
+ "for startup notification" &&
+
+optional_depends libdrm \
+ "--enable-libdrm" \
+ "--disable-libdrm" \
+ "for interface to kernel DRM services"
diff --git a/xfce/xfwm4/DETAILS b/xfce/xfwm4/DETAILS
index a99abed..0554ae5 100755
--- a/xfce/xfwm4/DETAILS
+++ b/xfce/xfwm4/DETAILS
@@ -1,8 +1,8 @@
SPELL=xfwm4
- VERSION=4.10.1
+ VERSION=4.12.0
BRANCH=`echo $VERSION | cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig:UPSTREAM_HASH"
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig:"
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://archive.xfce.org/src/xfce/$SPELL/$BRANCH/$SOURCE
WEB_SITE=http://www.xfce.org/
diff --git a/xfce/xfwm4/HISTORY b/xfce/xfwm4/HISTORY
index f16d9f9..8303e13 100644
--- a/xfce/xfwm4/HISTORY
+++ b/xfce/xfwm4/HISTORY
@@ -1,3 +1,7 @@
+2015-03-04 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: updated spell to 4.12.0, UPSTREAM_HASH -> WORKS_FOR_ME
+ * DEPENDS: added libdrm, optionally
+
2013-06-14 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 4.10.1
SOURCE matches upstream posted SHA1
diff --git a/xfce/xfwm4/xfwm4-4.10.1.tar.bz2.sig
b/xfce/xfwm4/xfwm4-4.10.1.tar.bz2.sig
deleted file mode 100644
index 6c4be5b..0000000
Binary files a/xfce/xfwm4/xfwm4-4.10.1.tar.bz2.sig and /dev/null differ
diff --git a/xfce/xfwm4/xfwm4-4.12.0.tar.bz2.sig
b/xfce/xfwm4/xfwm4-4.12.0.tar.bz2.sig
new file mode 100644
index 0000000..a0496ad
Binary files /dev/null and b/xfce/xfwm4/xfwm4-4.12.0.tar.bz2.sig differ



  • [SM-Commit] GIT changes to devel-xorg-modular grimoire by Vlad Glagolev (312cfe18f7d6d6e4340e4e9c7bda890387bebbad), Vlad Glagolev, 03/06/2015

Archive powered by MHonArc 2.6.24.

Top of Page