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 &&
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 &&
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/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)