Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Florian Franzmann (fa9186bad9399109cd62db10b24c415e2c9e1841)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Florian Franzmann (fa9186bad9399109cd62db10b24c415e2c9e1841)

Chronological Thread  
    < Chronological >       < Thread >
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (fa9186bad9399109cd62db10b24c415e2c9e1841)
  • Date: Wed, 17 Feb 2016 17:54:01 +0000
GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

ChangeLog | 7
audio-libs/dcadec/BUILD | 1
audio-libs/dcadec/DETAILS | 28 +
audio-libs/dcadec/HISTORY | 3
audio-libs/dcadec/INSTALL | 1
crypto/gnutls/DETAILS | 4
crypto/gnutls/HISTORY | 3
editors/vim/DETAILS | 4
editors/vim/HISTORY | 3
graphics/darktable/DETAILS | 5
graphics/darktable/HISTORY | 3
haskell/haskell-git-annex/DEPENDS | 6
haskell/haskell-git-annex/HISTORY | 3
libs/crossguid/BUILD | 2
libs/crossguid/DEPENDS | 2
libs/crossguid/DETAILS | 31 +
libs/crossguid/HISTORY | 3
libs/crossguid/INSTALL | 2
libs/crossguid/PREPARE | 2
libs/glibc/10_all_glibc-CVE-2015-7547.patch | 230
++++++++++
libs/glibc/DETAILS | 2
libs/glibc/HISTORY | 4
libs/glibc/PRE_BUILD | 1
net/openvpn/DETAILS | 2
net/openvpn/HISTORY | 3
python-pypi/pillow/DETAILS | 4
python-pypi/pillow/HISTORY | 3
science/routino/0001-use-our-CFLAGS-honour-installation-path.patch | 69 +++
science/routino/BUILD | 3
science/routino/DEPENDS | 4
science/routino/DETAILS | 36 +
science/routino/HISTORY | 4
science/routino/INSTALL | 1
science/routino/PRE_BUILD | 3
utils/grep/DETAILS | 2
utils/grep/HISTORY | 3
video/kodi/DEPENDS | 13
video/kodi/DETAILS | 16
video/kodi/HISTORY | 3
video/kodi/PREPARE | 2
40 files changed, 501 insertions(+), 20 deletions(-)

New commits:
commit fa9186bad9399109cd62db10b24c415e2c9e1841
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

libs/glibc: fix CVE-2015-7547

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

video/kodi: add support for pre-release versions

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

libs/crossguid: new spell, a library for accessing GUIDs

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

audio-libs/dcadec: new spell, a free DTS Coherent Acoustics decoder

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

crypto/gnutls: versions 3.3.21 and 3.4.9

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

utils/grep: version 2.23

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

graphics/darktable: version 2.0.1

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

python-pypi/pillow: version 3.1.1

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

haskell/haskell-git-annex: add dependencies on perl and rsync

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

net/openvpn: version 2.3.10

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

editors/vim: version 7.4.1265

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

science/routino: new spell, a router for open streemap data

diff --git a/ChangeLog b/ChangeLog
index 8c0cbaa..23e8b75 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,13 @@
2016-02-07 Thomas Orgis <sobukus AT sourcemage.org>
* FUNCTIONS: brute force fix for self-conflicting Qt5 stuff

+2016-02-07 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * audio-libs/dcadec: new spell, a free DTS Coherent Acoustics decoder
+ * libs/crossguid: a cross-platform library for accessing guids
+
+2016-02-06 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * science/routino: new spell, a router for open streetmap data
+
2016-01-30 Treeve Jelbert <treeve AT sourcemage.org>
* kde5-apps/kid3: added, metadata tagging

diff --git a/audio-libs/dcadec/BUILD b/audio-libs/dcadec/BUILD
new file mode 100755
index 0000000..6dfecc1
--- /dev/null
+++ b/audio-libs/dcadec/BUILD
@@ -0,0 +1 @@
+default_build_make
diff --git a/audio-libs/dcadec/DETAILS b/audio-libs/dcadec/DETAILS
new file mode 100755
index 0000000..511fdbd
--- /dev/null
+++ b/audio-libs/dcadec/DETAILS
@@ -0,0 +1,28 @@
+ SPELL=dcadec
+ VERSION=
+ SOURCE="v0.2.0.tar.gz"
+ SOURCE_URL[0]=https://github.com/foo86/${SPELL}/archive/${SOURCE}
+
SOURCE_HASH=sha512:94edcc0b4449882ebeb08f8b39fe44a5302731df2dad3a3e0b0f787fd7c2c3e3992fed95e6f594af516e982cec34b057aab30e6457c098df61f495a487125acb
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-0.2.0"
+ WEB_SITE="https://github.com/foo86/dcadec/";
+ LICENSE[0]=LGPL
+ ENTERED=20160207
+ SHORT="a free DTS Coherent Acoustics decoder with support for HD
extensions"
+cat << EOF
+dcadec is a free DTS Coherent Acoustics decoder with support for HD
extensions.
+
+Supported features:
+
+ * Decoding of standard DTS core streams with up to 5.1 channels * Decoding
+ of DTS-ES streams with discrete back channel * Decoding of High Resolution
+ streams with up to 7.1 channels and extended
+ bitrate
+ * Decoding of 96/24 core streams * Lossless decoding of Master Audio
+ streams with up to 7.1 channels, 192 kHz * Downmixing to stereo and 5.1
+ using embedded coefficients
+
+Features not implemented:
+
+ * Decoding of DTS Express streams * Applying dynamic range compression
+ and dialog normalization
+EOF
diff --git a/audio-libs/dcadec/HISTORY b/audio-libs/dcadec/HISTORY
new file mode 100644
index 0000000..3873d75
--- /dev/null
+++ b/audio-libs/dcadec/HISTORY
@@ -0,0 +1,3 @@
+2016-02-07 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * BUILD, DETAILS, INSTALL: spell created
+
diff --git a/audio-libs/dcadec/INSTALL b/audio-libs/dcadec/INSTALL
new file mode 100755
index 0000000..0959fb3
--- /dev/null
+++ b/audio-libs/dcadec/INSTALL
@@ -0,0 +1 @@
+PREFIX="${INSTALL_ROOT}/usr" default_install
diff --git a/crypto/gnutls/DETAILS b/crypto/gnutls/DETAILS
index cbfa446..2f512b0 100755
--- a/crypto/gnutls/DETAILS
+++ b/crypto/gnutls/DETAILS
@@ -6,11 +6,11 @@ fi

case $GNUTLS_BRANCH in
stable)
- VERSION=3.4.8
+ VERSION=3.4.9
SECURITY_PATCH=14
;;
stable-old)
- VERSION=3.1.28
+ VERSION=3.3.21
SECURITY_PATCH=13
;;
esac
diff --git a/crypto/gnutls/HISTORY b/crypto/gnutls/HISTORY
index dd25988..10761a3 100644
--- a/crypto/gnutls/HISTORY
+++ b/crypto/gnutls/HISTORY
@@ -1,3 +1,6 @@
+2016-02-07 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: versions 3.3.21 and 3.4.9
+
2016-01-08 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 3.4.8

diff --git a/editors/vim/DETAILS b/editors/vim/DETAILS
index c3633c0..ca78b29 100755
--- a/editors/vim/DETAILS
+++ b/editors/vim/DETAILS
@@ -8,12 +8,12 @@ SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
SOURCE_URL=hg_http://vim.googlecode.com/hg:${SPELL}-hg
SOURCE_IGNORE=volatile
else
- VERSION=7.4.1026
+ VERSION=7.4.1265
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
SOURCE_URL[0]=https://github.com/vim/vim/archive/v${VERSION}.tar.gz
# SOURCE_GPG=gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME
-
SOURCE_HASH=sha512:b5983b6564e6b5c9c7d66419185b92fc785700ff1cc4a2793d4001c4067f2fa4ac60fc79bcda446cf143be0c82369e876162739e24778b1f2b1d4e00337234d2
+
SOURCE_HASH=sha512:3e4a514602b6852b8de237fa594f1505ae0c151d4be05b2c0497b61f8a4a36f36a05c89cb12a8191b516064cc9419921957ea78241b1f3d10f19afff277cc7a9

fi
WEB_SITE=http://www.vim.org
diff --git a/editors/vim/HISTORY b/editors/vim/HISTORY
index abd8a75..969ec35 100644
--- a/editors/vim/HISTORY
+++ b/editors/vim/HISTORY
@@ -1,3 +1,6 @@
+2016-02-06 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 7.4.1265
+
2016-01-02 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 7.4.1026

diff --git a/graphics/darktable/DETAILS b/graphics/darktable/DETAILS
index 8864ce6..841fb33 100755
--- a/graphics/darktable/DETAILS
+++ b/graphics/darktable/DETAILS
@@ -1,11 +1,10 @@
. "$GRIMOIRE/FUNCTIONS"
SPELL=darktable
if [[ "$DARKTABLE_BRANCH" == "stable" ]]; then
- VERSION=2.0.0
- PATCHLEVEL=1
+ VERSION=2.0.1
SOURCE="${SPELL}-${VERSION}.tar.xz"

SOURCE_URL[0]=https://github.com/darktable-org/darktable/releases/download/release-${VERSION}/${SOURCE}
-
SOURCE_HASH=sha256:d4f2f525bbbb1355bc3470e74cc158d79d7e236f3925928f67a88461f1df7cb1
+
SOURCE_HASH=sha256:4d0e76eb42b95418ab59c17bff8aac660f5348b082aabfb3113607c67e87830b
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
else
VERSION=$(get_scm_version)
diff --git a/graphics/darktable/HISTORY b/graphics/darktable/HISTORY
index d44c251..351f1be 100644
--- a/graphics/darktable/HISTORY
+++ b/graphics/darktable/HISTORY
@@ -1,3 +1,6 @@
+2016-02-07 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 2.0.1
+
2016-01-10 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS: depend on gtk+3 instead of gtk+2
* DETAILS: PATCHLEVEL=1
diff --git a/haskell/haskell-git-annex/DEPENDS
b/haskell/haskell-git-annex/DEPENDS
index 3ba20e9..eade6a1 100755
--- a/haskell/haskell-git-annex/DEPENDS
+++ b/haskell/haskell-git-annex/DEPENDS
@@ -1,5 +1,7 @@
-depends git &&
-depends ghc &&
+depends git &&
+depends ghc &&
+depends perl &&
+depends rsync &&

depends haskell-aeson &&
depends haskell-ascii-progress &&
diff --git a/haskell/haskell-git-annex/HISTORY
b/haskell/haskell-git-annex/HISTORY
index b9a854d..03091b4 100644
--- a/haskell/haskell-git-annex/HISTORY
+++ b/haskell/haskell-git-annex/HISTORY
@@ -1,3 +1,6 @@
+2016-02-07 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS: add dependencies on perl and rsync
+
2015-08-09 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS: remove dependency on haskell-template-haskell,
haskell-transformers
diff --git a/libs/crossguid/BUILD b/libs/crossguid/BUILD
new file mode 100755
index 0000000..31aa3e7
--- /dev/null
+++ b/libs/crossguid/BUILD
@@ -0,0 +1,2 @@
+g++ -c guid.cpp -o guid.o ${CXXFLAGS} -std=c++11 -DGUID_LIBUUID ${CPPFLAGS}
&&
+ar rvs libcrossguid.a guid.o
diff --git a/libs/crossguid/DEPENDS b/libs/crossguid/DEPENDS
new file mode 100755
index 0000000..d5f488e
--- /dev/null
+++ b/libs/crossguid/DEPENDS
@@ -0,0 +1,2 @@
+depends -sub CXX gcc &&
+depends git
diff --git a/libs/crossguid/DETAILS b/libs/crossguid/DETAILS
new file mode 100755
index 0000000..f703d00
--- /dev/null
+++ b/libs/crossguid/DETAILS
@@ -0,0 +1,31 @@
+ SPELL=crossguid
+ VERSION=$(get_scm_version)
+ SOURCE=$SPELL-git.tar.bz2
+ SOURCE_IGNORE=volatile
+ SOURCE_URL[0]=git_http://github.com/graeme-hill/crossguid.git
+ FORCE_DOWNLOAD=1
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-git"
+ WEB_SITE="https://github.com/graeme-hill/crossguid";
+ LICENSE[0]=MIT
+ ENTERED=20160207
+ SHORT="a minimal, cross platform, C++ GUID library"
+cat << EOF
+CrossGuid is a minimal, cross platform, C++ GUID library. It uses the best
+native GUID/UUID generator on the given platform and had a generic class for
+parsing, stringifying, and comparing IDs. The intention is that anyone who
+uses this code can simply copy guid.h and guid.cpp into their project and
+define one of the following preprocessor flags to control the implementation:
+
+ * GUID_LIBUUID - Uses libuuid which is normally used on linux but possibly
+ usable
+ elsewhere as well.
+ * GUID_CFUUID - Uses CFCreateUUID from Apple's CoreFoundation framework.
This
+ works on both Mac OSX and iOS.
+ * GUID_WINDOWS - Uses the built in CoCreateGuid function in Windows. *
+ GUID_ANDROID - Uses JNI to invoke Java functions from Android SDK.
+
+I recommend taking the time to actually look at the guid.h and guid.cpp so
+that you can see how simple they are. It should be pretty trivial to modify
+the code to match your naming conventions or drop it into a namespace so
+that it fits in nicely with your code base.
+EOF
diff --git a/libs/crossguid/HISTORY b/libs/crossguid/HISTORY
new file mode 100644
index 0000000..f187ec7
--- /dev/null
+++ b/libs/crossguid/HISTORY
@@ -0,0 +1,3 @@
+2016-02-07 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * BUILD, DEPENDS, DETAILS, INSTALL, PREPARE: spell created
+
diff --git a/libs/crossguid/INSTALL b/libs/crossguid/INSTALL
new file mode 100755
index 0000000..a3fec34
--- /dev/null
+++ b/libs/crossguid/INSTALL
@@ -0,0 +1,2 @@
+install -m644 ${SOURCE_DIRECTORY}/libcrossguid.a ${INSTALL_ROOT}/usr/lib/ &&
+install -m644 ${SOURCE_DIRECTORY}/guid.h ${INSTALL_ROOT}/usr/include/
diff --git a/libs/crossguid/PREPARE b/libs/crossguid/PREPARE
new file mode 100755
index 0000000..a68f274
--- /dev/null
+++ b/libs/crossguid/PREPARE
@@ -0,0 +1,2 @@
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch scm
diff --git a/libs/glibc/10_all_glibc-CVE-2015-7547.patch
b/libs/glibc/10_all_glibc-CVE-2015-7547.patch
new file mode 100644
index 0000000..87f45bc
--- /dev/null
+++ b/libs/glibc/10_all_glibc-CVE-2015-7547.patch
@@ -0,0 +1,230 @@
+https://bugs.gentoo.org/574880
+https://sourceware.org/ml/libc-alpha/2016-02/msg00416.html
+
+--- a/resolv/nss_dns/dns-host.c
++++ b/resolv/nss_dns/dns-host.c
+@@ -1031,7 +1031,10 @@ gaih_getanswer_slice (const querybuf *answer, int
anslen, const char *qname,
+ int h_namelen = 0;
+
+ if (ancount == 0)
+- return NSS_STATUS_NOTFOUND;
++ {
++ *h_errnop = HOST_NOT_FOUND;
++ return NSS_STATUS_NOTFOUND;
++ }
+
+ while (ancount-- > 0 && cp < end_of_message && had_error == 0)
+ {
+@@ -1208,7 +1211,14 @@ gaih_getanswer_slice (const querybuf *answer, int
anslen, const char *qname,
+ /* Special case here: if the resolver sent a result but it only
+ contains a CNAME while we are looking for a T_A or T_AAAA record,
+ we fail with NOTFOUND instead of TRYAGAIN. */
+- return canon == NULL ? NSS_STATUS_TRYAGAIN : NSS_STATUS_NOTFOUND;
++ if (canon != NULL)
++ {
++ *h_errnop = HOST_NOT_FOUND;
++ return NSS_STATUS_NOTFOUND;
++ }
++
++ *h_errnop = NETDB_INTERNAL;
++ return NSS_STATUS_TRYAGAIN;
+ }
+
+
+@@ -1242,8 +1252,15 @@ gaih_getanswer (const querybuf *answer1, int anslen1,
const querybuf *answer2,
+ &pat, &buffer, &buflen,
+ errnop, h_errnop, ttlp,
+ &first);
++ /* Use the second response status in some cases. */
+ if (status != NSS_STATUS_SUCCESS && status2 != NSS_STATUS_NOTFOUND)
+ status = status2;
++ /* Do not return a truncated second response (unless it was
++ unavoidable e.g. unrecoverable TRYAGAIN). */
++ if (status == NSS_STATUS_SUCCESS
++ && (status2 == NSS_STATUS_TRYAGAIN
++ && *errnop == ERANGE && *h_errnop != NO_RECOVERY))
++ status = NSS_STATUS_TRYAGAIN;
+ }
+
+ return status;
+--- a/resolv/res_query.c
++++ b/resolv/res_query.c
+@@ -396,6 +396,7 @@ __libc_res_nsearch(res_state statp,
+ {
+ free (*answerp2);
+ *answerp2 = NULL;
++ *nanswerp2 = 0;
+ *answerp2_malloced = 0;
+ }
+ }
+@@ -447,6 +448,7 @@ __libc_res_nsearch(res_state statp,
+ {
+ free (*answerp2);
+ *answerp2 = NULL;
++ *nanswerp2 = 0;
+ *answerp2_malloced = 0;
+ }
+
+@@ -521,6 +523,7 @@ __libc_res_nsearch(res_state statp,
+ {
+ free (*answerp2);
+ *answerp2 = NULL;
++ *nanswerp2 = 0;
+ *answerp2_malloced = 0;
+ }
+ if (saved_herrno != -1)
+--- a/resolv/res_send.c
++++ b/resolv/res_send.c
+@@ -639,11 +639,7 @@ send_vc(res_state statp,
+ {
+ const HEADER *hp = (HEADER *) buf;
+ const HEADER *hp2 = (HEADER *) buf2;
+- u_char *ans = *ansp;
+- int orig_anssizp = *anssizp;
+- // XXX REMOVE
+- // int anssiz = *anssizp;
+- HEADER *anhp = (HEADER *) ans;
++ HEADER *anhp = (HEADER *) *ansp;
+ struct sockaddr *nsap = get_nsaddr (statp, ns);
+ int truncating, connreset, n;
+ /* On some architectures compiler might emit a warning indicating
+@@ -767,35 +763,6 @@ send_vc(res_state statp,
+ assert (anscp != NULL || ansp2 == NULL);
+ thisresplenp = &resplen;
+ } else {
+- if (*anssizp != MAXPACKET) {
+- /* No buffer allocated for the first
+- reply. We can try to use the rest
+- of the user-provided buffer. */
+-#if __GNUC_PREREQ (4, 7)
+- DIAG_PUSH_NEEDS_COMMENT;
+- DIAG_IGNORE_NEEDS_COMMENT (5,
"-Wmaybe-uninitialized");
+-#endif
+-#if _STRING_ARCH_unaligned
+- *anssizp2 = orig_anssizp - resplen;
+- *ansp2 = *ansp + resplen;
+-#else
+- int aligned_resplen
+- = ((resplen + __alignof__ (HEADER) - 1)
+- & ~(__alignof__ (HEADER) - 1));
+- *anssizp2 = orig_anssizp - aligned_resplen;
+- *ansp2 = *ansp + aligned_resplen;
+-#endif
+-#if __GNUC_PREREQ (4, 7)
+- DIAG_POP_NEEDS_COMMENT;
+-#endif
+- } else {
+- /* The first reply did not fit into the
+- user-provided buffer. Maybe the second
+- answer will. */
+- *anssizp2 = orig_anssizp;
+- *ansp2 = *ansp;
+- }
+-
+ thisanssizp = anssizp2;
+ thisansp = ansp2;
+ thisresplenp = resplen2;
+@@ -804,10 +771,14 @@ send_vc(res_state statp,
+ anhp = (HEADER *) *thisansp;
+
+ *thisresplenp = rlen;
+- if (rlen > *thisanssizp) {
+- /* Yes, we test ANSCP here. If we have two buffers
+- both will be allocatable. */
+- if (__glibc_likely (anscp != NULL)) {
++ /* Is the answer buffer too small? */
++ if (*thisanssizp < rlen) {
++ /* If the current buffer is not the the static
++ user-supplied buffer then we can reallocate
++ it. */
++ if (thisansp != NULL && thisansp != ansp) {
++ /* Always allocate MAXPACKET, callers expect
++ this specific size. */
+ u_char *newp = malloc (MAXPACKET);
+ if (newp == NULL) {
+ *terrno = ENOMEM;
+@@ -957,8 +928,6 @@ send_dg(res_state statp,
+ {
+ const HEADER *hp = (HEADER *) buf;
+ const HEADER *hp2 = (HEADER *) buf2;
+- u_char *ans = *ansp;
+- int orig_anssizp = *anssizp;
+ struct timespec now, timeout, finish;
+ struct pollfd pfd[1];
+ int ptimeout;
+@@ -1154,50 +1123,48 @@ send_dg(res_state statp,
+ assert (anscp != NULL || ansp2 == NULL);
+ thisresplenp = &resplen;
+ } else {
+- if (*anssizp != MAXPACKET) {
+- /* No buffer allocated for the first
+- reply. We can try to use the rest
+- of the user-provided buffer. */
+-#if _STRING_ARCH_unaligned
+- *anssizp2 = orig_anssizp - resplen;
+- *ansp2 = *ansp + resplen;
+-#else
+- int aligned_resplen
+- = ((resplen + __alignof__ (HEADER) - 1)
+- & ~(__alignof__ (HEADER) - 1));
+- *anssizp2 = orig_anssizp - aligned_resplen;
+- *ansp2 = *ansp + aligned_resplen;
+-#endif
+- } else {
+- /* The first reply did not fit into the
+- user-provided buffer. Maybe the second
+- answer will. */
+- *anssizp2 = orig_anssizp;
+- *ansp2 = *ansp;
+- }
+-
+ thisanssizp = anssizp2;
+ thisansp = ansp2;
+ thisresplenp = resplen2;
+ }
+
+ if (*thisanssizp < MAXPACKET
+- /* Yes, we test ANSCP here. If we have two buffers
+- both will be allocatable. */
+- && anscp
++ /* If the current buffer is not the the static
++ user-supplied buffer then we can reallocate
++ it. */
++ && (thisansp != NULL && thisansp != ansp)
+ #ifdef FIONREAD
++ /* Is the size too small? */
+ && (ioctl (pfd[0].fd, FIONREAD, thisresplenp) < 0
+ || *thisanssizp < *thisresplenp)
+ #endif
+ ) {
++ /* Always allocate MAXPACKET, callers expect
++ this specific size. */
+ u_char *newp = malloc (MAXPACKET);
+ if (newp != NULL) {
+- *anssizp = MAXPACKET;
+- *thisansp = ans = newp;
++ *thisanssizp = MAXPACKET;
++ *thisansp = newp;
+ if (thisansp == ansp2)
+ *ansp2_malloced = 1;
+ }
+ }
++ /* We could end up with truncation if anscp was NULL
++ (not allowed to change caller's buffer) and the
++ response buffer size is too small. This isn't a
++ reliable way to detect truncation because the ioctl
++ may be an inaccurate report of the UDP message size.
++ Therefore we use this only to issue debug output.
++ To do truncation accurately with UDP we need
++ MSG_TRUNC which is only available on Linux. We
++ can abstract out the Linux-specific feature in the
++ future to detect truncation. */
++ if (__glibc_unlikely (*thisanssizp < *thisresplenp)) {
++ Dprint(statp->options & RES_DEBUG,
++ (stdout, ";; response may be truncated
(UDP)\n")
++ );
++ }
++
+ HEADER *anhp = (HEADER *) *thisansp;
+ socklen_t fromlen = sizeof(struct sockaddr_in6);
+ assert (sizeof(from) <= fromlen);
diff --git a/libs/glibc/DETAILS b/libs/glibc/DETAILS
index 6d4f856..33a141e 100755
--- a/libs/glibc/DETAILS
+++ b/libs/glibc/DETAILS
@@ -37,7 +37,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
SOURCE_GPG=glibc.gpg:$SOURCE.sig:UPSTREAM_KEY
SOURCE2_IGNORE=signature
- SECURITY_PATCH=4
+ SECURITY_PATCH=5
fi
if [[ $GLIBC_SANITIZE_HEADERS == n ]]; then
HEADERS_VERSION=3.17.4
diff --git a/libs/glibc/HISTORY b/libs/glibc/HISTORY
index 5780863..30cf3f7 100644
--- a/libs/glibc/HISTORY
+++ b/libs/glibc/HISTORY
@@ -1,3 +1,7 @@
+2016-02-17 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS, PRE_BUILD, 10_all_glibc-CVE-2015-7547.patch: add patch from
+ gentoo to fix CVE-2015-7547, SECURITY_PATCH++
+
2015-11-07 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 2.22, SECURITY_PATCH++, (CVE-2014-8121)

diff --git a/libs/glibc/PRE_BUILD b/libs/glibc/PRE_BUILD
index 16973e0..bf7935f 100755
--- a/libs/glibc/PRE_BUILD
+++ b/libs/glibc/PRE_BUILD
@@ -92,6 +92,7 @@ patch -p0 < $SPELL_DIRECTORY/as_fn_executable_p.patch &&

patch -p1 <
$SPELL_DIRECTORY/00_all_0005-reload-etc-resolv.conf-when-it-has-changed.patch
&&
patch -p1 <
$SPELL_DIRECTORY/00_all_0007-rtld-do-not-ignore-arch-specific-CFLAGS.patch
&&
+patch -p1 < $SPELL_DIRECTORY/10_all_glibc-CVE-2015-7547.patch
&&
patch -p1 < $SPELL_DIRECTORY/glibc-2.20-fhs-1.patch
&&

# disabled libgd detection/building memusagestat for now until a better
diff --git a/net/openvpn/DETAILS b/net/openvpn/DETAILS
index 852d4c9..2f8ce00 100755
--- a/net/openvpn/DETAILS
+++ b/net/openvpn/DETAILS
@@ -1,5 +1,5 @@
SPELL=openvpn
- VERSION=2.3.9
+ VERSION=2.3.10
SECURITY_PATCH=3
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.asc
diff --git a/net/openvpn/HISTORY b/net/openvpn/HISTORY
index 67f734c..09314dc 100644
--- a/net/openvpn/HISTORY
+++ b/net/openvpn/HISTORY
@@ -1,3 +1,6 @@
+2016-02-06 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 2.3.10
+
2016-01-15 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 2.3.9

diff --git a/python-pypi/pillow/DETAILS b/python-pypi/pillow/DETAILS
index 67b3532..0bb44f7 100755
--- a/python-pypi/pillow/DETAILS
+++ b/python-pypi/pillow/DETAILS
@@ -1,9 +1,9 @@
SPELL=pillow
SPELLX=Pillow
- VERSION=3.1.0
+ VERSION=3.1.1
SOURCE="${SPELLX}-${VERSION}.zip"

SOURCE_URL[0]=https://pypi.python.org/packages/source/P/${SPELLX}/${SOURCE}
-
SOURCE_HASH=sha512:4f9608ef7294a27dec78fbf8ea888ecaebea9199f4eb9167ff883b261f37ac4b01b3375e8c93567c9d6bbbacf80775fdd91abc8f0a7ef02528ba89ed858cce7d
+
SOURCE_HASH=sha512:83dbb651a46ea2c5daa5c7dd32330d50d8f6ad6d11df9526bd68533fd863621f764e0f2f49896bb5df86968fc45201ac28fad770375612dcefa858096c0063d7
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELLX}-${VERSION}"
WEB_SITE="https://pypi.python.org/pypi/Pillow/";
LICENSE[0]=PIL
diff --git a/python-pypi/pillow/HISTORY b/python-pypi/pillow/HISTORY
index 748e3ab..3b74e07 100644
--- a/python-pypi/pillow/HISTORY
+++ b/python-pypi/pillow/HISTORY
@@ -1,3 +1,6 @@
+2016-02-07 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 3.1.1
+
2016-01-08 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 3.1.0

diff --git
a/science/routino/0001-use-our-CFLAGS-honour-installation-path.patch
b/science/routino/0001-use-our-CFLAGS-honour-installation-path.patch
new file mode 100644
index 0000000..5c9d52a
--- /dev/null
+++ b/science/routino/0001-use-our-CFLAGS-honour-installation-path.patch
@@ -0,0 +1,69 @@
+From b39f4b6b732f3f13b031e34548d8908399be5cee Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <siflfran AT hawo.net>
+Date: Sat, 6 Feb 2016 12:39:48 +0100
+Subject: [PATCH] use our CFLAGS, honour installation path
+
+---
+ Makefile.conf | 28 ++++------------------------
+ 1 file changed, 4 insertions(+), 24 deletions(-)
+
+diff --git a/Makefile.conf b/Makefile.conf
+index cc112e0..7e38466 100644
+--- a/Makefile.conf
++++ b/Makefile.conf
+@@ -45,11 +45,10 @@ endif
+ # Installation locations (edit if required)
+
+ ifneq ($(HOST),MINGW)
+-prefix=/usr/local
+ bindir=$(prefix)/bin
+ incdir=$(prefix)/include
+ libdir=$(prefix)/lib
+-docdir=$(prefix)/doc/routino
++docdir=$(prefix)/share/doc/routino
+ datadir=$(prefix)/share/routino
+ else
+ prefix="c:/Program Files/Routino"
+@@ -60,28 +59,9 @@ docdir=$(prefix)/doc
+ datadir=$(prefix)/xml
+ endif
+
++LD=$(CC)
+
+-# Compilation programs
+-CC=gcc
+-LD=gcc
+-
+-
+-# Language dialect selection
+-CFLAGS=-std=c99
+-
+-# Warning options
+-CFLAGS+=-Wall -Wmissing-prototypes -Wextra -Wno-unused-parameter -pedantic
+-
+-# Optimisation options
+-CFLAGS+=-O3
+-CFLAGS+=-ffast-math
+-
+-# Optimisation option (only works if compilation and execution use exactly
the same CPU architecture).
+-#CFLAGS+=-march=native
+-
+-# Debugging symbols
+-#CFLAGS+=-g
+-
++CFLAGS+=-std=c99
+
+ # Maths library
+ LDFLAGS=-lm
+@@ -103,7 +83,7 @@ LDFLAGS_LDSO=-Wl,-R.
+
+ # Required for multi-threaded support (comment these two lines out if not
required)
+ CFLAGS+=-pthread -DUSE_PTHREADS
+-LDFLAGS+=-pthread -lpthread
++LDFLAGS+=-pthread
+
+
+ ifneq ($(HOST),MINGW)
+--
+2.7.0
+
diff --git a/science/routino/BUILD b/science/routino/BUILD
new file mode 100755
index 0000000..58ef129
--- /dev/null
+++ b/science/routino/BUILD
@@ -0,0 +1,3 @@
+make_single &&
+default_build_make &&
+make_normal
diff --git a/science/routino/DEPENDS b/science/routino/DEPENDS
new file mode 100755
index 0000000..ac91798
--- /dev/null
+++ b/science/routino/DEPENDS
@@ -0,0 +1,4 @@
+depends gcc &&
+depends make &&
+depends zlib &&
+depends bzip2
diff --git a/science/routino/DETAILS b/science/routino/DETAILS
new file mode 100755
index 0000000..cc3a695
--- /dev/null
+++ b/science/routino/DETAILS
@@ -0,0 +1,36 @@
+ SPELL=routino
+ VERSION=3.0
+ SOURCE="${SPELL}-${VERSION}.tgz"
+ SOURCE_URL[0]=http://www.${SPELL}.org/download/${SOURCE}
+
SOURCE_HASH=sha512:7335d41cdd1abdb3e5c5f4e4efb73cc233fb6d1189cb7b5af398c3176c3786558bb741f66a1425ddb9e78b5fe4d1dbc5f06d212443300cf53e74b919c02bed4a
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE="http://www.routino.org";
+ LICENSE[0]=AGPL
+ ENTERED=20160206
+ SHORT="an application for finding a route between two points
using OSM data"
+cat << EOF
+Routino is an application for finding a route between two points using the
+dataset of topographical information collected by
http://www.OpenStreetMap.org.
+
+This router uses a routing algorithm that takes OSM format data as its input
+and calculates either the shortest or quickest route between two points. To
+optimise the routing a custom database format is used. This allows the
+routing to be performed quickly after a modest one-off pre-processing stage.
+
+A selection is possible for any of the major OSM transport types and for each
+of the main OSM highway types a preference can be provided and a speed limit.
+Restrictions on one-way streets, weight, height, width and length are also
+options. Further preferences about road properties (e.g. paved or not)
+can also be selected.
+
+The processing of the input XML file is based on rules in a configuration
file
+that transform the highway tags into tags that are understood by Routino. The
+generation of the output files (HTML and GPX) uses language fragments
selected
+from another configuration file which allows multi-lingual output from the
+same database.
+
+The router takes into account private/public/permissive restrictions on
+highways as well as tagged speed limits and barriers (gates, bollards). The
+simplest and most common turn restriction relations (those composed of a way,
+node and way) are also supported.
+EOF
diff --git a/science/routino/HISTORY b/science/routino/HISTORY
new file mode 100644
index 0000000..0c53358
--- /dev/null
+++ b/science/routino/HISTORY
@@ -0,0 +1,4 @@
+2016-02-06 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * 0001-use-our-CFLAGS-honour-installation-path.patch, BUILD, DEPENDS,
+ DETAILS, INSTALL, PRE_BUILD: spell created
+
diff --git a/science/routino/INSTALL b/science/routino/INSTALL
new file mode 100755
index 0000000..8a3ae87
--- /dev/null
+++ b/science/routino/INSTALL
@@ -0,0 +1 @@
+make prefix="${INSTALL_ROOT}/usr" install
diff --git a/science/routino/PRE_BUILD b/science/routino/PRE_BUILD
new file mode 100755
index 0000000..1e7e3e0
--- /dev/null
+++ b/science/routino/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+patch -p1 <
"$SPELL_DIRECTORY/0001-use-our-CFLAGS-honour-installation-path.patch"
diff --git a/utils/grep/DETAILS b/utils/grep/DETAILS
index 96db160..8869a9d 100755
--- a/utils/grep/DETAILS
+++ b/utils/grep/DETAILS
@@ -1,5 +1,5 @@
SPELL=grep
- VERSION=2.22
+ VERSION=2.23
SECURITY_PATCH=1
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE2=$SOURCE.sig
diff --git a/utils/grep/HISTORY b/utils/grep/HISTORY
index 90142c8..a0574cd 100644
--- a/utils/grep/HISTORY
+++ b/utils/grep/HISTORY
@@ -1,3 +1,6 @@
+2016-02-07 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 2.23
+
2015-11-02 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: updated spell to 2.22, SECURITY_PATCH++, (CVE-2015-1345)

diff --git a/video/kodi/DEPENDS b/video/kodi/DEPENDS
index 69704ef..d7d96fc 100755
--- a/video/kodi/DEPENDS
+++ b/video/kodi/DEPENDS
@@ -43,6 +43,12 @@ depends libxinerama &&
depends curl &&
depends dbus &&
depends fribidi &&
+depends gnutls &&
+
+optional_depends lirc \
+ "--enable-lirc" \
+ "--disable-lirc" \
+ "support for IR remote control" &&
optional_depends MYSQL \
"--enable-mysql" \
"--disable-mysql" \
@@ -131,4 +137,9 @@ depends libtool &&
optional_depends libusb \
"--enable-libusb" \
"--disable-libusb" \
- "for libusb support"
+ "for libusb support" &&
+if [[ ! $CODENAME = "Isengard" ]]; then
+ optional_depends GIFLIB "--enable-gif" "--disable-gif" "gif support via
libgif" &&
+ depends dcadec &&
+ depends crossguid
+fi
diff --git a/video/kodi/DETAILS b/video/kodi/DETAILS
index b599114..fb7ad4d 100755
--- a/video/kodi/DETAILS
+++ b/video/kodi/DETAILS
@@ -1,13 +1,19 @@
SPELL=kodi
+if [[ $KODI_BRANCH == rc ]]; then
+ VERSION=16.0rc3
+
SOURCE_HASH=sha512:32278f5596613961b457fbb0538b5411eb58a2cabf435b2c0b323e7fd2bc5884b710f86c1f02cc7bdcb8355da33e9324eb4404f04ae72b15c1e0f7eea8c67a99
+ CODENAME=Jarvis
+else
VERSION=15.2
PATCHLEVEL=1
+
SOURCE_HASH=sha512:870f67b83aaa96b1a4111f34824eb47c24616d067adf930f4456ca8f1ac57052c41aa73915304ea85b1d10390865b88d88c85e6cd425b42ec5a504908adf4b67
+ CODENAME=Isengard
+fi
SOURCE="${SPELL}-${VERSION}.tar.gz"
- SOURCEX="${VERSION}-Isengard.tar.gz"
+ SOURCEX="${VERSION}-${CODENAME}.tar.gz"
+ SOURCE_URL[0]=https://github.com/xbmc/xbmc/archive/${SOURCEX}
SOURCE_HINTS="no-check-certificate"
- SOURCE_URL[0]=http://mirrors.${SPELL}.tv/releases/source/${SOURCEX}
- SOURCE_URL[1]=https://github.com/xbmc/xbmc/archive/${SOURCEX}
-
SOURCE_HASH=sha512:870f67b83aaa96b1a4111f34824eb47c24616d067adf930f4456ca8f1ac57052c41aa73915304ea85b1d10390865b88d88c85e6cd425b42ec5a504908adf4b67
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/xbmc-${VERSION}-Isengard"
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/xbmc-${VERSION}-${CODENAME}"
WEB_SITE="http://kodi.tv";
LICENSE[0]=GPL
TMPFS=off
diff --git a/video/kodi/HISTORY b/video/kodi/HISTORY
index 6b64714..b580c1a 100644
--- a/video/kodi/HISTORY
+++ b/video/kodi/HISTORY
@@ -1,3 +1,6 @@
+2016-02-07 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS, PREPARE, DEPENDS: add support for pre-release versions
+
2015-12-07 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* TRIGGERS: on_cast glew check_self
* DETAILS: PATCH_LEVEL=1
diff --git a/video/kodi/PREPARE b/video/kodi/PREPARE
new file mode 100755
index 0000000..18ce989
--- /dev/null
+++ b/video/kodi/PREPARE
@@ -0,0 +1,2 @@
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable rc


  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (fa9186bad9399109cd62db10b24c415e2c9e1841), Florian Franzmann, 02/17/2016

Archive powered by MHonArc 2.6.24.

Top of Page