New commits:
commit 49fd3f5d8f925f290225f37a4aa25b6e6e488cde
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
http/firefox: yet another fix of LDFLAGS in BUILD
(cherry picked from commit d09c61597920decfca5c30a669630b2baa67eb8a)
commit 251c75ecc55eeeb94402eb5bce95286b7527a609
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
http/firefox: version 36.0.1, SECURITY_PATCH++
(cherry picked from commit be39b834ae0703bdad4396256fd8abe45d86c81e)
commit 98a3767b877fba9543e8d9d8a085e6c0fafcd79b
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
libressl: added proper upgrading procedure from openssl
(cherry picked from commit a241320033fda80b2ed46f1c01343c5a25937f7b)
commit 928b41698bbad4ecaeb5344153897a2cefaed3ad
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
openssl: added proper upgrading procedure to libressl
(cherry picked from commit 0f50dbf5d570ef881dac5dec7aab6e67370638e4)
commit 828d1b8a872359f8169e6c1b63407282ec874407
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
ldns: added libressl build support
(cherry picked from commit 384e2b2a667f36743832c33676dfcae4eb1e1eef)
commit f1a0950b87fd773e742dd92d5ef5306f272dcd4a
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
pyopenssl: corrected work with libressl
(cherry picked from commit 8c33ca2b5bce85e537956a83b125121d115aeac5)
commit 237a2f2e04ccbb0b2bbc4942f322815d9bcfe785
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
exim: use SSL provider (build against libressl confirmed)
(cherry picked from commit 0923d5b60f79805e46f4e46673b5e519daaca224)
commit 3ec4f562049c61dd1aaa757087525716c38942d2
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
links-twibright: fixed build with libressl
(cherry picked from commit c0c0ea86a07ab9ee4689f252d3e2d75e9939e0c8)
commit 2bebb8ab69014c0460f440783520f26b0b4bd9e0
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
python: fixed build with libressl
(cherry picked from commit fdb9f64d8d8e9254f08774fa5e279add8ee815a1)
commit 6d47d296e10422e4834eaf550f325b3cd3aa5181
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
socat: fixed build with LibreSSL
(cherry picked from commit f3d4783fe537e77d9bd2b900f3d43d45273b4a5f)
commit b79892b7b3351ae0182a977ea191279963a31861
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
pcre: re-enabled build of static libraries
(cherry picked from commit 6f04b8bea8a3299b24e3b70caeb0ed4ac74a15a0)
commit a74518740ab06bee441c5e7678abd215ef0f316d
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
libressl: post-update fixes
(cherry picked from commit 6bfb5192c631a54e6ac1aff0d82481847e91e07c)
commit 66eda903abbb30d107db42eb6d93e3a6876fb933
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
stunnel: fixed build with libressl
(cherry picked from commit 637251da8d91a0f52e333969619b006ef5b666ce)
commit 5d46dd06762a533c583a66d70c6257219a588410
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
libressl: PREPARE -> UP_TRIGGERS
(cherry picked from commit 1d83285b7e53c14f14060ed082f9a55802f431ec)
commit 829dfd26f3c24b14a3263d3d3dbe7e6f14889a27
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
libressl: added SOURCE2 for gpg signature
(cherry picked from commit 637be1abae995ab1e720e18d854414bea7b88c39)
commit d58a8b86c8427513ed4344c9c253b905fdbc24fb
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
cadaver: use SSL provider
(cherry picked from commit 5227ecef4ad3367bc8288dc181a3e1f7e0a04f13)
commit ed863ecbe3cd6bb82eed3a6b23ad43f88e8db4c3
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
Revert "cadaver: depends SSL"
This reverts commit fff8ea025a4113fee15d08bfc1ef76c66a5c8119.
(cherry picked from commit fbace6bc4f806c42957c9650723ccf72e16c2aab)
commit 8f52bb95ff929c51d0a2b26927d0ac266ad860b4
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
libressl: => 2.1.4
(cherry picked from commit 84cae21d0c7242b615393654f092b913b5880bf1)
commit efb1ea09fd24645fd542f13c8abdbf202df543d9
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
putty 0.64, SECURITY_PATCH++
(cherry picked from commit a418e0de9765132fa8d6b8450d3ada503edd75cd)
commit 174a6fe497ae9b4a793bcc702e232ec7f1508298
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
qt4: fixed syntax error in DEPENDS
(cherry picked from commit 871705338dcb36a1c264f490cdce6a568a90e356)
commit fc8c68928bb656617c4def4bd6e2e4556ded39df
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
avfs: configuration fixes
(cherry picked from commit ad368c7e9f8a0fbbe8069cd9e168e052fa73efe3)
commit 042c38ad8456a55119224f3765b0667199da6d48
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
audio-soft/vorbis-tools: fix WEB_SITE
(cherry picked from commit 27ac7b9a2dbd5d09bbd11532d80e20f455ffba15)
commit 0ee6067461a0fc4777c07b49f8e9753af45913f7
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
krb5-1.13.1 SECURITY FIX
(cherry picked from commit b444e2c6963fb17c695270b8f9e1a04852dcb211)
commit 66fcee1664d0a9572f9c1606c114b35acdad8f09
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
libressl: => 2.1.3
(cherry picked from commit 4c9e151420b7e6ed8a6a43f30c3d58319feb7730)
commit bbf54ba9821d681aac52083c65643851fb861e3f
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
puppet: Runtime dependency on rubygem-json
(cherry picked from commit 0b95d20652fe62b9f7298d03ba9f87d648512846)
commit 750cb5d64b01f941f45a96929f178a47711d9399
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
puppet: Added init script for puppet agent
(cherry picked from commit 0836071f7246ad4875cc6bd2b1814d8df5a74cf3)
commit c0f2fd1a764924ab6b2042a2245aaee96d5f753a
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
rubygem-json: Added Ruby extension for JSON
(cherry picked from commit 9c407f3528f89f923af3cf599b76d6a326f389cf)
Conflicts:
ChangeLog
commit 3a7e33b55910d07fdc060e7ded6987cf505856eb
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
puppet: Add puppet-master init.d script
(cherry picked from commit 0626f72c0c09777c9342d0fc4f2a445ce92378ca)
commit e380f14793b706100947849024f1fe8f88052fde
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
puppet: Fixed to match renamed tarball
(cherry picked from commit 02b068f7aa73e456f85022223084c64da9ae34d9)
commit cd897bbef48a9f7f101f53c64edb67452cdab72c
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
http/firefox: version 36.0, SECURITY_PATCH++
(cherry picked from commit f38e1a1fd9f6f3c6d8d4980d99e4759da4964f5e)
commit 2fc75c1fe866a588fe944bb701573f07667b17cc
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
crypto/nss: version 3.17.4
(cherry picked from commit 56a01376c9bd76879364dbb25413777e44e34b84)
commit c41d565977edda738be34f71eba5344a73636676
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
libs/nspr: version 4.10.8
(cherry picked from commit 52a69d97bdf8dffac734a54e4151b7d185f935d7)
commit 5df6894b1e22c2b70c58752dcd548716ca475059
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
chat-im/pidgin-libnotify: added fix to build against current libnotify
(cherry picked from commit 2f5cb889ea91f34756dac77f947c0bb19613d644)
commit 64fe55b7699296703cea7e57d3b16349bcd822a0
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
qjackctl: fix build when old qmake is around
(cherry picked from commit 138a4ff434fdb73f8ae9296a61d690c0e6ae088c)
commit f5173b8f5bb362b9625c93853ee31561d8ef837f
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
graphics-libs/libvisio: added dependencies on boost, icu and librevenge
(cherry picked from commit e948b8137926416da5a781bb48b97630eb2553a9)
commit 217436cd6f90773754bb504e568a0d6c69c74bc0
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
http/webkitgtk: version 2.4.8, SECURITY_PATCH++
(cherry picked from commit 23edfc5733323bb547596871dfdd9175179b9e9e)
diff --git a/ChangeLog b/ChangeLog
index 40c0b69..a285682 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2015-02-25 Eric Sandall <sandalle AT sourcemage.org>
+ * ruby-raa/rubygem-json: Added Ruby extension for JSON
+
2015-02-05 Vlad Glagolev <stealth AT sourcemage.org>
* accounts, groups: added account data for rpcbind spell
diff --git a/audio-soft/qjackctl/HISTORY b/audio-soft/qjackctl/HISTORY
index aab46e9..ebe24e0 100644
--- a/audio-soft/qjackctl/HISTORY
+++ b/audio-soft/qjackctl/HISTORY
@@ -1,3 +1,8 @@
+2015-02-13 Thomas Orgis <sobukus AT sourcemage.org>
+ * PRE_BUILD: Hack configure to not override PATH by prepending
+ /usr/bin and /usr/local/bin, which is redundant anyway and
+ makes it pick up the wrong qmake.
+
2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: Use get_scm_version
if [[ $QJCTL_VCS == y ]]
then
diff --git a/audio-soft/vorbis-tools/DETAILS b/audio-soft/vorbis-tools/DETAILS
index a3ed08b..eab617e 100755
--- a/audio-soft/vorbis-tools/DETAILS
+++ b/audio-soft/vorbis-tools/DETAILS
@@ -4,7 +4,7 @@
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://downloads.xiph.org/releases/vorbis/$SOURCE
SOURCE_HASH=sha512:d2473f2e8e6726b5a5083f567797ae42bbb7fa3f26aec3f7b83e641e028c64726299f71a9d75258595a53cf29c18acb84841bcbc39509258d2c8df859e4e3b99
- WEB_SITE=http://www.xiph.org/ogg/vorbis/
+ WEB_SITE=http://www.vorbis.com/
ENTERED=20010922
LICENSE[0]=GPL
KEYWORDS="tools audio"
diff --git a/audio-soft/vorbis-tools/HISTORY b/audio-soft/vorbis-tools/HISTORY
index 142eff9..bd26dc6 100644
--- a/audio-soft/vorbis-tools/HISTORY
+++ b/audio-soft/vorbis-tools/HISTORY
@@ -1,3 +1,6 @@
+2015-03-01 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: fix WEB_SITE
+
2011-02-20 Arjan Bouter <abouter AT sourcemage.org>
* DEPENDS: made curl and libao optional
diff --git a/chat-im/pidgin-libnotify/HISTORY
b/chat-im/pidgin-libnotify/HISTORY
index ca9fdd3..ec589f5 100644
--- a/chat-im/pidgin-libnotify/HISTORY
+++ b/chat-im/pidgin-libnotify/HISTORY
@@ -1,3 +1,6 @@
+2015-02-18 Pavel Vinogradov <public AT sourcemage.org>
+ * PRE_BUILD: added to fix building with current libnotify
+
2009-08-15 Finn Haedicke <finn_haedicke AT gmx.net>
* DEPENDS, DETAILS: spell created
diff --git a/chat-im/pidgin-libnotify/PRE_BUILD
b/chat-im/pidgin-libnotify/PRE_BUILD
new file mode 100755
index 0000000..cf2f2b1
--- /dev/null
+++ b/chat-im/pidgin-libnotify/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+sed -i "289s;NULL, NULL);NULL);" src/pidgin-libnotify.c
diff --git a/crypto/krb5/DETAILS b/crypto/krb5/DETAILS
index 0b1f1a6..eef3561 100755
--- a/crypto/krb5/DETAILS
+++ b/crypto/krb5/DETAILS
@@ -1,7 +1,7 @@
SPELL=krb5
- VERSION=1.13
- SECURITY_PATCH=14
-
SOURCE_HASH=sha512:99cf647ab39f5a34acaf2049908f91d3f3822f4afd3b9dad1630b31c72518398069f4f3d3840168122cb12aa5e5540466729bc714fbda96eb9403e635f88d244
+ VERSION=1.13.1
+ SECURITY_PATCH=15
+
SOURCE_HASH=sha512:f26dce8f682bd3fbf38a15df5f91722b573d4df4cc193f7ba8dc369cbbee8f4bc2a72f56513d2cf27697ce8baaf954afe04e3eefc15c2883fa1d5260145aef6e
VX=${VERSION%.?}
SOURCE=$SPELL-$VERSION-signed.tar
SOURCE_RAW=$SPELL-$VERSION.tar.gz
diff --git a/crypto/krb5/HISTORY b/crypto/krb5/HISTORY
index 8e56393..3dd12bb 100644
--- a/crypto/krb5/HISTORY
+++ b/crypto/krb5/HISTORY
@@ -1,3 +1,8 @@
+2015-03-02 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.13.1
+ SECURITY_PATCH++, fixes [CVE-2014-5354, CVE-2014-5353 CVE-2014-5352
+ CVE-2014-9421 CVE-2014-9422 CVE-2014-9423
+
2015-01-02 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.13
SECURITY_PATCH++, fixes CVE-2014-5354
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 32917b4..9eb1f12 100755
--- a/crypto/libressl/DETAILS
+++ b/crypto/libressl/DETAILS
@@ -1,14 +1,25 @@
SPELL=libressl
- VERSION=2.1.1
-
SOURCE_HASH=sha512:99f8d89a1b4aff0d3fdc6f6cea203144ebe6ee95df70bcec7f285a32f3d2755ca4c1429b5c73597e656e5ea2dec0cf2472eb112fdcff00620b89c335542449ba
+ 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 d77855e..176af7c 100644
--- a/crypto/libressl/HISTORY
+++ b/crypto/libressl/HISTORY
@@ -1,3 +1,25 @@
+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
+
2014-10-16 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.1.1
Address POODLE attack by disabling SSLv3 by default
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/nss/DETAILS b/crypto/nss/DETAILS
index 5a6da49..d92cfa6 100755
--- a/crypto/nss/DETAILS
+++ b/crypto/nss/DETAILS
@@ -15,8 +15,8 @@ case $NSS_BRANCH in
SECURITY_PATCH=6
;;
3.17)
- VERSION=3.17.3
-
SOURCE_HASH=sha512:828d3d495492bed020d819790b439a912e5a997a2e38dd2b3b27f5d92989960984b758fffe410fc82165dea2c138125571a992f6b90596f599bfb5636d0ccaaf
+ VERSION=3.17.4
+
SOURCE_HASH=sha512:dfc44e28c303743a72b4553f471089bc991c3cb61d5f3071082c16400d5e4f216f84a2e44536570316fe0e798c14ca370c875dad791a873034595b9e4dd70b89
SECURITY_PATCH=2
;;
esac
diff --git a/crypto/nss/HISTORY b/crypto/nss/HISTORY
index 6a7a64b..c38af97 100644
--- a/crypto/nss/HISTORY
+++ b/crypto/nss/HISTORY
@@ -1,3 +1,6 @@
+2015-02-24 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: version 3.17.4
+
2014-12-01 Pol Vinogradov <vin.public AT gmail.com>
* DETAILS: version 3.17.3, SECURITY_PATCH++
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/disk/avfs/CONFIGURE b/disk/avfs/CONFIGURE
index 2eeb30b..deb395d 100755
--- a/disk/avfs/CONFIGURE
+++ b/disk/avfs/CONFIGURE
@@ -1,22 +1,27 @@
-config_query_option AVFS_OPTS "Compile avfs as a shared or static library?"
y \
+config_query_option AVFS_OPTS "Compile avfs as a shared and static library?"
y \
"--enable-library" \
"--disable-library" &&
-config_query_option AVFS_OPTS "Compile the preloaded library and server?" n \
- "--enable-preload" \
- "--disable-preload" &&
-
config_query_option AVFS_OPTS "Compile in debug information?" n \
"--enable-debug" \
"--disable-debug" &&
+# preload doesn't work on glibc systems
+list_add "AVFS_OPTS" "--disable-preload" &&
+#config_query_option AVFS_OPTS "Compile the preloaded library and server?" n
\
+# "--enable-preload" \
+# "--disable-preload" &&
+
# dav support is broken
-message "${MESSAGE_COLOR}Dav module is incompatible with modern libraries,
disabling it...${DEFAULT_COLOR}" &&
+message "${PROBLEM_COLOR}Dav module is incompatible with modern libraries,
disabling it...${DEFAULT_COLOR}" &&
list_add "AVFS_OPTS" "--disable-dav" &&
#config_query_option AVFS_OPTS "Compile the dav module?" n \
# "--enable-dav" \
# "--disable-dav" &&
-config_query_option AVFS_OPTS "Compile avfscoda daemon and kernel module?" n
\
- "--enable-avfscoda" \
- "--disable-avfscoda"
+# coda support is broken
+message "${PROBLEM_COLOR}Coda module is incompatible with modern kernels,
disabling it...${DEFAULT_COLOR}" &&
+list_add "AVFS_OPTS" "--disable-avfscoda"
+#config_query_option AVFS_OPTS "Compile avfscoda daemon and kernel module?"
n \
+# "--enable-avfscoda" \
+# "--disable-avfscoda"
diff --git a/disk/avfs/DETAILS b/disk/avfs/DETAILS
index 489a0f2..e25c9b4 100755
--- a/disk/avfs/DETAILS
+++ b/disk/avfs/DETAILS
@@ -7,6 +7,8 @@
SOURCE_GPG=6623F6B4.gpg:$SOURCE2:UPSTREAM_KEY
SOURCE2_IGNORE=signature
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+ DOC_DIRS=""
+ DOCS="AUTHORS COPYING.LIB ChangeLog TODO doc/INSTALL.*
doc/README.* doc/FORMAT doc/api-overview doc/background $DOCS"
WEB_SITE=http://avf.sourceforge.net/
LICENSE[0]=GPL
ENTERED=20071205
diff --git a/disk/avfs/HISTORY b/disk/avfs/HISTORY
index a9c8ac8..c20c596 100644
--- a/disk/avfs/HISTORY
+++ b/disk/avfs/HISTORY
@@ -1,3 +1,7 @@
+2015-03-03 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: do not install Makefile's in docs, gather more docs instead
+ * CONFIGURE: disable coda/preload support; use PROBLEM_COLOR
+
2014-12-22 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.0.2
diff --git a/graphics-libs/libvisio/DEPENDS b/graphics-libs/libvisio/DEPENDS
index f657085..818b5da 100755
--- a/graphics-libs/libvisio/DEPENDS
+++ b/graphics-libs/libvisio/DEPENDS
@@ -1,2 +1,5 @@
+depends boost &&
+depends icu &&
+depends librevenge &&
depends libwpd &&
depends libwpg
diff --git a/graphics-libs/libvisio/HISTORY b/graphics-libs/libvisio/HISTORY
index 43d47e1..31e4ad5 100644
--- a/graphics-libs/libvisio/HISTORY
+++ b/graphics-libs/libvisio/HISTORY
@@ -1,3 +1,6 @@
+2015-02-12 Pavel Vinogradov <public AT sourcemage.org>
+ * DEPENDS: added boost, icu and librevenge
+
2015-01-29 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: Fixed SOURCE_URL[0],
updated spell to 0.1.1
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/firefox/BUILD b/http/firefox/BUILD
index 08066e4..8a649a9 100755
--- a/http/firefox/BUILD
+++ b/http/firefox/BUILD
@@ -23,7 +23,7 @@ CXXFLAGS="${CXXFLAGS//-O3/-O2}" &&
# fix symbol check in build scripts, firefox adds -s to LDFLAGS so we can
# remove it here without changing anything...
#
-LDFLAGS="${LDFLAGS//-s/}" &&
+LDFLAGS="${LDFLAGS// -s/}" &&
SOURCE_URL[2]=ftp://ftp.in2p3.fr/pub/mozilla/$SPELL/releases/$VERSION/source/$SOURCE
- SECURITY_PATCH=78
+ SECURITY_PATCH=80
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=https://www.mozilla.org/en-US/firefox/fx/
GATHER_DOCS=off
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index 325fe1b..d737694 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,11 @@
+2015-03-06 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: updated spell to 36.0.1, SECURITY_PATCH++
+ * BUILD: yet another fix of LDFLAGS
+
+2015-02-24 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: version 36.0, SECURITY_PATCH++
+ * BUILD: corrected removal of -s from LDFLAGS
+
2015-02-22 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* BUILD: remove -s from LDFLAGS to prevent build error
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/http/webkitgtk/DETAILS b/http/webkitgtk/DETAILS
index 5df205a..c45f803 100755
--- a/http/webkitgtk/DETAILS
+++ b/http/webkitgtk/DETAILS
@@ -1,11 +1,11 @@
SPELL=webkitgtk
- VERSION=2.4.7
+ VERSION=2.4.8
SOURCE=webkitgtk-$VERSION.tar.xz
SOURCE_URL[0]=http://www.webkitgtk.org/releases/$SOURCE
-
SOURCE_HASH=sha512:1ba2371b34e40e078f6d85774e171f559e4f269ac80f63c56e2e7612e2ec3a41db0f5999af028b1b93657634fcdfcc3612e1a55eeeec2578fe448bd0861b0729
+
SOURCE_HASH=sha512:31b8b87142730aa27e5bd4fe85b0de2116fd492ef469592512c185d60df428a9913d6c2738ce57439bf9db10864ed9c121ddbc2a4da2f715818a70885c81c0de
SOURCE_DIRECTORY=$BUILD_DIRECTORY/webkitgtk-$VERSION
WEB_SITE=http://webkitgtk.org/
- SECURITY_PATCH=8
+ SECURITY_PATCH=9
GATHER_DOCS=off
LICENSE[0]=GPL
ENTERED=20071208
diff --git a/http/webkitgtk/HISTORY b/http/webkitgtk/HISTORY
index eb1db65..98fee04 100644
--- a/http/webkitgtk/HISTORY
+++ b/http/webkitgtk/HISTORY
@@ -1,3 +1,8 @@
+2015-02-12 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: version 2.4.8, SECURITY_PATCH++, (CVE-2014-1344),
+ (CVE-2014-1384), (CVE-2014-1385), (CVE-2014-1387), (CVE-2014-1388),
+ (CVE-2014-1389), (CVE-2014-1390)
+
2014-10-23 Pol Vinogradov <vin.public AT gmail.com>
* DETAILS: version 2.4.7
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 &&
SOURCE_URL[0]=http://ftp.mozilla.org/pub/mozilla.org/$SPELL/releases/v$VERSION/src/$SOURCE
-
SOURCE_HASH=sha512:bc845b3983ed280dc691e81e08b94b34b8c175e18d455f9e1558a862045df29a3e5c7df291dff7caa0f9d4a9c7e5dd7eb316018f09b9ed444e91502d5a46013e
+
SOURCE_HASH=sha512:f14e3bd46cd1dee9d7163adbf3b09a450ea8c6c65499c5b6696eba7e85b6b12d3f90561a1dfe0dc0dc5fe1b14758b4191e546d9f0e29a66f33c69dd6ed6f50d9
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://www.mozilla.org/projects/nspr/
ENTERED=20050512
diff --git a/libs/nspr/HISTORY b/libs/nspr/HISTORY
index 0308b48..e5460ae 100644
--- a/libs/nspr/HISTORY
+++ b/libs/nspr/HISTORY
@@ -1,3 +1,6 @@
+2015-02-24 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: 4.10.8
+
2014-10-23 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 4.10.7; use spell variable in source url
* DEPENDS: corrected c++ flag
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/ruby-raa/rubygem-json/BUILD b/ruby-raa/rubygem-json/BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/ruby-raa/rubygem-json/BUILD
@@ -0,0 +1 @@
+true
diff --git a/ruby-raa/rubygem-json/DEPENDS b/ruby-raa/rubygem-json/DEPENDS
new file mode 100755
index 0000000..e5532ba
--- /dev/null
+++ b/ruby-raa/rubygem-json/DEPENDS
@@ -0,0 +1,2 @@
+depends RUBY &&
+depends rubygems
diff --git a/ruby-raa/rubygem-json/DETAILS b/ruby-raa/rubygem-json/DETAILS
new file mode 100755
index 0000000..8b78bfd
--- /dev/null
+++ b/ruby-raa/rubygem-json/DETAILS
@@ -0,0 +1,14 @@
+ SPELL=rubygem-json
+ VERSION=1.8.2
+
SOURCE_HASH=sha512:5c94ec2c5378f7f54cd87a2e265b058e80031d2dd29daf14639c80ba0ac285a527ab7961f5a2cd1e483f455fd8f8c88575950822b7b2d431aa7b2b9c8be819c1
+ SOURCE=json-$VERSION.gem
+ SOURCE_URL[0]="https://rubygems.org/downloads/json-1.8.2.gem"
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+ WEB_SITE="https://rubygems.org/gems/json"
+ ENTERED=20150224
+ LICENSE[0]=RUBY
+ KEYWORDS="ruby devel"
+ SHORT="Ruby extension for JSON"
+cat << EOF
+This is a JSON implementation as a Ruby extension in C.
+EOF
diff --git a/ruby-raa/rubygem-json/HISTORY b/ruby-raa/rubygem-json/HISTORY
new file mode 100644
index 0000000..e528d52
--- /dev/null
+++ b/ruby-raa/rubygem-json/HISTORY
@@ -0,0 +1,3 @@
+2015-02-24 Eric Sandall <sandalle AT sourcemage.org>
+ * Created
+
diff --git a/ruby-raa/rubygem-json/INSTALL b/ruby-raa/rubygem-json/INSTALL
new file mode 100755
index 0000000..2bc652e
--- /dev/null
+++ b/ruby-raa/rubygem-json/INSTALL
@@ -0,0 +1 @@
+gem install "${SOURCE_CACHE}/${SOURCE}"
diff --git a/ruby-raa/rubygem-json/PRE_BUILD b/ruby-raa/rubygem-json/PRE_BUILD
new file mode 100755
index 0000000..2443474
--- /dev/null
+++ b/ruby-raa/rubygem-json/PRE_BUILD
@@ -0,0 +1 @@
+verify_source ''
diff --git a/utils/puppet/3.7.3.tar.gz.sig b/utils/puppet/3.7.3.tar.gz.sig
deleted file mode 100644
index d2d0d55..0000000
Binary files a/utils/puppet/3.7.3.tar.gz.sig and /dev/null differ
diff --git a/utils/puppet/DEPENDS b/utils/puppet/DEPENDS
index c26ffeb..0ed0686 100755
--- a/utils/puppet/DEPENDS
+++ b/utils/puppet/DEPENDS
@@ -1,6 +1,8 @@
depends facter &&
depends hiera &&
depends RUBY &&
+runtime_depends rubygem-json &&
+
suggest_depends shadow "" "" "for shadow file support" &&
suggest_depends augeas "" "" "for automated editing of configuration files"
&&
suggest_depends rrdtool "" "" "for generating graphs from report data"
diff --git a/utils/puppet/HISTORY b/utils/puppet/HISTORY
index 51e39b0..cbd44f9 100644
--- a/utils/puppet/HISTORY
+++ b/utils/puppet/HISTORY
@@ -1,3 +1,9 @@
+2015-02-24 Eric Sandall <sandalle AT sourcemage.org>
+ * puppet-3.7.3.tar.gz.sig: Fixed to match renamed tarball
+ * init.d/puppet-master: Add init script for puppet master
+ * init.d/puppet-agent: Add init script for puppet agent
+ * DEPENDS: Runtime dependency on rubygem-json
+
2014-12-26 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: Fix SOURCE to make it a proper tarball name