Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-merge-kde4+plasma5+kde5 grimoire by Treeve Jelbert (8728dc4ee64266b75537d73cabf4e56ff03b43e8)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to devel-merge-kde4+plasma5+kde5 grimoire by Treeve Jelbert (8728dc4ee64266b75537d73cabf4e56ff03b43e8)
  • Date: Fri, 22 May 2015 07:15:23 -0500

GIT changes to devel-merge-kde4+plasma5+kde5 grimoire by Treeve Jelbert
<treeve AT sourcemage.org>:

ChangeLog | 5
audio-libs/libmusicbrainz5/DETAILS | 6
audio-libs/libmusicbrainz5/HISTORY | 3
dev/null |binary
devel/ccache/DETAILS | 2
devel/ccache/HISTORY | 3
devel/git/DETAILS | 6
devel/git/HISTORY | 3
devel/gitk/DEPENDS | 2
devel/gitk/DETAILS | 33 ---
devel/gitk/DOWNLOAD | 1
devel/gitk/HISTORY | 5
devel/gitk/INSTALL | 2
devel/gitk/PRE_BUILD | 1
devel/gitk/UP_TRIGGERS | 2
devel/mawk/DETAILS | 4
devel/mawk/HISTORY | 3
devel/smallerc/BUILD | 1
devel/smallerc/DETAILS | 38 +++
devel/smallerc/HISTORY | 2
devel/smallerc/INSTALL | 1
devel/smallerc/Makefile | 19 +
devel/smallerc/PREPARE | 2
disk/mtpfs/DETAILS | 6
disk/mtpfs/HISTORY | 3
http/ziproxy/DEPENDS | 14 +
http/ziproxy/DETAILS | 18 +
http/ziproxy/HISTORY | 3
http/ziproxy/INSTALL | 7
http/ziproxy/PRE_BUILD | 4
http/ziproxy/init.d/ziproxy | 20 +
kde4-apps/kaffeine4/HISTORY | 4
kde4-apps/kaffeine4/PRE_BUILD | 3
kde4-apps/kaffeine4/fix-build-gcc-4.7.patch | 35 +++
libs/clucene/BUILD | 3
libs/clucene/CONFIGURE | 3
libs/clucene/HISTORY | 6
libs/clucene/PRE_BUILD | 6
libs/clucene/PRE_SUB_DEPENDS | 1
libs/clucene/REPAIR^all^PRE_SUB_DEPENDS | 1
libs/clucene/SUB_DEPENDS | 2
libs/clucene/clucene-2.3.3.4-contribs_lib-1.patch | 49 ++++
libs/musl/DETAILS | 4
libs/musl/HISTORY | 3
libs/pyqt5/BUILD | 8
libs/pyqt5/CONFIGURE | 2
libs/pyqt5/DEPENDS | 7
libs/pyqt5/DETAILS | 19 +
libs/pyqt5/HISTORY | 25 ++
libs/pyqt5/PROVIDES | 1
mail/mailx/DETAILS | 1
mail/mailx/HISTORY | 12 -
mail/mailx/INSTALL | 3
mail/mailx/PRE_BUILD | 8
mail/mailx/heirloom-mailx-12.5-fixes-1.patch | 232
++++++++++++++++++++++
mail/mailx/libressl.patch | 22 ++
printer/hplip/DETAILS | 2
printer/hplip/HISTORY | 7
python-pypi/sqlacodegen/DETAILS | 4
python-pypi/sqlacodegen/HISTORY | 3
xorg-driver/xf86-input-libinput/DETAILS | 4
xorg-driver/xf86-input-libinput/HISTORY | 5
62 files changed, 649 insertions(+), 55 deletions(-)

New commits:
commit 957eb414b03d87b56e4b13f865d6e47ed8256645
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

libmusicbrainz5: => 5.1.0

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

gitk: spell deprecated, part of git since long ago

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

git 2.4.1

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

smallerc: new spell, Simple C compiler

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

mawk 1.3.4-20150503

commit 2ff7819857dfd3235e5ba07cd283c0dfa9007d7b
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

mtpfs: bump to 1.1 (old source gone)

commit eb0e7493acb1bab89fcc9964c16c681cf5f91c90
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

kaffeine4: fix for gcc >= 4.7

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

ziproxy: new spell, compressing non-caching HTTP proxy

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

xf86-input-libinput: => 0.10.0

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

sqlacodegen: => 1.1.6

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

hplip: => 3.15.4

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

mailx: security + compatibility update

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

pyqt5-5.4

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

libs/clucene: added option to build third-party contributions for 2.x
branch

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

libs/musl: version 1.1.9

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

ccache: => 3.2.2

diff --git a/ChangeLog b/ChangeLog
index 48286ec..d2c9f69 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,12 +1,17 @@
+2015-05-21 Vlad Glagolev <stealth AT sourcemage.org>
+ * http/ziproxy: new spell, compressing non-caching HTTP proxy
+
2015-05-20 Treeve Jelbert <treeve AT sourcemage.org>
* qt5/qtwebsockets: added
* qt5/qtwebchannel: added
+ * libs/pyqt5: added

2015-05-18 Treeve Jelbert <treeve AT sourcemage.org>
* FUNCTIONS: ensure that QT4DIR is set

2015-05-18 Ismael Luceno <ismael AT sourcemage.org>
* devel/intel2gas: new spell, Intel to AT&T assembly syntax converter
+ * devel/smallerc: new spell, Simple C compiler

2015-05-17 Pavel Vinogradov <public AT sourcemage.org>
* disk/udevil: new spell, a command line passwordless mount utility
diff --git a/audio-libs/libmusicbrainz5/DETAILS
b/audio-libs/libmusicbrainz5/DETAILS
index 2c32afb..8cdfc6b 100755
--- a/audio-libs/libmusicbrainz5/DETAILS
+++ b/audio-libs/libmusicbrainz5/DETAILS
@@ -1,10 +1,10 @@
SPELL=libmusicbrainz5
SPELLX=${SPELL//5}
- VERSION=5.0.1
-
SOURCE_HASH=sha512:9c6c69d54b0ad5a716ff2f8d7a17150aa98d57b6ee019d634b679dc09079646e4139fdfc47906db65226a2c25c963f1ad88e2290e6961f4576f6afd7777850ae
+ VERSION=5.1.0
+
SOURCE_HASH=sha512:daa7ccb94e517e90f7d88a0659c84b00f04c6a73ef7771b7e3bd9101fa6569b1935a68a3689502ed0cc8c0d71ba9d2d0ebd9c074dd5eed9f75a3db390b222e03
SOURCE=$SPELLX-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
- SOURCE_URL[0]=https://github.com/downloads/metabrainz/$SPELLX/$SOURCE
+
SOURCE_URL[0]=https://github.com/metabrainz/libmusicbrainz/releases/download/release-$VERSION/$SOURCE
WEB_SITE=http://www.musicbrainz.org
ENTERED=20120506
LICENSE[0]=LGPL
diff --git a/audio-libs/libmusicbrainz5/HISTORY
b/audio-libs/libmusicbrainz5/HISTORY
index 2319bfc..aae0f53 100644
--- a/audio-libs/libmusicbrainz5/HISTORY
+++ b/audio-libs/libmusicbrainz5/HISTORY
@@ -1,3 +1,6 @@
+2015-05-22 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 5.1.0
+
2012-06-11 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.0.1
new spell - new API for libmusicbrainz
diff --git a/devel/ccache/DETAILS b/devel/ccache/DETAILS
index 85c1e30..bdbee0f 100755
--- a/devel/ccache/DETAILS
+++ b/devel/ccache/DETAILS
@@ -1,5 +1,5 @@
SPELL=ccache
- VERSION=3.2.1
+ VERSION=3.2.2
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE2=$SOURCE.asc
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/devel/ccache/HISTORY b/devel/ccache/HISTORY
index f092ad6..7ca361c 100644
--- a/devel/ccache/HISTORY
+++ b/devel/ccache/HISTORY
@@ -1,3 +1,6 @@
+2015-05-19 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.2.2
+
2015-02-01 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 3.2.1

diff --git a/devel/git/DETAILS b/devel/git/DETAILS
index 0aa829e..e22aa42 100755
--- a/devel/git/DETAILS
+++ b/devel/git/DETAILS
@@ -1,6 +1,6 @@
SPELL=git
- VERSION=2.4.0
-
SOURCE_HASH=sha512:0114c5d0dbfeed46e0ba1c8c0da463c52cae6954238547502f44d9050af0d921906beea96ff2c5f56a7c822200d9daa0f1d040f883c701b88a23ec81ac777138
+ VERSION=2.4.1
+
SOURCE_HASH=sha512:3130f5fc2f408098f1012d7f5572d9a0bd57cf745cd233525ef226d329867e7fcc93d70823a9dcd9c7bc95db55ada4dbb32b0501e9fe5c2c5e11780c02e422cd
SECURITY_PATCH=2
SOURCE=$SPELL-$VERSION.tar.xz
# SOURCE2=$SOURCE.sign
@@ -12,7 +12,7 @@ if [[ $GIT_DOC == manpages || $GIT_DOC == both ]]; then
SOURCE3=$SPELL-manpages-$VERSION.tar.xz
# SOURCE4=$SOURCE3.sign
# SOURCE3_GPG=kernel.gpg:$SOURCE3.sign:UPSTREAM_KEY
-
SOURCE3_HASH=sha512:158bff66b9f73fc72d3ac6ac3246bebf831551c0ff1e9571913b952f5b891407ab4408ca2daa247869e50d43bb2e951eed6fdb3c39708c769630bbfc618f0efb
+
SOURCE3_HASH=sha512:b87b11c86f3e680f6a1d7cc0f7cdafda3adc49be725eb178b20ab33ae2e322d34f0aeca04ceca49f696226c9217962c1fd80d8e5169cda14783c50cbd81e0edf
SOURCE3_URL=$KERNEL_URL/pub/software/scm/git/$SOURCE3
# SOURCE4_URL=$KERNEL_URL/pub/software/scm/git/$SOURCE4
# SOURCE4_IGNORE=signature
diff --git a/devel/git/HISTORY b/devel/git/HISTORY
index 517d29d..3d434d2 100644
--- a/devel/git/HISTORY
+++ b/devel/git/HISTORY
@@ -1,3 +1,6 @@
+2015-05-21 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 2.4.1
+
2015-05-01 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: updated spell to 2.4.0

diff --git a/devel/gitk/DEPENDS b/devel/gitk/DEPENDS
deleted file mode 100755
index 7223c36..0000000
--- a/devel/gitk/DEPENDS
+++ /dev/null
@@ -1,2 +0,0 @@
-depends git &&
-depends tk
diff --git a/devel/gitk/DETAILS b/devel/gitk/DETAILS
index dc3ea7a..a4a3029 100755
--- a/devel/gitk/DETAILS
+++ b/devel/gitk/DETAILS
@@ -1,26 +1,7 @@
- SPELL=gitk
- VERSION=1.1
- SOURCE=$SPELL-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL=http://ozlabs.org/~paulus/gitk/gitk-1.1.tar.gz
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
- LICENSE[0]=GPL
- WEB_SITE=http://ozlabs.org/~paulus/gitk/
- ENTERED=20050820
- KEYWORDS="git devel"
- SHORT="Tk commit viewer for git"
- DOCS="README"
-cat << EOF
-Gitk is a git commit viewer with the following features:
-
-* Clear and compact representation of the commit graph
-* Displays headline, author and date of each commit in the
- summary window
-* Displays the full details of one commit - the comments,
- list of files and colorized diff - in the details window
-* Find function for searching through commits
-* Displays the SHA1 ID of the selected commit and makes it
- the X selection so it can be pasted into other windows
-* Convenient key bindings for scanning through each commit
- in turn
-EOF
+ SPELL=gitk
+ VERSION=0
+ PATCHLEVEL=9999
+ SHORT="deprecated"
+ cat << EOF
+ deprecated spell [replaced by git]
+ EOF
diff --git a/devel/gitk/DOWNLOAD b/devel/gitk/DOWNLOAD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/devel/gitk/DOWNLOAD
@@ -0,0 +1 @@
+true
diff --git a/devel/gitk/HISTORY b/devel/gitk/HISTORY
index ab699d4..8384246 100644
--- a/devel/gitk/HISTORY
+++ b/devel/gitk/HISTORY
@@ -1,3 +1,8 @@
+2015-05-21 Ismael Luceno <ismael AT sourcemage.org>
+ * spell deprecated [Included in Git since long ago]
+ * PATCHLEVEL=9999
+ * DETAILS: version 0
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.

diff --git a/devel/gitk/INSTALL b/devel/gitk/INSTALL
index 708e513..27ba77d 100755
--- a/devel/gitk/INSTALL
+++ b/devel/gitk/INSTALL
@@ -1 +1 @@
-install -m 0755 -o root -g root gitk $INSTALL_ROOT/usr/bin/gitk
+true
diff --git a/devel/gitk/PRE_BUILD b/devel/gitk/PRE_BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/devel/gitk/PRE_BUILD
@@ -0,0 +1 @@
+true
diff --git a/devel/gitk/UP_TRIGGERS b/devel/gitk/UP_TRIGGERS
new file mode 100755
index 0000000..9a38d61
--- /dev/null
+++ b/devel/gitk/UP_TRIGGERS
@@ -0,0 +1,2 @@
+up_trigger gitk dispel_self
+up_trigger git cast_self
diff --git a/devel/gitk/gitk-1.1.tar.gz.sig b/devel/gitk/gitk-1.1.tar.gz.sig
deleted file mode 100644
index b01f6da..0000000
Binary files a/devel/gitk/gitk-1.1.tar.gz.sig and /dev/null differ
diff --git a/devel/mawk/DETAILS b/devel/mawk/DETAILS
index b91e243..be1291b 100755
--- a/devel/mawk/DETAILS
+++ b/devel/mawk/DETAILS
@@ -1,8 +1,8 @@
SPELL=mawk
- VERSION=1.3.4-20141206
+ VERSION=1.3.4-20150503
SOURCE="${SPELL}-${VERSION}.tgz"
SOURCE_URL[0]=ftp://invisible-island.net/${SPELL}/${SOURCE}
-
SOURCE_HASH=sha512:636c863d759c8001fd51dea5fd1bfabed193976e9d7e7d614848bf8b5b4714b16325833099abf33c0a94c9cd746608da10e6e7b1199cd2480cab419f89813814
+
SOURCE_HASH=sha512:ac9dde6948328d8db94458448abdf7389f8862ae6093315dd19ed9d1cbeab60fca1fc7b084cda4ce09505010f7108612585e3c4ba9663ddf3adb869bf1d9d7b6
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://invisible-island.net/mawk/mawk.html";
LICENSE[0]="GPLv2"
diff --git a/devel/mawk/HISTORY b/devel/mawk/HISTORY
index 3ac9d16..3d68e8d 100644
--- a/devel/mawk/HISTORY
+++ b/devel/mawk/HISTORY
@@ -1,3 +1,6 @@
+2015-05-21 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 1.3.4-20150503
+
2015-01-05 Ismael Luceno <ismael AT sourcemage.org>
* PRE_BUILD: Check for patches directory existence

diff --git a/devel/smallerc/BUILD b/devel/smallerc/BUILD
new file mode 100755
index 0000000..ea8869e
--- /dev/null
+++ b/devel/smallerc/BUILD
@@ -0,0 +1 @@
+make -f "$SPELL_DIRECTORY/Makefile"
diff --git a/devel/smallerc/DETAILS b/devel/smallerc/DETAILS
new file mode 100755
index 0000000..dfa04aa
--- /dev/null
+++ b/devel/smallerc/DETAILS
@@ -0,0 +1,38 @@
+. "$GRIMOIRE/FUNCTIONS"
+ SPELL=smallerc
+ VERSION=$(get_scm_version)
+ SOURCE="$SPELL-git.tar.bz2"
+ SOURCE_URL[0]=git://github.com/alexfru/SmallerC.git:$SPELL-git
+ SOURCE_IGNORE=volatile
+ FORCE_DOWNLOAD=on
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git"
+ WEB_SITE="https://github.com/alexfru/SmallerC";
+ LICENSE[0]="BSD"
+ ENTERED=20150518
+ KEYWORDS=""
+ SHORT="Simple C compiler"
+cat << EOF
+Smaller C is a simple and small single-pass C compiler, currently supporting
+most of the C language common between C89/ANSI C and C99 (minus some C89
+and plus some C99 features).
+
+Currently it generates 16-bit and 32-bit 80386+ assembly code for NASM that
+can then be assembled and linked into DOS, Windows and Linux programs.
+
+Code generation for MIPS CPUs is also supported (primarily for RetroBSD).
+Code generation for TR3200 CPU assembly code for VASM (read about Trillek)
+
+The compiler is capable of compiling itself.
+
+The core compiler comes with a linker and a compiler driver (the driver
+invokes the core compiler, the assembler, and the linker and supports options
+similar to those of gcc).
+
+There's no decent preprocessor in Smaller C as of now, but the compiler
+driver can invoke gcc (or gcc.exe) for preprocessing if instructed.
+
+The standard C library is work-in-progress and it's close to completion.
+
+See the Wiki for more up-to-date details:
+http://github.com/alexfru/SmallerC/wiki
+EOF
diff --git a/devel/smallerc/HISTORY b/devel/smallerc/HISTORY
new file mode 100644
index 0000000..7d227bd
--- /dev/null
+++ b/devel/smallerc/HISTORY
@@ -0,0 +1,2 @@
+2015-05-18 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD, DETAILS, INSTALL, PREPARE, Makefile: spell created
diff --git a/devel/smallerc/INSTALL b/devel/smallerc/INSTALL
new file mode 100755
index 0000000..c44a3c4
--- /dev/null
+++ b/devel/smallerc/INSTALL
@@ -0,0 +1 @@
+make -f "$SPELL_DIRECTORY/Makefile" prefix="$INSTALL_ROOT/usr" install
diff --git a/devel/smallerc/Makefile b/devel/smallerc/Makefile
new file mode 100644
index 0000000..51992a7
--- /dev/null
+++ b/devel/smallerc/Makefile
@@ -0,0 +1,19 @@
+prefix = /usr
+bindir = $(prefix)/bin
+
+VPATH = $(CURDIR)/v0100
+
+CC = gcc
+override CFLAGS += -DHOST_LINUX
+
+targets = smlrc smlrl smlrcc
+
+all: $(targets)
+
+install: all
+ install -m755 -t $(bindir) $(targets)
+
+%: %.c
+ $(CC) $(CFLAGS) -o $@ $<
+
+.PHONY: all install
diff --git a/devel/smallerc/PREPARE b/devel/smallerc/PREPARE
new file mode 100755
index 0000000..86a5079
--- /dev/null
+++ b/devel/smallerc/PREPARE
@@ -0,0 +1,2 @@
+. "$GRIMOIRE/FUNCTIONS" &&
+prepare_select_branch
diff --git a/disk/mtpfs/DETAILS b/disk/mtpfs/DETAILS
index da49bfe..ca40281 100755
--- a/disk/mtpfs/DETAILS
+++ b/disk/mtpfs/DETAILS
@@ -1,8 +1,8 @@
SPELL=mtpfs
- VERSION=0.9
+ VERSION=1.1
SOURCE="$SPELL-$VERSION.tar.gz"
- SOURCE_URL[0]=http://www.adebenham.com/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:2db98e8375ce238ea754de51c20bddb8de88542fa5b09f8d7ddd9deee25c8e2f2f8c28af31bf6ea14db6133e7a331de8ea49b6f7ecbc248d513ebfcd7c81d5cb
+ SOURCE_URL[0]=http://www.adebenham.com/files/mtp/$SOURCE
+
SOURCE_HASH=sha512:627f1a5efa024276f58857e0cb2a2b3057ab9ba6c26d8dcba9de066f4c0efc56a5c991e000e67763b874ee9feb1d9a1e176872b56dd13b146823e8724f2052c8
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-${VERSION}"
WEB_SITE="http://www.adebenham.com/mtpfs/";
LICENSE[0]=GPL
diff --git a/disk/mtpfs/HISTORY b/disk/mtpfs/HISTORY
index cfe3cb6..8a179d6 100644
--- a/disk/mtpfs/HISTORY
+++ b/disk/mtpfs/HISTORY
@@ -1,3 +1,6 @@
+2015-05-21 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: update to 1.1, fix SOURCE_URL
+
2008-10-25 Mathieu Lonjaret <lejatorn AT sourcemage.org>
* DETAILS: update to 0.9, fix SOURCE_URL

diff --git a/http/ziproxy/DEPENDS b/http/ziproxy/DEPENDS
new file mode 100755
index 0000000..c986729
--- /dev/null
+++ b/http/ziproxy/DEPENDS
@@ -0,0 +1,14 @@
+depends zlib &&
+depends giflib &&
+depends JPEG &&
+depends libpng &&
+
+optional_depends jasper \
+ "--with-jasper" \
+ "--without-jasper" \
+ "for JPEG 2000 support" &&
+
+optional_depends LIBSASL \
+ "--with-sasl2" \
+ "--without-sasl2" \
+ "for SASL support"
diff --git a/http/ziproxy/DETAILS b/http/ziproxy/DETAILS
new file mode 100755
index 0000000..6d64533
--- /dev/null
+++ b/http/ziproxy/DETAILS
@@ -0,0 +1,18 @@
+ SPELL=ziproxy
+ VERSION=3.3.1
+ SOURCE=${SPELL}-${VERSION}.tar.bz2
+ SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
+
SOURCE_HASH=sha512:8ffbc99413052fb6ee8ad79855f18b1ae267951de4da2bed32920be1f16db4d8f36763fd11010b7675a1ebdfeddbf88f2777b63cd45b5837385251241909b736:UPSTREAM_HASH
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE=http://ziproxy.sourceforge.net/
+ DOCS="CREDITS JPEG2000.txt THANKS $DOCS"
+ ENTERED=20150521
+ LICENSE[0]=GPL
+ KEYWORDS="http proxy compression"
+ SHORT="compressing non-caching HTTP proxy"
+cat << EOF
+Ziproxy is forwarding HTTP proxy server aimed to speed up low-bandwidth
+connections. It does so by gzipping HTML and using lossy compression of GIF,
+PNG and JPEG pictures. Ziproxy also offers JPEG 2000 support, transparent
+proxying and more.
+EOF
diff --git a/http/ziproxy/HISTORY b/http/ziproxy/HISTORY
new file mode 100644
index 0000000..e158691
--- /dev/null
+++ b/http/ziproxy/HISTORY
@@ -0,0 +1,3 @@
+2015-05-21 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS, DEPENDS, INSTALL, PRE_BUILD, init.d: created spell, version
+ 3.3.1
diff --git a/http/ziproxy/INSTALL b/http/ziproxy/INSTALL
new file mode 100755
index 0000000..0f4f2ba
--- /dev/null
+++ b/http/ziproxy/INSTALL
@@ -0,0 +1,7 @@
+default_install &&
+
+install -vm 755 -d "$INSTALL_ROOT/usr/share/ziproxy" &&
+
+cp -Rv var/ziproxy/* "$INSTALL_ROOT/usr/share/ziproxy/" &&
+cp -Rv etc/xinetd.d "$INSTALL_ROOT/usr/share/ziproxy/" &&
+cp -Rv etc/ziproxy "$INSTALL_ROOT/usr/share/ziproxy/examples"
diff --git a/http/ziproxy/PRE_BUILD b/http/ziproxy/PRE_BUILD
new file mode 100755
index 0000000..4a672a4
--- /dev/null
+++ b/http/ziproxy/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+sedit "s:/var/ziproxy:$INSTALL_ROOT/usr/share/ziproxy:g"
etc/ziproxy/ziproxy.conf
diff --git a/http/ziproxy/init.d/ziproxy b/http/ziproxy/init.d/ziproxy
new file mode 100755
index 0000000..530160e
--- /dev/null
+++ b/http/ziproxy/init.d/ziproxy
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+PROGRAM=/usr/bin/ziproxy
+PIDFILE="/var/run/ziproxy.pid"
+ARGS="-d -p ${PIDFILE}"
+RUNLEVEL=3
+NEEDS="+network"
+
+. /etc/init.d/smgl_init
+
+stop() {
+ echo "Stopping $NAME..."
+
+ $PROGRAM -k -p ${PIDFILE}
+ evaluate_retval
+}
+
+reload() {
+ _restart
+}
diff --git a/kde4-apps/kaffeine4/HISTORY b/kde4-apps/kaffeine4/HISTORY
index 9c45180..010456d 100644
--- a/kde4-apps/kaffeine4/HISTORY
+++ b/kde4-apps/kaffeine4/HISTORY
@@ -1,3 +1,7 @@
+2015-05-20 Thomas Orgis <sobukus AT sourcemage.org>
+ * PRE_BUILD: fix build with recent gcc
+ * fix-build-gcc-4.7.patch: added
+
2011-09-06 Bor Kraljič <pyrobor AT ver.si>
* DEPENDS: xine-lib is needed to build

diff --git a/kde4-apps/kaffeine4/PRE_BUILD b/kde4-apps/kaffeine4/PRE_BUILD
new file mode 100755
index 0000000..13e6b6d
--- /dev/null
+++ b/kde4-apps/kaffeine4/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+patch -p1 < "$SCRIPT_DIRECTORY/fix-build-gcc-4.7.patch"
diff --git a/kde4-apps/kaffeine4/fix-build-gcc-4.7.patch
b/kde4-apps/kaffeine4/fix-build-gcc-4.7.patch
new file mode 100644
index 0000000..74bc75f
--- /dev/null
+++ b/kde4-apps/kaffeine4/fix-build-gcc-4.7.patch
@@ -0,0 +1,35 @@
+From: Christoph Pfister <christophpfister AT gmail.com>
+Date: Wed, 04 Apr 2012 19:22:09 +0000
+Subject: fix build for gcc 4.7
+X-Git-Url:
http://quickgit.kde.org/?p=kaffeine.git&a=commitdiff&h=2da9df1e67004c3cfa879578c351300a99f23da1
+---
+fix build for gcc 4.7
+---
+
+
+--- a/src/dvb/dvbepg.cpp
++++ b/src/dvb/dvbepg.cpp
+@@ -690,15 +690,15 @@
+ // 1980-01-06T000000 minus 15 secs (= UTC - GPS in 2011)
+ QDateTime baseDateTime = QDateTime(QDate(1980, 1, 5), QTime(23, 59,
45), Qt::UTC);
+
+- for (AtscEitSectionEntry entry = eitSection.entries(); (entryCount >
0) && entry.isValid();
+- --entryCount, entry.advance()) {
++ for (AtscEitSectionEntry eitEntry = eitSection.entries();
++ (entryCount > 0) && eitEntry.isValid(); --entryCount,
eitEntry.advance()) {
+ DvbEpgEntry epgEntry;
+ epgEntry.channel = channel;
+- epgEntry.begin = baseDateTime.addSecs(entry.startTime());
+- epgEntry.duration = QTime().addSecs(entry.duration());
+- epgEntry.title = entry.title();
+-
+- quint32 id = ((quint32(fakeChannel.networkId) << 16) |
quint32(entry.eventId()));
++ epgEntry.begin = baseDateTime.addSecs(eitEntry.startTime());
++ epgEntry.duration = QTime().addSecs(eitEntry.duration());
++ epgEntry.title = eitEntry.title();
++
++ quint32 id = ((quint32(fakeChannel.networkId) << 16) |
quint32(eitEntry.eventId()));
+ DvbSharedEpgEntry entry = epgEntries.value(id);
+
+ if (entry.isValid() && (entry->channel == epgEntry.channel) &&
+
diff --git a/libs/clucene/BUILD b/libs/clucene/BUILD
index f52df82..22e4416 100755
--- a/libs/clucene/BUILD
+++ b/libs/clucene/BUILD
@@ -2,5 +2,8 @@ if [[ $CLUCENE_BRANCH == "stable" ]]; then
OPTS="--disable-static $OPTS" &&
default_build
else
+ if [[ $CLUCENE_CONTRIBS == "y" ]]; then
+ OPTS="-DBUILD_CONTRIBS=ON -DBUILD_CONTRIBS_LIB=ON $OPTS"
+ fi &&
cmake_build
fi
diff --git a/libs/clucene/CONFIGURE b/libs/clucene/CONFIGURE
new file mode 100755
index 0000000..7ba092d
--- /dev/null
+++ b/libs/clucene/CONFIGURE
@@ -0,0 +1,3 @@
+if [[ $CLUCENE_BRANCH != "stable" ]]; then
+ config_query CLUCENE_CONTRIBS "Do you want third-party contributions?" n
+fi
diff --git a/libs/clucene/HISTORY b/libs/clucene/HISTORY
index f32643e..38742ae 100644
--- a/libs/clucene/HISTORY
+++ b/libs/clucene/HISTORY
@@ -1,3 +1,9 @@
+2015-05-19 Pavel Vinogradov <public AT sourcemage.org>
+ * BUILD, CONFIGURE, *SUB_DEPENDS: added option to build third-party
+ contributions for 2.x branch
+ * PRE_BUILD, clucene-2.3.3.4-contribs_lib-1.patch: added fix for
+ building third-party contributions (borrowed from BLFS & Debian)
+
2012-07-23 Sukneet Basuta <sukneet AT sourcemage.org>
* DETAILS: re-add stable branch (0.9.21b)
* PREPARE: added, to select branch
diff --git a/libs/clucene/PRE_BUILD b/libs/clucene/PRE_BUILD
new file mode 100755
index 0000000..b4771b8
--- /dev/null
+++ b/libs/clucene/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+if [ "$CLUCENE_BRANCH" != "stable" ]; then
+ patch -p1 < "$SPELL_DIRECTORY/clucene-2.3.3.4-contribs_lib-1.patch"
+fi
diff --git a/libs/clucene/PRE_SUB_DEPENDS b/libs/clucene/PRE_SUB_DEPENDS
index efc181b..07f5559 100755
--- a/libs/clucene/PRE_SUB_DEPENDS
+++ b/libs/clucene/PRE_SUB_DEPENDS
@@ -1,4 +1,5 @@
case $THIS_SUB_DEPENDS in
stable) [[ $CLUCENE_BRANCH == "stable" ]] && return 0;;
+CONTRIBS) [[ $CLUCENE_BRANCH == "2.x" && $CLUCENE_CONTRIBS == "y" ]] &&
return 0;;
*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"; return 1;;
esac
diff --git a/libs/clucene/REPAIR^all^PRE_SUB_DEPENDS
b/libs/clucene/REPAIR^all^PRE_SUB_DEPENDS
index efc181b..07f5559 100755
--- a/libs/clucene/REPAIR^all^PRE_SUB_DEPENDS
+++ b/libs/clucene/REPAIR^all^PRE_SUB_DEPENDS
@@ -1,4 +1,5 @@
case $THIS_SUB_DEPENDS in
stable) [[ $CLUCENE_BRANCH == "stable" ]] && return 0;;
+CONTRIBS) [[ $CLUCENE_BRANCH == "2.x" && $CLUCENE_CONTRIBS == "y" ]] &&
return 0;;
*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"; return 1;;
esac
diff --git a/libs/clucene/SUB_DEPENDS b/libs/clucene/SUB_DEPENDS
index cd14da7..f158859 100755
--- a/libs/clucene/SUB_DEPENDS
+++ b/libs/clucene/SUB_DEPENDS
@@ -1,5 +1,7 @@
case $THIS_SUB_DEPENDS in
stable) message "clucene stable branch (0.9.21b) needed, forcing it." &&
CLUCENE_BRANCH="stable";;
+CONTRIBS) message "clucene third-party contributions in 2.x branch needed,
forcing it." &&
+ CLUCENE_BRANCH="2.x" && CLUCENE_CONTRIBS="y";;
*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"; return 1;;
esac
diff --git a/libs/clucene/clucene-2.3.3.4-contribs_lib-1.patch
b/libs/clucene/clucene-2.3.3.4-contribs_lib-1.patch
new file mode 100644
index 0000000..7866eae
--- /dev/null
+++ b/libs/clucene/clucene-2.3.3.4-contribs_lib-1.patch
@@ -0,0 +1,49 @@
+Submitted By: Igor Živković <contact AT igor-zivkovic.from.hr>
+Date: 2013-10-17
+Initial Package Version: 2.3.3.4
+Upstream Status: Reported
+Origin: Debian
+Description: Fixed building and installing of contribs-lib if
specified by config.
+
+diff -Naur clucene-2.3.3.4.orig/CMakeLists.txt clucene-2.3.3.4/CMakeLists.txt
+--- clucene-2.3.3.4.orig/CMakeLists.txt 2013-10-17 11:32:30.064546492
+0200
++++ clucene-2.3.3.4/CMakeLists.txt 2013-10-17 11:33:58.559550441 +0200
+@@ -163,7 +163,7 @@
+ SET(BUILD_CONTRIBS_LIB 1)
+ ENDIF ( BUILD_CONTRIBS )
+ IF ( BUILD_CONTRIBS_LIB )
+- ADD_SUBDIRECTORY (src/contribs-lib EXCLUDE_FROM_ALL)
++ ADD_SUBDIRECTORY (src/contribs-lib)
+ ENDIF ( BUILD_CONTRIBS_LIB )
+
+
+diff -Naur clucene-2.3.3.4.orig/src/contribs-lib/CMakeLists.txt
clucene-2.3.3.4/src/contribs-lib/CMakeLists.txt
+--- clucene-2.3.3.4.orig/src/contribs-lib/CMakeLists.txt 2013-10-17
11:32:30.076546493 +0200
++++ clucene-2.3.3.4/src/contribs-lib/CMakeLists.txt 2013-10-17
11:33:58.560550441 +0200
+@@ -106,9 +106,26 @@
+ )
+ TARGET_LINK_LIBRARIES(clucene-contribs-lib ${clucene_contrib_extra_libs})
+
++#install public headers.
++FOREACH(file ${HEADERS})
++ get_filename_component(apath ${file} PATH)
++ get_filename_component(aname ${file} NAME)
++ file(RELATIVE_PATH relpath ${CMAKE_SOURCE_DIR}/src/contribs-lib
${apath})
++ IF ( NOT aname MATCHES "^_.*" )
++ install(FILES ${file}
++ DESTINATION include/${relpath}
++ COMPONENT development)
++ ENDIF ( NOT aname MATCHES "^_.*" )
++ENDFOREACH(file)
++
+ #set properties on the libraries
+ SET_TARGET_PROPERTIES(clucene-contribs-lib PROPERTIES
+ VERSION ${CLUCENE_VERSION}
+ SOVERSION ${CLUCENE_SOVERSION}
+ COMPILE_DEFINITIONS_DEBUG _DEBUG
+ )
++
++#and install library
++install(TARGETS clucene-contribs-lib
++ DESTINATION ${LIB_DESTINATION}
++ COMPONENT runtime )
diff --git a/libs/musl/DETAILS b/libs/musl/DETAILS
index e511937..1b101db 100755
--- a/libs/musl/DETAILS
+++ b/libs/musl/DETAILS
@@ -1,9 +1,9 @@
SPELL=musl
- VERSION=1.1.5
+ VERSION=1.1.9
SOURCE="$SPELL-$VERSION.tar.gz"
WEB_SITE="http://www.musl-libc.org";
SOURCE_URL[0]="$WEB_SITE/releases/${SOURCE}"
-
SOURCE_HASH=sha512:4436887367137cbfc6d34e0f403b8dd36db2a55a5160681fef4de7cc0cb1be38487ea708e6aa6dc1328b61c62868b6cc19f099649c9d12e1ba812dfa8844b772
+
SOURCE_HASH=sha512:a6f899814b728113d3ad1b9d03dfde4991af1d9cb85cf596583d6c98cfd596dc2523453ff9bd6e40daef9a63682bf39a66d88ddaa5b51bac72f52c9ff43b9590
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
LICENSE[0]="MIT"
ENTERED=20150110
diff --git a/libs/musl/HISTORY b/libs/musl/HISTORY
index 513fcd4..928a0b1 100644
--- a/libs/musl/HISTORY
+++ b/libs/musl/HISTORY
@@ -1,2 +1,5 @@
+2015-05-19 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.1.9
+
2015-01-10 Ismael Luceno <ismael AT sourcemage.org>
* BUILD, DETAILS: spell created
diff --git a/libs/pyqt5/BUILD b/libs/pyqt5/BUILD
new file mode 100755
index 0000000..a8ccff1
--- /dev/null
+++ b/libs/pyqt5/BUILD
@@ -0,0 +1,8 @@
+if [ $PYQT_BIG == y ];then
+ VBIG=-c
+fi &&
+QMAKEPATH="$QT5DIR/bin" &&
+# Need to use the proper selected python.
+PYTHON=$(get_spell_provider_file $SPELL PYTHON '/usr/bin/python[0-9\.]*$') &&
+$PYTHON ./configure.py --confirm-license $VBIG -j $MAKE_NJOBS &&
+make
diff --git a/libs/pyqt5/CONFIGURE b/libs/pyqt5/CONFIGURE
new file mode 100755
index 0000000..aaa41e8
--- /dev/null
+++ b/libs/pyqt5/CONFIGURE
@@ -0,0 +1,2 @@
+config_query PYQT_BIG "can I use LOTS(>512MB) of memory? " n
+
diff --git a/libs/pyqt5/DEPENDS b/libs/pyqt5/DEPENDS
new file mode 100755
index 0000000..379c1c0
--- /dev/null
+++ b/libs/pyqt5/DEPENDS
@@ -0,0 +1,7 @@
+depends PYTHON &&
+depends sip &&
+depends qtbase &&
+optional_depends dbus-python '' '' 'DBus support' &&
+optional_depends qttools '' '--no-tools' 'build tools' &&
+optional_depends qtdeclarative '' '--no-qml-plugin' 'build qmlscene plugin'
&&
+optional_depends qtwebkit '' '' 'WebKit support'
diff --git a/libs/pyqt5/DETAILS b/libs/pyqt5/DETAILS
new file mode 100755
index 0000000..6a4e91d
--- /dev/null
+++ b/libs/pyqt5/DETAILS
@@ -0,0 +1,19 @@
+ SPELL=pyqt5
+ SPELLX=PyQt-gpl
+ VERSION=5.4
+
SOURCE_HASH=sha512:dbd8a8194df605d2938b69634827b7ed8c8534f1352ee4e1442df6821d2b01e37b7aec98c8baf12e28a2fb6ffd75a204a79920072b3c7a853aa8de08097520be
+ SOURCE=$SPELLX-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
+ SOURCE_URL[0]=$SOURCEFORGE_URL/pyqt/PyQt5/PyQt-${VERSION}/${SOURCE}
+ WEB_SITE=http://www.riverbankcomputing.co.uk/software/pyqt/
+ ENTERED=20140213
+ LICENSE[0]=GPL
+ KEYWORDS="qt5 python libs"
+ SHORT="Python bindings for the Qt5 GUI toolkit"
+cat << EOF
+From the website:
+PyQt is a set of Python bindings for the Qt toolkit. The bindings are
+implemented as a set of Python modules: qt, qtcanvas, qtgl, qtnetwork,
+qtsql, qttable and qtxml, and contains 300 classes and over 5,750
+functions and methods.
+EOF
diff --git a/libs/pyqt5/HISTORY b/libs/pyqt5/HISTORY
new file mode 100644
index 0000000..7098b24
--- /dev/null
+++ b/libs/pyqt5/HISTORY
@@ -0,0 +1,25 @@
+2015-04-22 Treeve Jelbert <treeve AT sourcemage.org>
+ * BUILD: use get_spell_provider_file
+
+2014-12-28 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 5.4
+
+2014-09-20 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 5.3.2
+
+2014-05-29 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 5.3
+ * DEPENDS: add --no-tools & --no-qml-plugin options
+
+2014-03-17 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 5.2.1
+
+2014-02-22 Treeve Jelbert <treeve AT sourcemage.org>
+ * BUILD: support multiple make jobs
+ * DEPENDS: add dbus-python
+
+2014-02-13 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 5.2
+ spell created , based on pyqt4
+
+
diff --git a/libs/pyqt5/PROVIDES b/libs/pyqt5/PROVIDES
new file mode 100644
index 0000000..bea0157
--- /dev/null
+++ b/libs/pyqt5/PROVIDES
@@ -0,0 +1 @@
+PYQT
diff --git a/mail/mailx/DETAILS b/mail/mailx/DETAILS
index 102b53f..981954a 100755
--- a/mail/mailx/DETAILS
+++ b/mail/mailx/DETAILS
@@ -1,5 +1,6 @@
SPELL=mailx
VERSION=12.4
+ SECURITY_PATCH=1
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=$SOURCEFORGE_URL/heirloom/$SOURCE
diff --git a/mail/mailx/HISTORY b/mail/mailx/HISTORY
index 01c20f2..becc4c9 100644
--- a/mail/mailx/HISTORY
+++ b/mail/mailx/HISTORY
@@ -1,5 +1,13 @@
-2014-08-19 Treeve Jelbert <treeve AT sourcemage.org>
- * DEPENDS: openssl => SSL
+2015-05-20 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: SECURITY_PATCH=1
+ * INSTALL: added nail symlink
+ * PRE_BUILD: apply patches; fixed version checking bug
+ * libressl: added, to fix build against LibreSSL
+ * heirloom-mailx-12.5-fixes-1.patch: added, taken from LFS, to fix
+ several security issues and drop SSLv2 support
+
+2014-08-19 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: openssl => SSL

2012-11-17 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: added, for openssl required dependency
diff --git a/mail/mailx/INSTALL b/mail/mailx/INSTALL
index 7b63bc2..99c9fdc 100755
--- a/mail/mailx/INSTALL
+++ b/mail/mailx/INSTALL
@@ -1,4 +1,5 @@
make install PREFIX="$INSTALL_ROOT/usr" \
UCBINSTALL="$INSTALL_ROOT/usr/bin/install" &&

-ln -sf "$TRACK_ROOT/usr/bin/mailx" "$INSTALL_ROOT/usr/bin/mail"
+ln -sf "$TRACK_ROOT/usr/bin/mailx" "$INSTALL_ROOT/usr/bin/mail" &&
+ln -sf "$TRACK_ROOT/usr/bin/mailx" "$INSTALL_ROOT/usr/bin/nail"
diff --git a/mail/mailx/PRE_BUILD b/mail/mailx/PRE_BUILD
index bd753af..c39ac9c 100755
--- a/mail/mailx/PRE_BUILD
+++ b/mail/mailx/PRE_BUILD
@@ -1,6 +1,12 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

-if spell_ok openssl && [[ $(installed_version openssl) > 1.0 ]]; then
+patch -p1 < "$SPELL_DIRECTORY/heirloom-mailx-12.5-fixes-1.patch" &&
+
+if spell_ok libressl; then
+ patch -p0 < "$SPELL_DIRECTORY/libressl.patch"
+fi &&
+
+if spell_ok openssl && is_version_less 1.0 $(installed_version openssl) ||
spell_ok libressl; then
patch -p0 < "$SPELL_DIRECTORY/openssl-1.patch"
fi
diff --git a/mail/mailx/heirloom-mailx-12.5-fixes-1.patch
b/mail/mailx/heirloom-mailx-12.5-fixes-1.patch
new file mode 100644
index 0000000..fa6d511
--- /dev/null
+++ b/mail/mailx/heirloom-mailx-12.5-fixes-1.patch
@@ -0,0 +1,232 @@
+Submitted By: Ken Moffat <ken at linuxfromscratch dot org>
+Date: 2014-12-27
+Initial Package Version: 12.5
+Upstream Status: Unknown
+Origin: Changes to remove SSL2 found at debian, remainder from redhat.
+Description: Removes support for SSL2 (openssl no longer supports it)
+and fixes CVE-2004-2771 [sic] and CVE-2014-7844.
+
+diff -Naur heirloom-mailx-12.5/extern.h heirloom-mailx-12.5-patched/extern.h
+--- heirloom-mailx-12.5/extern.h 2011-04-26 22:23:22.000000000 +0100
++++ heirloom-mailx-12.5-patched/extern.h 2014-12-27 01:26:59.654169487
+0000
+@@ -396,7 +396,7 @@
+ int is_fileaddr(char *name);
+ struct name *usermap(struct name *names);
+ struct name *cat(struct name *n1, struct name *n2);
+-char **unpack(struct name *np);
++char **unpack(struct name *smopts, struct name *np);
+ struct name *elide(struct name *names);
+ int count(struct name *np);
+ struct name *delete_alternates(struct name *np);
+diff -Naur heirloom-mailx-12.5/fio.c heirloom-mailx-12.5-patched/fio.c
+--- heirloom-mailx-12.5/fio.c 2011-04-26 22:23:22.000000000 +0100
++++ heirloom-mailx-12.5-patched/fio.c 2014-12-27 01:27:15.634561413 +0000
+@@ -43,12 +43,15 @@
+ #endif /* not lint */
+
+ #include "rcv.h"
++
++#ifndef HAVE_WORDEXP
++#error wordexp support is required
++#endif
++
+ #include <sys/stat.h>
+ #include <sys/file.h>
+ #include <sys/wait.h>
+-#ifdef HAVE_WORDEXP
+ #include <wordexp.h>
+-#endif /* HAVE_WORDEXP */
+ #include <unistd.h>
+
+ #if defined (USE_NSS)
+@@ -481,7 +484,6 @@
+ static char *
+ globname(char *name)
+ {
+-#ifdef HAVE_WORDEXP
+ wordexp_t we;
+ char *cp;
+ sigset_t nset;
+@@ -495,7 +497,7 @@
+ sigemptyset(&nset);
+ sigaddset(&nset, SIGCHLD);
+ sigprocmask(SIG_BLOCK, &nset, NULL);
+- i = wordexp(name, &we, 0);
++ i = wordexp(name, &we, WRDE_NOCMD);
+ sigprocmask(SIG_UNBLOCK, &nset, NULL);
+ switch (i) {
+ case 0:
+@@ -527,65 +529,6 @@
+ }
+ wordfree(&we);
+ return cp;
+-#else /* !HAVE_WORDEXP */
+- char xname[PATHSIZE];
+- char cmdbuf[PATHSIZE]; /* also used for file names */
+- int pid, l;
+- char *cp, *shell;
+- int pivec[2];
+- extern int wait_status;
+- struct stat sbuf;
+-
+- if (pipe(pivec) < 0) {
+- perror("pipe");
+- return name;
+- }
+- snprintf(cmdbuf, sizeof cmdbuf, "echo %s", name);
+- if ((shell = value("SHELL")) == NULL)
+- shell = SHELL;
+- pid = start_command(shell, 0, -1, pivec[1], "-c", cmdbuf, NULL);
+- if (pid < 0) {
+- close(pivec[0]);
+- close(pivec[1]);
+- return NULL;
+- }
+- close(pivec[1]);
+-again:
+- l = read(pivec[0], xname, sizeof xname);
+- if (l < 0) {
+- if (errno == EINTR)
+- goto again;
+- perror("read");
+- close(pivec[0]);
+- return NULL;
+- }
+- close(pivec[0]);
+- if (wait_child(pid) < 0 && WTERMSIG(wait_status) != SIGPIPE) {
+- fprintf(stderr, catgets(catd, CATSET, 81,
+- "\"%s\": Expansion failed.\n"), name);
+- return NULL;
+- }
+- if (l == 0) {
+- fprintf(stderr, catgets(catd, CATSET, 82,
+- "\"%s\": No match.\n"), name);
+- return NULL;
+- }
+- if (l == sizeof xname) {
+- fprintf(stderr, catgets(catd, CATSET, 83,
+- "\"%s\": Expansion buffer overflow.\n"),
name);
+- return NULL;
+- }
+- xname[l] = 0;
+- for (cp = &xname[l-1]; *cp == '\n' && cp > xname; cp--)
+- ;
+- cp[1] = '\0';
+- if (strchr(xname, ' ') && stat(xname, &sbuf) < 0) {
+- fprintf(stderr, catgets(catd, CATSET, 84,
+- "\"%s\": Ambiguous.\n"), name);
+- return NULL;
+- }
+- return savestr(xname);
+-#endif /* !HAVE_WORDEXP */
+ }
+
+ /*
+diff -Naur heirloom-mailx-12.5/mailx.1 heirloom-mailx-12.5-patched/mailx.1
+--- heirloom-mailx-12.5/mailx.1 2011-04-26 22:23:22.000000000 +0100
++++ heirloom-mailx-12.5-patched/mailx.1 2014-12-27 01:26:53.838026857
+0000
+@@ -656,6 +656,14 @@
+ will have the system wide alias expanded
+ as all mail goes through sendmail.
+ .SS "Recipient address specifications"
++If the
++.I expandaddr
++option is not set (the default), recipient addresses must be names of
++local mailboxes or Internet mail addresses.
++.PP
++If the
++.I expandaddr
++option is set, the following rules apply:
+ When an address is used to name a recipient
+ (in any of To, Cc, or Bcc),
+ names of local mail folders
+@@ -2391,6 +2399,12 @@
+ If this option is set,
+ \fImailx\fR starts even with an empty mailbox.
+ .TP
++.B expandaddr
++Causes
++.I mailx
++to expand message recipient addresses, as explained in the section,
++Recipient address specifications.
++.TP
+ .B flipr
+ Exchanges the
+ .I Respond
+@@ -3575,7 +3589,7 @@
+ .TP
+ .B ssl-method
+ Selects a SSL/TLS protocol version;
+-valid values are `ssl2', `ssl3', and `tls1'.
++valid values are `ssl3', and `tls1'.
+ If unset, the method is selected automatically,
+ if possible.
+ .TP
+diff -Naur heirloom-mailx-12.5/names.c heirloom-mailx-12.5-patched/names.c
+--- heirloom-mailx-12.5/names.c 2011-04-26 22:23:22.000000000 +0100
++++ heirloom-mailx-12.5-patched/names.c 2014-12-27 01:26:59.654169487
+0000
+@@ -268,6 +268,9 @@
+ FILE *fout, *fin;
+ int ispipe;
+
++ if (value("expandaddr") == NULL)
++ return names;
++
+ top = names;
+ np = names;
+ time(&now);
+@@ -546,7 +549,7 @@
+ * Return an error if the name list won't fit.
+ */
+ char **
+-unpack(struct name *np)
++unpack(struct name *smopts, struct name *np)
+ {
+ char **ap, **top;
+ struct name *n;
+@@ -561,7 +564,7 @@
+ * the terminating 0 pointer. Additional spots may be needed
+ * to pass along -f to the host mailer.
+ */
+- extra = 2;
++ extra = 3 + count(smopts);
+ extra++;
+ metoo = value("metoo") != NULL;
+ if (metoo)
+@@ -578,6 +581,10 @@
+ *ap++ = "-m";
+ if (verbose)
+ *ap++ = "-v";
++ for (; smopts != NULL; smopts = smopts->n_flink)
++ if ((smopts->n_type & GDEL) == 0)
++ *ap++ = smopts->n_name;
++ *ap++ = "--";
+ for (; n != NULL; n = n->n_flink)
+ if ((n->n_type & GDEL) == 0)
+ *ap++ = n->n_name;
+diff -Naur heirloom-mailx-12.5/openssl.c
heirloom-mailx-12.5-patched/openssl.c
+--- heirloom-mailx-12.5/openssl.c 2011-04-26 22:23:22.000000000 +0100
++++ heirloom-mailx-12.5-patched/openssl.c 2014-12-27 01:26:34.385549867
+0000
+@@ -216,9 +216,7 @@
+
+ cp = ssl_method_string(uhp);
+ if (cp != NULL) {
+- if (equal(cp, "ssl2"))
+- method = SSLv2_client_method();
+- else if (equal(cp, "ssl3"))
++ if (equal(cp, "ssl3"))
+ method = SSLv3_client_method();
+ else if (equal(cp, "tls1"))
+ method = TLSv1_client_method();
+diff -Naur heirloom-mailx-12.5/sendout.c
heirloom-mailx-12.5-patched/sendout.c
+--- heirloom-mailx-12.5/sendout.c 2011-04-26 22:23:22.000000000 +0100
++++ heirloom-mailx-12.5-patched/sendout.c 2014-12-27 01:26:59.654169487
+0000
+@@ -835,7 +835,7 @@
+ #endif /* HAVE_SOCKETS */
+
+ if ((smtp = value("smtp")) == NULL) {
+- args = unpack(cat(mailargs, to));
++ args = unpack(mailargs, to);
+ if (debug || value("debug")) {
+ printf(catgets(catd, CATSET, 181,
+ "Sendmail arguments:"));
diff --git a/mail/mailx/libressl.patch b/mail/mailx/libressl.patch
new file mode 100644
index 0000000..8cca072
--- /dev/null
+++ b/mail/mailx/libressl.patch
@@ -0,0 +1,22 @@
+--- openssl.c.orig
++++ openssl.c
+@@ -56,6 +56,7 @@
+ static struct termios otio;
+ static sigjmp_buf ssljmp;
+
++#include <stdint.h>
+ #include <openssl/crypto.h>
+ #include <openssl/ssl.h>
+ #include <openssl/err.h>
+@@ -137,11 +138,6 @@
+
+ if ((cp = value("ssl-rand-egd")) != NULL) {
+ cp = expand(cp);
+- if (RAND_egd(cp) == -1) {
+- fprintf(stderr, catgets(catd, CATSET, 245,
+- "entropy daemon at \"%s\" not available\n"),
+- cp);
+- } else
+ state = 1;
+ } else if ((cp = value("ssl-rand-file")) != NULL) {
+ cp = expand(cp);
diff --git a/printer/hplip/DETAILS b/printer/hplip/DETAILS
index f783667..a24c465 100755
--- a/printer/hplip/DETAILS
+++ b/printer/hplip/DETAILS
@@ -1,5 +1,5 @@
SPELL=hplip
- VERSION=3.13.7
+ VERSION=3.15.4
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.asc
SOURCE2_IGNORE=signature
diff --git a/printer/hplip/HISTORY b/printer/hplip/HISTORY
index 18af009..cb07345 100644
--- a/printer/hplip/HISTORY
+++ b/printer/hplip/HISTORY
@@ -1,5 +1,8 @@
-2014-08-19 Treeve Jelbert <treeve AT sourcemage.org>
- * DEPENDS: openssl => SSL
+2015-05-20 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 3.15.4
+
+2014-08-19 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: openssl => SSL

2013-07-28 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 3.13.7
diff --git a/python-pypi/sqlacodegen/DETAILS b/python-pypi/sqlacodegen/DETAILS
index 96c3dcd..f7a64ab 100755
--- a/python-pypi/sqlacodegen/DETAILS
+++ b/python-pypi/sqlacodegen/DETAILS
@@ -1,6 +1,6 @@
SPELL=sqlacodegen
- VERSION=1.1.4
-
SOURCE_HASH=sha512:273a15b3fe2f4d7ef4cec450e467d682bac50fb61b4f4223235c1dd2892768054036152e7367747ef634431990faa880ad0274ec2871eb2543a2fd0d80317dff
+ VERSION=1.1.6
+
SOURCE_HASH=sha512:f88c7485b0ba058b36acc799fc60970e1e9e7a1b5c81e5bd9a99a6c6b21bf840d7eb95b7450e76742a5d5a0ceaa455c41176dd6f20086923cc7ab4c41286e49c
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL=https://pypi.python.org/packages/source/s/sqlacodegen/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/python-pypi/sqlacodegen/HISTORY b/python-pypi/sqlacodegen/HISTORY
index 678328b..fa56119 100644
--- a/python-pypi/sqlacodegen/HISTORY
+++ b/python-pypi/sqlacodegen/HISTORY
@@ -1,3 +1,6 @@
+2015-05-20 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.1.6
+
2014-01-03 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.1.4

diff --git a/xorg-driver/xf86-input-libinput/DETAILS
b/xorg-driver/xf86-input-libinput/DETAILS
index bccab3e..9bd2375 100755
--- a/xorg-driver/xf86-input-libinput/DETAILS
+++ b/xorg-driver/xf86-input-libinput/DETAILS
@@ -1,6 +1,6 @@
SPELL=xf86-input-libinput
- VERSION=0.9.0
-
SOURCE_HASH=sha512:9f34966f93b6e7e98b1a358aade80cfc30320c874772c62de73451c06bf3bf0f0a36cf7a2f5edce550ddb933ecdff1e747277a131edbc82782b62402a08ae6a6
+ VERSION=0.10.0
+
SOURCE_HASH=sha512:0f680dd7f746754e0da3ec4587b60ac0f6c7b813531e19d76a86261344c58a1cb5c4697a48a89f3dadd7ca91ac3b25aefcb483d551f2ab36033dc356234fd028
SOURCE=$SPELL-$VERSION.tar.bz2

SOURCE_URL[0]=http://xorg.freedesktop.org/releases/individual/driver/${SOURCE}
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/xorg-driver/xf86-input-libinput/HISTORY
b/xorg-driver/xf86-input-libinput/HISTORY
index 9045079..61c8693 100644
--- a/xorg-driver/xf86-input-libinput/HISTORY
+++ b/xorg-driver/xf86-input-libinput/HISTORY
@@ -1,4 +1,7 @@
-2015-04-04-25 Treeve Jelbert <treeve AT sourcemage.org>
+2015-05-21 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.9.0
+
+2015-04-25 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.9.0

2015-03-06 Treeve Jelbert <treeve AT sourcemage.org>



  • [SM-Commit] GIT changes to devel-merge-kde4+plasma5+kde5 grimoire by Treeve Jelbert (8728dc4ee64266b75537d73cabf4e56ff03b43e8), Treeve Jelbert, 05/22/2015

Archive powered by MHonArc 2.6.24.

Top of Page