Skip to Content.
Sympa Menu

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

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 (8bfa8c54ff4ee938091320af5babc1ae022c1279)
  • Date: Tue, 19 May 2015 03:12:45 -0500

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

crypto/gnupg-2.1/DETAILS | 2 +-
crypto/gnupg-2.1/HISTORY | 3 +++
crypto/gpgme/DETAILS | 4 ++--
crypto/gpgme/HISTORY | 3 +++
crypto/libassuan/DETAILS | 2 +-
crypto/libassuan/HISTORY | 3 +++
crypto/libksba/DETAILS | 2 +-
crypto/libksba/HISTORY | 3 +++
crypto/libssh/DETAILS | 10 +++++-----
crypto/libssh/HISTORY | 3 +++
disk/e2fsprogs/DETAILS | 3 ++-
disk/e2fsprogs/HISTORY | 4 ++++
disk/e2fsprogs/e2fsprogs.gpg |binary
kde5-utils/kate/DEPENDS | 14 +++++++++-----
kde5-utils/kate/HISTORY | 3 +++
kernels/bbswitch/BUILD | 2 +-
kernels/bbswitch/HISTORY | 4 ++++
kernels/bbswitch/INSTALL | 1 +
qt5/qtbase/BUILD | 6 ------
qt5/qtbase/HISTORY | 3 +++
20 files changed, 52 insertions(+), 23 deletions(-)

New commits:
commit 8bfa8c54ff4ee938091320af5babc1ae022c1279
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

kate - extra depends

commit 2992cb0340e2d60381c8674feb94b450ba1a3dc1
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

e2fsprogs 1.42.13, SECURITY_PATCH=1, CVE-2015-1572

commit db6e3cb5a55776cb31527c601d166e199a961fc3
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

gpgme 1.5.4

commit bba0849e38bffd482d8ffa7b0de3fecc140e5cbc
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

libksba 1.3.3

commit 300820b806bf67cdd5a3c486bbf81f9dca91d39d
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

libassuan 2.2.1

commit 612083337e50cbad884dbc5f994fa4de17c4d54b
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

gnupg-2.1 2.1.4

commit df48dad3825a1643dd0d5442782c21de64117a0a
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

libssh 0.7.0, SECURITY_PATCH=4, CVE-2015-3146

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

bbswitch: build/install for a new kernel

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

qtbase - cleanup BUILD

diff --git a/crypto/gnupg-2.1/DETAILS b/crypto/gnupg-2.1/DETAILS
index 341e1c1..04e8634 100755
--- a/crypto/gnupg-2.1/DETAILS
+++ b/crypto/gnupg-2.1/DETAILS
@@ -1,5 +1,5 @@
SPELL=gnupg-2.1
- VERSION=2.1.3
+ VERSION=2.1.4
SECURITY_PATCH=0
PATCHLEVEL=0

diff --git a/crypto/gnupg-2.1/HISTORY b/crypto/gnupg-2.1/HISTORY
index 8d96ea9..3f99e06 100644
--- a/crypto/gnupg-2.1/HISTORY
+++ b/crypto/gnupg-2.1/HISTORY
@@ -1,3 +1,6 @@
+2015-05-18 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.1.4
+
2015-04-12 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.1.3

diff --git a/crypto/gpgme/DETAILS b/crypto/gpgme/DETAILS
index a2731ca..eba3287 100755
--- a/crypto/gpgme/DETAILS
+++ b/crypto/gpgme/DETAILS
@@ -33,8 +33,8 @@ case $GPGME_BRANCH in
SOURCE=$SPELL-$VERSION.tar.bz2
;;
1.5)
- VERSION=1.5.3
-
SOURCE_HASH=sha512:c21879bf424372733eae3a06beb1a3aa33b5c4f1fbefcb0964206caccf7a09b17941c0547972762cfb4e8d010e903b3ce6a895697558def2449c529159933049
+ VERSION=1.5.4
+
SOURCE_HASH=sha512:192c2aceb979915606cbc32164eafcfb907f1d6cc5058f71999f7a4b50bbc01063048fd5d907c149414f84a7dad909771f21c2e042850e0b21253c88942cf1f5
SECURITY_PATCH=2
SOURCE=$SPELL-$VERSION.tar.bz2
;;
diff --git a/crypto/gpgme/HISTORY b/crypto/gpgme/HISTORY
index 14e164e..c565337 100644
--- a/crypto/gpgme/HISTORY
+++ b/crypto/gpgme/HISTORY
@@ -1,3 +1,6 @@
+2015-05-19 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.5.4
+
2015-03-15 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: rewritten, for correct dependencies

diff --git a/crypto/libassuan/DETAILS b/crypto/libassuan/DETAILS
index 6e0cede..fd44ed2 100755
--- a/crypto/libassuan/DETAILS
+++ b/crypto/libassuan/DETAILS
@@ -1,5 +1,5 @@
SPELL=libassuan
- VERSION=2.2.0
+ VERSION=2.2.1

SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=ftp://ftp.gnupg.org/gcrypt/libassuan/$SOURCE
diff --git a/crypto/libassuan/HISTORY b/crypto/libassuan/HISTORY
index eb07286..dcec2cc 100644
--- a/crypto/libassuan/HISTORY
+++ b/crypto/libassuan/HISTORY
@@ -1,3 +1,6 @@
+2015-05-18 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.2.1
+
2015-03-01 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.2.0

diff --git a/crypto/libksba/DETAILS b/crypto/libksba/DETAILS
index 6ac1f03..b754880 100755
--- a/crypto/libksba/DETAILS
+++ b/crypto/libksba/DETAILS
@@ -1,5 +1,5 @@
SPELL=libksba
- VERSION=1.3.2
+ VERSION=1.3.3
SECURITY_PATCH=1

SOURCE=$SPELL-$VERSION.tar.bz2
diff --git a/crypto/libksba/HISTORY b/crypto/libksba/HISTORY
index 5fa2d6a..897cf93 100644
--- a/crypto/libksba/HISTORY
+++ b/crypto/libksba/HISTORY
@@ -1,3 +1,6 @@
+2015-05-18 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.3.3
+
2014-11-25 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.3.2, SECURITY_PATCH=1

diff --git a/crypto/libssh/DETAILS b/crypto/libssh/DETAILS
index 1d72f7c..2f7703d 100755
--- a/crypto/libssh/DETAILS
+++ b/crypto/libssh/DETAILS
@@ -1,11 +1,11 @@
SPELL=libssh
- VERSION=0.6.4
-
SOURCE_HASH=sha512:02c1879d7afed9cc8404366c343ea770e97fcdcc7cc467f15b762b2c5724399de3efe69fdf6ee86a607c0f4d2337586f34150b9e0dcc8ccd8e86de79f574cba5
- SECURITY_PATCH=3
- SOURCE=$SPELL-$VERSION.tar.gz
+ VERSION=0.7.0
+
SOURCE_HASH=sha512:2ef897f7295d2b4ba63f0d797c51ba2c8cb7d8569152d34ec982d2b88adccc97c8f2aabea3bbc88b72421256d3d0be661f82bbcf5c4b151018b5a695be445568
+ SECURITY_PATCH=4
+ SOURCE=$SPELL-$VERSION.tar.xz
# SOURCE2=$SOURCE.asc
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=https://red.libssh.org/attachments/download/107/$SOURCE
+ SOURCE_URL[0]=https://red.libssh.org/attachments/download/140/$SOURCE
SOURCE_HINTS[0]="no-check-certificate"
#SOURCE2_HINTS[0]="no-check-certificate"
WEB_SITE=http://www.libssh.org/
diff --git a/crypto/libssh/HISTORY b/crypto/libssh/HISTORY
index d208316..31d7d2d 100644
--- a/crypto/libssh/HISTORY
+++ b/crypto/libssh/HISTORY
@@ -1,3 +1,6 @@
+2015-05-18 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.7.0, SECURITY_PATCH=4, CVE-2015-3146
+
2015-04-29 Thomas Orgis <sobukus AT sourcemage.org>
* DEPENDS, BUILD: only use SSL, not libgcrypt, as that
is broken/unsupported upstream
diff --git a/disk/e2fsprogs/DETAILS b/disk/e2fsprogs/DETAILS
index 3a8d796..df58598 100755
--- a/disk/e2fsprogs/DETAILS
+++ b/disk/e2fsprogs/DETAILS
@@ -1,5 +1,6 @@
SPELL=e2fsprogs
- VERSION=1.42.12
+ VERSION=1.42.13
+ SECURITY_PATCH=1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.asc
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/disk/e2fsprogs/HISTORY b/disk/e2fsprogs/HISTORY
index b143bb4..b5d61aa 100644
--- a/disk/e2fsprogs/HISTORY
+++ b/disk/e2fsprogs/HISTORY
@@ -1,3 +1,7 @@
+2015-05-18 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.42.13, SECURITY_PATCH=1, CVE-2015-1572
+ * e2fsprogs.gpg: subkey 950D81A3 added
+
2015-01-04 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: Fix SOURCE_URL[0]

diff --git a/disk/e2fsprogs/e2fsprogs.gpg b/disk/e2fsprogs/e2fsprogs.gpg
index b0c27a6..833e06d 100644
Binary files a/disk/e2fsprogs/e2fsprogs.gpg and
b/disk/e2fsprogs/e2fsprogs.gpg differ
diff --git a/kde5-utils/kate/DEPENDS b/kde5-utils/kate/DEPENDS
index 762b2ef..e39c6ed 100755
--- a/kde5-utils/kate/DEPENDS
+++ b/kde5-utils/kate/DEPENDS
@@ -1,21 +1,25 @@
source $GRIMOIRE/KDE5_DEPENDS
+depends qtscript &&
+depends kactivities5 &&
+depends kconfig &&
+depends kcrash &&
depends kdoctools &&
depends kdbusaddons &&
depends kguiaddons &&
depends ki18n &&
depends kiconthemes &&
depends kio &&
-depends kparts &&
depends kitemmodels &&
depends kjobwidgets &&
-depends knewstuff &&
+depends knewstuff &&
+depends knotifications &&
+depends kparts &&
depends kservice &&
-depends ktexteditor &&
+depends ktexteditor &&
depends kwallet5 &&
depends kwindowsystem &&
depends kxmlgui &&
-depends qtscript &&
-optional_depends kactivities5 '' '' 'KActivies support' &&
+depends threadweaver &&
optional_depends libgit2 '' '' 'plugin for git support' &&

optional_depends pyqt5 '' '-DCMAKE_DISABLE_FIND_PACKAGE_PythonLibrary=1 \
diff --git a/kde5-utils/kate/HISTORY b/kde5-utils/kate/HISTORY
index a1dec5a..0fda5e7 100644
--- a/kde5-utils/kate/HISTORY
+++ b/kde5-utils/kate/HISTORY
@@ -1,3 +1,6 @@
+2015-05-19 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: update
+
2015-05-12 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 15.04.1

diff --git a/kernels/bbswitch/BUILD b/kernels/bbswitch/BUILD
index 8f58e6d..8726582 100755
--- a/kernels/bbswitch/BUILD
+++ b/kernels/bbswitch/BUILD
@@ -1 +1 @@
-make
+make KVERSION="$(get_sorcery_kernel_version)"
diff --git a/kernels/bbswitch/HISTORY b/kernels/bbswitch/HISTORY
index 3fcdb7b..6286311 100644
--- a/kernels/bbswitch/HISTORY
+++ b/kernels/bbswitch/HISTORY
@@ -1,3 +1,7 @@
+2015-05-18 Vlad Glagolev <stealth AT sourcemage.org>
+ * BUILD: use sorcery kernel version
+ * INSTALL: added, to use sorcery kernel version
+
2015-04-13 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 0.8

diff --git a/kernels/bbswitch/INSTALL b/kernels/bbswitch/INSTALL
new file mode 100755
index 0000000..4ce96f7
--- /dev/null
+++ b/kernels/bbswitch/INSTALL
@@ -0,0 +1 @@
+make KVERSION="$(get_sorcery_kernel_version)" install
diff --git a/qt5/qtbase/BUILD b/qt5/qtbase/BUILD
index 81f43bc..9253ed3 100755
--- a/qt5/qtbase/BUILD
+++ b/qt5/qtbase/BUILD
@@ -1,10 +1,4 @@

-# need to specify version in path for gstreamer!!
-if is_depends_enabled $SPELL gstreamer;then
- VV=`installed_version gstreamer | cut -c-4`
- OPTS+=" -I$INSTALL_ROOT/usr/include/gstreamer-$VV"
- OPTS+=" -L$INSTALL_ROOT/usr/lib/gstreamer-$VV -lgstreamer-$VV"
-fi &&
OPTS="$QT_DEBUG \
$QT_NIS \
$QT_XRAMA \
diff --git a/qt5/qtbase/HISTORY b/qt5/qtbase/HISTORY
index 6b47c1c..283b5fe 100644
--- a/qt5/qtbase/HISTORY
+++ b/qt5/qtbase/HISTORY
@@ -1,3 +1,6 @@
+2015-05-18 Treeve Jelbert <treeve AT sourcemage.org>
+ * BUILD: clean up
+
2015-04-24 Thomas Orgis <sobukus AT sourcemage.org>
* CONFLICTS: added, conflicts with itself during build




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

Archive powered by MHonArc 2.6.24.

Top of Page