Skip to Content.
Sympa Menu

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

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

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

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 (894caa8d8f72f14a75876d767bde30475ca11933)
  • Date: Thu, 9 May 2019 19:58:36 +0000
GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

crypto/gsasl/DEPENDS | 5 ++
crypto/gsasl/DETAILS | 1
crypto/gsasl/HISTORY | 4 ++
crypto/pkcs11-helper/DEPENDS | 8 +++-
crypto/pkcs11-helper/DETAILS | 1
crypto/pkcs11-helper/HISTORY | 5 ++
http/libmicrohttpd/DEPENDS | 4 +-
http/libmicrohttpd/DETAILS | 4 +-
http/libmicrohttpd/HISTORY | 4 ++
kernels/linux/HISTORY | 4 ++
kernels/linux/info/patches/maintenance_patches_4/patch-4.19.41 | 5 ++
kernels/linux/latest.defaults | 2 -
libs/tbb/DETAILS | 4 +-
libs/tbb/HISTORY | 3 +
mail/mailutils/DEPENDS | 16
+++++++-
mail/mailutils/DETAILS | 1
mail/mailutils/HISTORY | 7 +++
x11/slim/HISTORY | 4 ++
x11/slim/PRE_BUILD | 4 +-
x11/slim/slim-1.3.6-fix-libslim-libraries.patch | 20
++++++++++
20 files changed, 96 insertions(+), 10 deletions(-)

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

libs/tbb: version 2019U6

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

kernels/linux: version 4.19.41

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

x11/slim: fix linker error

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

mail/mailutils: add missing optional dependencies

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

crypto/pkcs11-helper: add missing dependencies

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

crypto/gsasl: add optional dependency on gnutls

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

http/libmicrohttpd: version 0.9.63, add optional dep on gnutls

diff --git a/crypto/gsasl/DEPENDS b/crypto/gsasl/DEPENDS
index 58155cc..b8fd965 100755
--- a/crypto/gsasl/DEPENDS
+++ b/crypto/gsasl/DEPENDS
@@ -1,3 +1,8 @@
+optional_depends "gnutls" \
+ "--with-gnutls" \
+ "--without-gnutls" \
+ "for GnuTLS support" &&
+
optional_depends "libgcrypt" \
" --enable-cram-md5 --enable-digest-md5" \
"--disable-cram-md5 --disable-digest-md5" \
diff --git a/crypto/gsasl/DETAILS b/crypto/gsasl/DETAILS
index f796404..66baa8c 100755
--- a/crypto/gsasl/DETAILS
+++ b/crypto/gsasl/DETAILS
@@ -1,5 +1,6 @@
SPELL=gsasl
VERSION=1.8.0
+ PATCHLEVEL=1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/crypto/gsasl/HISTORY b/crypto/gsasl/HISTORY
index 7969a5b..36c67e1 100644
--- a/crypto/gsasl/HISTORY
+++ b/crypto/gsasl/HISTORY
@@ -1,3 +1,7 @@
+2019-05-08 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS: add optional dependency on gnutls
+ * DETAILS: PATCHLEVEL++
+
2014-12-24 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: updated spell to 1.8.0

diff --git a/crypto/pkcs11-helper/DEPENDS b/crypto/pkcs11-helper/DEPENDS
index 2f7e7a1..2c41242 100755
--- a/crypto/pkcs11-helper/DEPENDS
+++ b/crypto/pkcs11-helper/DEPENDS
@@ -1,3 +1,9 @@
depends gcc &&
depends autoconf &&
-depends automake
+depends automake &&
+
+depends nspr &&
+
+optional_depends SSL "--enable-crypto-engine-openssl"
"--disable-crypto-engine-openssl" "for OpenSSL crypto engine" &&
+optional_depends nss "--enable-crypto-engine-nss"
"--disable-crypto-engine-nss" "for NSS crypto engine" &&
+optional_depends gnutls "--enable-crypto-engine-gnutls"
"--disable-crypto-engine-gnutls" "for GnuTLS crypto engine"
diff --git a/crypto/pkcs11-helper/DETAILS b/crypto/pkcs11-helper/DETAILS
index 3d777b4..a65d6ba 100755
--- a/crypto/pkcs11-helper/DETAILS
+++ b/crypto/pkcs11-helper/DETAILS
@@ -1,5 +1,6 @@
SPELL=pkcs11-helper
VERSION=1.25.1
+ PATCHLEVEL=1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$SPELL-$VERSION
SOURCE_URL[0]=https://github.com/OpenSC/$SPELL/archive/$SOURCE
diff --git a/crypto/pkcs11-helper/HISTORY b/crypto/pkcs11-helper/HISTORY
index 333a6d4..4319496 100644
--- a/crypto/pkcs11-helper/HISTORY
+++ b/crypto/pkcs11-helper/HISTORY
@@ -1,3 +1,8 @@
+2019-05-08 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS: add optional dependencies on SSL, gnutls, nss,
+ add dependency on nspr
+ * DETAILS: PATCHLEVEL++
+
2019-04-03 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS, DEPENDS, PRE_BUILD: version 1.25.1, fix WEB_SITE,
SOURCE_URL

diff --git a/http/libmicrohttpd/DEPENDS b/http/libmicrohttpd/DEPENDS
index 7f3a1a0..9bce4fd 100755
--- a/http/libmicrohttpd/DEPENDS
+++ b/http/libmicrohttpd/DEPENDS
@@ -1,3 +1,5 @@
depends libgcrypt &&
depends curl &&
-depends zlib
+depends zlib &&
+
+optional_depends gnutls '--with-gnutls' '--without-gnutls' 'use GnuTLS for
HTTPS support'
diff --git a/http/libmicrohttpd/DETAILS b/http/libmicrohttpd/DETAILS
index 1b0f746..e12711b 100755
--- a/http/libmicrohttpd/DETAILS
+++ b/http/libmicrohttpd/DETAILS
@@ -1,8 +1,8 @@
SPELL=libmicrohttpd
- VERSION=0.9.59
+ VERSION=0.9.63
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_URL[0]=ftp://ftp.gnu.org/gnu/${SPELL}/${SOURCE}
-
SOURCE_HASH=sha512:2c9080ebd520631b5ab6eed42770c7911079365c7bc79ea74fc5502ebc370fdaea9a84a4d9db7cbd8ba1c4797c7531e127e3b73ad8d38601d700529f2bab84d5
+
SOURCE_HASH=sha512:cb99e7af84fb6d7c0fd3894a9dc0fbff14959b35347506bd3211a65bbfad36455007b9e67493e97c9d8394834408df10eeabdc7758573e6aae0ba6f5f87afe17
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://www.gnu.org/software/libmicrohttpd/ "
LICENSE[0]=LGPL
diff --git a/http/libmicrohttpd/HISTORY b/http/libmicrohttpd/HISTORY
index 33e6695..5c7ce72 100644
--- a/http/libmicrohttpd/HISTORY
+++ b/http/libmicrohttpd/HISTORY
@@ -1,3 +1,7 @@
+2019-05-08 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 0.9.63
+ * DEPENDS: add optional dependency on gnutls
+
2018-09-10 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: updated spell to 0.9.59

diff --git a/kernels/linux/HISTORY b/kernels/linux/HISTORY
index 049e906..b074de5 100644
--- a/kernels/linux/HISTORY
+++ b/kernels/linux/HISTORY
@@ -1,3 +1,7 @@
+2019-05-09 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * latest.defaults: LATEST_maintenance_patches_4=patch-4.19.41
+ * info/patches/maintenance_patches_4/patch-4.19.41: added
+
2019-05-06 Pavel Vinogradov <public AT sourcemage.org>
* latest.defaults: LATEST_5=5.1
LATEST_maintenance_patches_5=patch-5.1
diff --git a/kernels/linux/info/patches/maintenance_patches_4/patch-4.19.41
b/kernels/linux/info/patches/maintenance_patches_4/patch-4.19.41
new file mode 100755
index 0000000..4678140
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_4/patch-4.19.41
@@ -0,0 +1,5 @@
+appliedkernels="4.19"
+patchversion="${appliedkernels}.41"
+source="patch-${patchversion}.xz"
+source_url="${KERNEL_URL}/pub/linux/kernel/v4.x/${source}"
+sha1sum="829bc37b67d782ff1070d6a3c32cf197e4f5a31c"
diff --git a/kernels/linux/latest.defaults b/kernels/linux/latest.defaults
index fb8637e..303ccc7 100644
--- a/kernels/linux/latest.defaults
+++ b/kernels/linux/latest.defaults
@@ -2,5 +2,5 @@ LATEST_5=5.1
LATEST_4=4.19
LATEST_3=3.19
LATEST_maintenance_patches_3=patch-3.19.3
-LATEST_maintenance_patches_4=patch-4.19.39
+LATEST_maintenance_patches_4=patch-4.19.41
LATEST_maintenance_patches_5=patch-5.1
diff --git a/libs/tbb/DETAILS b/libs/tbb/DETAILS
index f1b2c3b..1f300f4 100755
--- a/libs/tbb/DETAILS
+++ b/libs/tbb/DETAILS
@@ -1,6 +1,6 @@
SPELL=tbb
- VERSION=2019_U5
-
SOURCE_HASH=sha512:227b12e3864fbb922ddbc99700bf94d7d8897d62e2056bf3beb608efacf3ca785dd416b94ad65b421b6c9fc11caff688147b5fbe400c51e98678cee5dc04f274
+ VERSION=2019_U6
+
SOURCE_HASH=sha512:6513d30a498f507cb3e9a06746e430a8bc829de0d204b15d7a79f79c5e7565e59bb0b459c8ca4946293ecb25e2ce11d25cfc7f311e91c7e67342eceb31000d07
SOURCE=tbb-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}-${VERSION}
WEB_SITE=https://www.threadingbuildingblocks.org
diff --git a/libs/tbb/HISTORY b/libs/tbb/HISTORY
index 9b4fbc1..8283947 100644
--- a/libs/tbb/HISTORY
+++ b/libs/tbb/HISTORY
@@ -1,3 +1,6 @@
+2019-05-09 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 2019_U6
+
2019-04-04 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 2019_U5

diff --git a/mail/mailutils/DEPENDS b/mail/mailutils/DEPENDS
index 4b9a59d..a702145 100755
--- a/mail/mailutils/DEPENDS
+++ b/mail/mailutils/DEPENDS
@@ -1,2 +1,14 @@
-depends guile &&
-optional_depends linux-pam "--enable-pam" "--disable-pam" "for pam support"
+depends gcc &&
+
+optional_depends linux-pam "--enable-pam" "--disable-pam" "for pam support"
&&
+optional_depends tcp_wrappers "--with-tcp-wrappers" "--without-tcp-wrappers"
"for libwrap support" &&
+optional_depends gnutls "--with-gnutls" "--without-gnutls" "for GnuTLS
support" &&
+optional_depends gdbm "--with-gdbm" "--without-gdbm" "use GNU DBM" &&
+optional_depends berkeleydb "--with-berkeley-db" "--without-berkeley-db"
"use Berkeley DB" &&
+optional_depends tokyocabinet "--with-tokyocabinet" "--without-tokyocabinet"
"use Tokyo Cabinet" &&
+optional_depends kyotocabinet "--with-kyotocabinet" "--without-kyotocabinet"
"use Kyoto Cabinet"
+optional_depends fribidi "--with-fribidi" "--without-fribidi" "for FriBiDi
support" &&
+optional_depends MYSQL "--with-mysql" "--without-mysql" "for MySQL support"
&&
+optional_depends postgres "--with-postgres" "--without-postgres" "for
Postgres support" &&
+optional_depends openldap "--with-ldap" "--without-ldap" "for OpenLDAP
support" &&
+optional_depends guile "--with-guile" "--without-guile" "for guile support"
diff --git a/mail/mailutils/DETAILS b/mail/mailutils/DETAILS
index 373d931..83badf2 100755
--- a/mail/mailutils/DETAILS
+++ b/mail/mailutils/DETAILS
@@ -1,5 +1,6 @@
SPELL=mailutils
VERSION=3.6
+ PATCHLEVEL=1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=ftp://ftp.gnu.org/gnu/mailutils/$SOURCE
diff --git a/mail/mailutils/HISTORY b/mail/mailutils/HISTORY
index e11ec4e..b6ee0e8 100644
--- a/mail/mailutils/HISTORY
+++ b/mail/mailutils/HISTORY
@@ -1,3 +1,10 @@
+2019-05-08 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS: add missing optional dependencies on
+ tcp_wrappers, gnutls, gdbm, berkeleydb, tokyocabinet,
+ kyotocabinet, fribidi, MYSQL, postgres, openldap, guile,
+ add dependency on gcc
+ * DETAILS: PATCHLEVEL=1
+
2019-04-03 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 3.6

diff --git a/x11/slim/HISTORY b/x11/slim/HISTORY
index 7576d3d..9697751 100644
--- a/x11/slim/HISTORY
+++ b/x11/slim/HISTORY
@@ -1,3 +1,7 @@
+2019-05-08 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * PRE_BUILD, slim-1.3.6-fix-libslim-libraries.patch:
+ add patch from Arch to fix linker error
+
2017-08-15 Eric Sandall <sandalle AT sourcemage.org>
* DEPENDS: Depends on libxrandr

diff --git a/x11/slim/PRE_BUILD b/x11/slim/PRE_BUILD
index 2704af0..e713140 100755
--- a/x11/slim/PRE_BUILD
+++ b/x11/slim/PRE_BUILD
@@ -3,4 +3,6 @@ cd "$SOURCE_DIRECTORY" &&

patch -p0 < "$SPELL_DIRECTORY/no-systemd.patch" &&
patch -p0 < "$SPELL_DIRECTORY/no-pam.patch" &&
-patch -p0 < "$SPELL_DIRECTORY/gcc43.patch"
+patch -p0 < "$SPELL_DIRECTORY/gcc43.patch" &&
+patch -p1 < "$SPELL_DIRECTORY/slim-1.3.6-fix-libslim-libraries.patch"
+
diff --git a/x11/slim/slim-1.3.6-fix-libslim-libraries.patch
b/x11/slim/slim-1.3.6-fix-libslim-libraries.patch
new file mode 100644
index 0000000..b6c90f9
--- /dev/null
+++ b/x11/slim/slim-1.3.6-fix-libslim-libraries.patch
@@ -0,0 +1,20 @@
+diff -upr slim-1.3.6.orig/CMakeLists.txt slim-1.3.6/CMakeLists.txt
+--- slim-1.3.6.orig/CMakeLists.txt 2013-10-02 16:16:22.000000000 +0300
++++ slim-1.3.6/CMakeLists.txt 2013-10-02 16:19:57.000000000 +0300
+@@ -119,6 +119,7 @@ if(USE_PAM)
+ if(PAM_FOUND)
+ message("\tPAM Found")
+ set(SLIM_DEFINITIONS ${SLIM_DEFINITIONS} "-DUSE_PAM")
++ target_link_libraries(libslim ${PAM_LIBRARY})
+ target_link_libraries(${PROJECT_NAME} ${PAM_LIBRARY})
+ target_link_libraries(slimlock ${PAM_LIBRARY})
+ include_directories(${PAM_INCLUDE_DIR})
+@@ -178,6 +179,8 @@ include_directories(
+ )
+
+ target_link_libraries(libslim
++ ${X11_Xft_LIB}
++ ${X11_Xrandr_LIB}
+ ${JPEG_LIBRARIES}
+ ${PNG_LIBRARIES}
+ )


  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (894caa8d8f72f14a75876d767bde30475ca11933), Florian Franzmann, 05/09/2019

Archive powered by MHonArc 2.6.24.

Top of Page