Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-xorg-modular grimoire by Treeve Jelbert (7f6985689e02851528b7cbc5d4460814e3acd3ab)

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-xorg-modular grimoire by Treeve Jelbert (7f6985689e02851528b7cbc5d4460814e3acd3ab)
  • Date: Tue, 20 May 2014 03:52:22 -0500

GIT changes to devel-xorg-modular grimoire by Treeve Jelbert
<treeve AT sourcemage.org>:

ChangeLog | 3
crypto/gnutls/DETAILS | 3
crypto/gnutls/HISTORY | 3
dev/null |binary
doc/docx2txt/DETAILS | 4
doc/docx2txt/HISTORY | 3
fonts-x11/ttf-mensch/BUILD | 1
fonts-x11/ttf-mensch/DEPENDS | 1
fonts-x11/ttf-mensch/DETAILS | 38 +++++++++
fonts-x11/ttf-mensch/HISTORY | 3
fonts-x11/ttf-mensch/INSTALL | 2
fonts-x11/ttf-mensch/PRE_BUILD | 1
ftp/proftpd/CONFIGURE | 4
ftp/proftpd/DEPENDS | 21 ++++-
ftp/proftpd/DETAILS | 2
ftp/proftpd/HISTORY | 7 +
ftp/proftpd/ldap-cert.patch | 107
+++++++++++++-------------
ftp/transmission/DETAILS | 2
ftp/transmission/HISTORY | 3
ftp/transmission/transmission-2.83.tar.xz.sig |binary
http/webkitgtk/DETAILS | 5 -
http/webkitgtk/HISTORY | 3
http/webkitgtk3/DETAILS | 5 -
http/webkitgtk3/HISTORY | 3
libs/readline/HISTORY | 5 -
libs/readline/INSTALL | 3
shell-term-fm/vifm/BUILD | 3
shell-term-fm/vifm/CONFIGURE | 3
shell-term-fm/vifm/DETAILS | 4
shell-term-fm/vifm/HISTORY | 4
utils/iozone/DETAILS | 5 -
utils/iozone/HISTORY | 4
utils/iozone/INSTALL | 4
x11-libs/wine/DETAILS | 2
x11-libs/wine/HISTORY | 3
xorg-app/xfd/BUILD | 1
xorg-app/xfd/DEPENDS | 4
xorg-app/xfd/HISTORY | 3
38 files changed, 193 insertions(+), 79 deletions(-)

New commits:
commit 59d150e86a9c8acc472e7223019329b42af89d23
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

transmission: => 2.83

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

fonts-x11/ttf-mensch: new spell, a console font based on Menlo

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

xorg-app/xfd: add dependencies on libxrender and libxmu

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

crypto/gnutls: fix SOURCE_DIRECTORY

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

wine: => 1.7.19

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

docx2txt: => 1.4

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

readline - tweak install

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

vifm: => 0.7.7

commit d1984c8929e99517523f57c630b9b4e00bdde9a6
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

http/webkitgtk3: updated to 2.4.2

commit 2f4ca1463fc6bfa12ae60925702cf23a95d5ed82
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

http/webkitgtk: updated to 2.4.2

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

iozone: => 3_424

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

proftpd: => 1.3.5

diff --git a/ChangeLog b/ChangeLog
index 7654278..bd5dabe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2014-05-18 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * fonts-x11/ttf-mensch: new spell, a console font based on Menlo
+
2014-05-10 Ismael Luceno <ismael AT sourcemage.org>
* mail/isync: new spell, IMAP and MailDir mailbox synchronizer

diff --git a/crypto/gnutls/DETAILS b/crypto/gnutls/DETAILS
index c9ad32d..7d0304f 100755
--- a/crypto/gnutls/DETAILS
+++ b/crypto/gnutls/DETAILS
@@ -12,7 +12,8 @@ esac
BRANCH_VER=$(awk 'BEGIN{FS="."}{print $1"."$2}' <<< $VERSION)
SOURCE2=$SOURCE.sig
SECURITY_PATCH=11
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ SOURCE_DIR_VER=$(awk 'BEGIN{FS="."}{print $1"."$2"."$3}' <<< $VERSION)
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$SOURCE_DIR_VER
SOURCE_URL[0]=ftp://ftp.gnutls.org/gcrypt/gnutls/v$BRANCH_VER/$SOURCE
SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
SOURCE_GPG=gnu.gpg:$SOURCE2:UPSTREAM_KEY
diff --git a/crypto/gnutls/HISTORY b/crypto/gnutls/HISTORY
index f18a900..3d57c9d 100644
--- a/crypto/gnutls/HISTORY
+++ b/crypto/gnutls/HISTORY
@@ -1,3 +1,6 @@
+2014-05-17 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: fix SOURCE_DIRECTORY
+
2014-03-08 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: Fixed SOURCE_URL[0]
updated GNUTLS_BRANCH=stable to 3.2.12.1
diff --git a/doc/docx2txt/DETAILS b/doc/docx2txt/DETAILS
index 14d3568..7f1e4be 100755
--- a/doc/docx2txt/DETAILS
+++ b/doc/docx2txt/DETAILS
@@ -1,6 +1,6 @@
SPELL=docx2txt
- VERSION=1.3
-
SOURCE_HASH=sha512:9ad74558074cd3e72b0d2e6541dc56d7b74d59d6313fb0cde1b2f02a0e1cdb05d705a650c0dde02e5b3a683f8ee6ab2fb5b865301f4213cd3e8770cd9e4d0d97
+ VERSION=1.4
+
SOURCE_HASH=sha512:5e59cd4065f409c20e17b29d3935a2637147392e86a325b28b78748d3b3867ce91f14f3349621b3c95b2ce6a8e38e33cf0816d1f9dccbebfdde9ba29fbd7f5b3
SOURCE=$SPELL-$VERSION.tgz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/doc/docx2txt/HISTORY b/doc/docx2txt/HISTORY
index 4b545c1..c5bbb6c 100644
--- a/doc/docx2txt/HISTORY
+++ b/doc/docx2txt/HISTORY
@@ -1,3 +1,6 @@
+2014-05-17 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.4
+
2014-04-08 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.3

diff --git a/fonts-x11/ttf-mensch/BUILD b/fonts-x11/ttf-mensch/BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/fonts-x11/ttf-mensch/BUILD
@@ -0,0 +1 @@
+true
diff --git a/fonts-x11/ttf-mensch/DEPENDS b/fonts-x11/ttf-mensch/DEPENDS
new file mode 100755
index 0000000..ebcc0be
--- /dev/null
+++ b/fonts-x11/ttf-mensch/DEPENDS
@@ -0,0 +1 @@
+. $SECTION_DIRECTORY/X11_DEPENDS
diff --git a/fonts-x11/ttf-mensch/DETAILS b/fonts-x11/ttf-mensch/DETAILS
new file mode 100755
index 0000000..cc9601c
--- /dev/null
+++ b/fonts-x11/ttf-mensch/DETAILS
@@ -0,0 +1,38 @@
+ SPELL=ttf-mensch
+ VERSION=1
+ SOURCE_IGNORE=unversioned
+ SOURCE="mensch.ttf"
+ SOURCE_URL[0]=http://robey.lag.net/downloads/${SOURCE}
+
SOURCE_HASH=sha512:5525beb76b4d49bd1cb4cfb105d513ebe5e6e7c2faa9c66967440c7a849587c74b8568fa2b81d4500e776078a35f70cf83d28dd6d670e9ae91bb69ece36a3c53
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}"
+ WEB_SITE="http://robey.lag.net/2010/06/21/mensch-font.html";
+ LICENSE[0]=Freely Distributable
+ ENTERED=20140518
+ SHORT="a console font based on MacOS X's Menlo font"
+cat << EOF
+The latest MacOS release (10.6, or “Snow Leopard”) comes with a new
+monospace font. It’s called “Menlo” and it’s a slightly modified
+form of the standard Linux font (with appropriately weightly Linux name)
+“DejaVu Sans Serif Mono”, which is itself an updated form of Bitstream
+Vera Sans Mono. Apple’s modifications are a definite improvement to my
+eyes, mostly because they thicken up some of the wispier glyphs from DejaVu,
+like the underline and period.
+
+The Mensch font is based on Menlo and is modified as follows:
+
+ * Zero is back to being a circle with a dot in the middle. * The
+ ampersand’s loop was closed. That was also bugging me. * Three is rendered
+ in the gothic style, because the gothic style is clearly
+ superior.
+ * Lowercase L is drawn in a more traditional style (the Menlo variant looks
+ bizarre to me), and one is turned gothic. I think the original artist
+ drew the L weirdly to make it extremely clear that it’s not a one, but
+ if you draw a gothic one, the difference is obvious even with a simpler L.
+ * The bang, question, lowercase I, and lowercase J are made friendlier by
+ turning the dots into actual circles, not just blocks.
+ * Angle brackets are embiggened to facilitate languages like Java and C++
that
+ use them to enclose class names. They parallel parens and square brackets
+ in size now.
+ * Q and lowercase Q are made more distinct. Lowercase Q gets a little more
+ spunk. (This was a bit gratuitous.)
+EOF
diff --git a/fonts-x11/ttf-mensch/HISTORY b/fonts-x11/ttf-mensch/HISTORY
new file mode 100644
index 0000000..8c397e5
--- /dev/null
+++ b/fonts-x11/ttf-mensch/HISTORY
@@ -0,0 +1,3 @@
+2014-05-18 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * BUILD, DEPENDS, DETAILS, INSTALL: spell created
+
diff --git a/fonts-x11/ttf-mensch/INSTALL b/fonts-x11/ttf-mensch/INSTALL
new file mode 100755
index 0000000..aaf22b8
--- /dev/null
+++ b/fonts-x11/ttf-mensch/INSTALL
@@ -0,0 +1,2 @@
+mkdir -p ${INSTALL_ROOT}/usr/share/fonts/TTF/ &&
+install -m644 ${SOURCE_CACHE}/mensch.ttf ${INSTALL_ROOT}/usr/share/fonts/TTF/
diff --git a/fonts-x11/ttf-mensch/PRE_BUILD b/fonts-x11/ttf-mensch/PRE_BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/fonts-x11/ttf-mensch/PRE_BUILD
@@ -0,0 +1 @@
+true
diff --git a/ftp/proftpd/CONFIGURE b/ftp/proftpd/CONFIGURE
index ac57f9c..c596720 100755
--- a/ftp/proftpd/CONFIGURE
+++ b/ftp/proftpd/CONFIGURE
@@ -26,12 +26,13 @@ config_query PROFTPD_MOD "Choose optional user
contributed modules to install?"

if [[ $PROFTPD_MOD == "y" ]]; then
local MODULES="mod_copy \
- mod_deflate \
+ mod_dnsbl \
mod_dynmasq \
mod_exec \
mod_ifsession \
mod_ifversion \
mod_load \
+ mod_log_forensic \
mod_qos \
mod_quotatab \
mod_ratio \
@@ -39,6 +40,7 @@ if [[ $PROFTPD_MOD == "y" ]]; then
mod_rewrite \
mod_sftp \
mod_site_misc \
+ mod_snmp \
mod_sql \
mod_tls \
mod_unique_id \
diff --git a/ftp/proftpd/DEPENDS b/ftp/proftpd/DEPENDS
index a45290b..0d30e92 100755
--- a/ftp/proftpd/DEPENDS
+++ b/ftp/proftpd/DEPENDS
@@ -1,5 +1,12 @@
-if list_find "$PROFTPD_MODS" "mod_deflate"; then
- depends zlib
+# handle 'n' selection for modules in CONFIGURE
+if [[ $PROFTPD_MOD == n ]]; then
+ persistent_add PROFTPD_MODS
+fi
+
+optional_depends zlib "" "" "to build mod_deflate module" &&
+
+if is_depends_enabled $SPELL zlib; then
+ list_add "PROFTPD_MODS" "mod_deflate"
fi &&

if list_find "$PROFTPD_MODS" "mod_sql"; then
@@ -41,14 +48,20 @@ else
"for OpenSSL support"
fi &&

-if list_find "$PROFTPD_OPTS" "mod_sftp_pam"; then
+if list_find "$PROFTPD_MODS" "mod_sftp_pam"; then
depends linux-pam
fi &&

-if list_find "$PROFTPD_OPTS" "mod_tls_memcache"; then
+if list_find "$PROFTPD_MODS" "mod_tls_memcache"; then
depends libmemcached
fi &&

+optional_depends geoip "" "" "to build mod_geoip module" &&
+
+if is_depends_enabled $SPELL geoip; then
+ list_add "PROFTPD_MODS" "mod_geoip"
+fi &&
+
optional_depends openldap "" "" "to build mod_ldap module" &&

if is_depends_enabled $SPELL openldap; then
diff --git a/ftp/proftpd/DETAILS b/ftp/proftpd/DETAILS
index 2ccc036..f7aa3bc 100755
--- a/ftp/proftpd/DETAILS
+++ b/ftp/proftpd/DETAILS
@@ -1,5 +1,5 @@
SPELL=proftpd
- VERSION=1.3.4d
+ VERSION=1.3.5
SECURITY_PATCH=2
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.asc
diff --git a/ftp/proftpd/HISTORY b/ftp/proftpd/HISTORY
index 85e0acb..f506e2d 100644
--- a/ftp/proftpd/HISTORY
+++ b/ftp/proftpd/HISTORY
@@ -1,3 +1,10 @@
+2014-05-16 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.3.5
+ * CONFIGURE: added new modules, moved mod_deflate to DEPENDS
+ * DEPENDS: fixed mod variable for mod_sftp_pam & mod_tls_memcache;
added
+ geoip optional dependency for mod_geoip; properly handle modules
list
+ * ldap-cert.patch: updated for 1.3.5
+
2013-06-17 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.3.4d

diff --git a/ftp/proftpd/ldap-cert.patch b/ftp/proftpd/ldap-cert.patch
index f4fee22..6333238 100644
--- a/ftp/proftpd/ldap-cert.patch
+++ b/ftp/proftpd/ldap-cert.patch
@@ -1,6 +1,6 @@
---- contrib/mod_ldap.c.orig 2011-05-24 00:56:40.000000000 +0400
-+++ contrib/mod_ldap.c 2012-07-31 15:14:59.181954021 +0400
-@@ -161,7 +161,14 @@
+--- contrib/mod_ldap.c.orig 2013-11-24 04:45:28.000000000 +0400
++++ contrib/mod_ldap.c 2014-05-16 13:13:12.326617345 +0400
+@@ -142,7 +142,14 @@
*ldap_attr_memberuid = "memberUid",
*ldap_attr_ftpquota = "ftpQuota",
*ldap_attr_ftpquota_profiledn = "ftpQuotaProfileDN",
@@ -16,25 +16,25 @@
#ifdef HAS_LDAP_INITIALIZE
static char *ldap_server_url;
#endif /* HAS_LDAP_INITIALIZE */
-@@ -171,7 +178,9 @@
- ldap_forcedefaultuid = 0, ldap_forcedefaultgid = 0,
- ldap_forcegenhdir = 0, ldap_protocol_version = 3,
+@@ -152,7 +159,9 @@
+ ldap_forcedefaultuid = FALSE, ldap_forcedefaultgid = FALSE,
+ ldap_forcegenhdir = FALSE, ldap_protocol_version = 3,
ldap_dereference = LDAP_DEREF_NEVER,
- ldap_search_scope = LDAP_SCOPE_SUBTREE;
+ ldap_search_scope = LDAP_SCOPE_SUBTREE,
+ ldap_tls_crl_check = -1,
+ ldap_tls_require_cert = -1;
- static struct timeval ldap_querytimeout_tp;

- static uid_t ldap_defaultuid = -1;
-@@ -214,6 +223,86 @@
+ static struct timeval ldap_querytimeout_tv;
+ #define PR_LDAP_QUERY_TIMEOUT_DEFAULT 5
+@@ -196,6 +205,86 @@
struct berval bindcred;
#endif

+ if (ldap_tls_ca_cert_dir) {
-+ ret = ldap_set_option(NULL, LDAP_OPT_X_TLS_CACERTDIR,
ldap_tls_ca_cert_dir);
-+ if (ret != LDAP_OPT_SUCCESS) {
-+ pr_log_pri(PR_LOG_ERR, MOD_LDAP_VERSION ": pr_ldap_connect(): Setting
LDAP_OPT_X_TLS_CACERTDIR option failed: %s", ldap_err2string(ret));
++ res = ldap_set_option(NULL, LDAP_OPT_X_TLS_CACERTDIR,
ldap_tls_ca_cert_dir);
++ if (res != LDAP_OPT_SUCCESS) {
++ pr_log_pri(PR_LOG_ERR, MOD_LDAP_VERSION ": pr_ldap_connect(): Setting
LDAP_OPT_X_TLS_CACERTDIR option failed: %s", ldap_err2string(res));
+ pr_ldap_unbind();
+ return -1;
+ }
@@ -42,9 +42,9 @@
+ }
+
+ if (ldap_tls_ca_cert_file) {
-+ ret = ldap_set_option(NULL, LDAP_OPT_X_TLS_CACERTFILE,
ldap_tls_ca_cert_file);
-+ if (ret != LDAP_OPT_SUCCESS) {
-+ pr_log_pri(PR_LOG_ERR, MOD_LDAP_VERSION ": pr_ldap_connect(): Setting
LDAP_OPT_X_TLS_CACERTFILE option failed: %s", ldap_err2string(ret));
++ res = ldap_set_option(NULL, LDAP_OPT_X_TLS_CACERTFILE,
ldap_tls_ca_cert_file);
++ if (res != LDAP_OPT_SUCCESS) {
++ pr_log_pri(PR_LOG_ERR, MOD_LDAP_VERSION ": pr_ldap_connect(): Setting
LDAP_OPT_X_TLS_CACERTFILE option failed: %s", ldap_err2string(res));
+ pr_ldap_unbind();
+ return -1;
+ }
@@ -52,9 +52,9 @@
+ }
+
+ if (ldap_tls_cert_file) {
-+ ret = ldap_set_option(NULL, LDAP_OPT_X_TLS_CERTFILE,
ldap_tls_cert_file);
-+ if (ret != LDAP_OPT_SUCCESS) {
-+ pr_log_pri(PR_LOG_ERR, MOD_LDAP_VERSION ": pr_ldap_connect(): Setting
LDAP_OPT_X_TLS_CERTFILE option failed: %s", ldap_err2string(ret));
++ res = ldap_set_option(NULL, LDAP_OPT_X_TLS_CERTFILE,
ldap_tls_cert_file);
++ if (res != LDAP_OPT_SUCCESS) {
++ pr_log_pri(PR_LOG_ERR, MOD_LDAP_VERSION ": pr_ldap_connect(): Setting
LDAP_OPT_X_TLS_CERTFILE option failed: %s", ldap_err2string(res));
+ pr_ldap_unbind();
+ return -1;
+ }
@@ -62,9 +62,9 @@
+ }
+
+ if (ldap_tls_cipher_suite) {
-+ ret = ldap_set_option(NULL, LDAP_OPT_X_TLS_CIPHER_SUITE,
ldap_tls_cipher_suite);
-+ if (ret != LDAP_OPT_SUCCESS) {
-+ pr_log_pri(PR_LOG_ERR, MOD_LDAP_VERSION ": pr_ldap_connect(): Setting
LDAP_OPT_X_TLS_CIPHER_SUITE option failed: %s", ldap_err2string(ret));
++ res = ldap_set_option(NULL, LDAP_OPT_X_TLS_CIPHER_SUITE,
ldap_tls_cipher_suite);
++ if (res != LDAP_OPT_SUCCESS) {
++ pr_log_pri(PR_LOG_ERR, MOD_LDAP_VERSION ": pr_ldap_connect(): Setting
LDAP_OPT_X_TLS_CIPHER_SUITE option failed: %s", ldap_err2string(res));
+ pr_ldap_unbind();
+ return -1;
+ }
@@ -72,9 +72,9 @@
+ }
+
+ if (ldap_tls_dh_file) {
-+ ret = ldap_set_option(NULL, LDAP_OPT_X_TLS_DHFILE, ldap_tls_dh_file);
-+ if (ret != LDAP_OPT_SUCCESS) {
-+ pr_log_pri(PR_LOG_ERR, MOD_LDAP_VERSION ": pr_ldap_connect(): Setting
LDAP_OPT_X_TLS_DHFILE option failed: %s", ldap_err2string(ret));
++ res = ldap_set_option(NULL, LDAP_OPT_X_TLS_DHFILE, ldap_tls_dh_file);
++ if (res != LDAP_OPT_SUCCESS) {
++ pr_log_pri(PR_LOG_ERR, MOD_LDAP_VERSION ": pr_ldap_connect(): Setting
LDAP_OPT_X_TLS_DHFILE option failed: %s", ldap_err2string(res));
+ pr_ldap_unbind();
+ return -1;
+ }
@@ -82,9 +82,9 @@
+ }
+
+ if (ldap_tls_key_file) {
-+ ret = ldap_set_option(NULL, LDAP_OPT_X_TLS_KEYFILE, ldap_tls_key_file);
-+ if (ret != LDAP_OPT_SUCCESS) {
-+ pr_log_pri(PR_LOG_ERR, MOD_LDAP_VERSION ": pr_ldap_connect(): Setting
LDAP_OPT_X_TLS_KEYFILE option failed: %s", ldap_err2string(ret));
++ res = ldap_set_option(NULL, LDAP_OPT_X_TLS_KEYFILE, ldap_tls_key_file);
++ if (res != LDAP_OPT_SUCCESS) {
++ pr_log_pri(PR_LOG_ERR, MOD_LDAP_VERSION ": pr_ldap_connect(): Setting
LDAP_OPT_X_TLS_KEYFILE option failed: %s", ldap_err2string(res));
+ pr_ldap_unbind();
+ return -1;
+ }
@@ -92,9 +92,9 @@
+ }
+
+ if (ldap_tls_crl_check != -1) {
-+ ret = ldap_set_option(NULL, LDAP_OPT_X_TLS_CRLCHECK, (void
*)&ldap_tls_crl_check);
-+ if (ret != LDAP_OPT_SUCCESS) {
-+ pr_log_pri(PR_LOG_ERR, MOD_LDAP_VERSION ": pr_ldap_connect(): Setting
LDAP_OPT_X_TLS_CRLCHECK option failed: %s", ldap_err2string(ret));
++ res = ldap_set_option(NULL, LDAP_OPT_X_TLS_CRLCHECK, (void
*)&ldap_tls_crl_check);
++ if (res != LDAP_OPT_SUCCESS) {
++ pr_log_pri(PR_LOG_ERR, MOD_LDAP_VERSION ": pr_ldap_connect(): Setting
LDAP_OPT_X_TLS_CRLCHECK option failed: %s", ldap_err2string(res));
+ pr_ldap_unbind();
+ return -1;
+ }
@@ -102,9 +102,9 @@
+ }
+
+ if (ldap_tls_require_cert != -1) {
-+ ret = ldap_set_option(NULL, LDAP_OPT_X_TLS_REQUIRE_CERT, (void
*)&ldap_tls_require_cert);
-+ if (ret != LDAP_OPT_SUCCESS) {
-+ pr_log_pri(PR_LOG_ERR, MOD_LDAP_VERSION ": pr_ldap_connect(): Setting
LDAP_OPT_X_TLS_REQUIRE_CERT option failed: %s", ldap_err2string(ret));
++ res = ldap_set_option(NULL, LDAP_OPT_X_TLS_REQUIRE_CERT, (void
*)&ldap_tls_require_cert);
++ if (res != LDAP_OPT_SUCCESS) {
++ pr_log_pri(PR_LOG_ERR, MOD_LDAP_VERSION ": pr_ldap_connect(): Setting
LDAP_OPT_X_TLS_REQUIRE_CERT option failed: %s", ldap_err2string(res));
+ pr_ldap_unbind();
+ return -1;
+ }
@@ -112,9 +112,9 @@
+ }
+
#ifdef HAS_LDAP_INITIALIZE
- pr_log_debug(DEBUG3, MOD_LDAP_VERSION ": attempting connection to %s",
ldap_server_url ? ldap_server_url : "(null)");
-
-@@ -1876,6 +1965,130 @@
+ (void) pr_log_writefile(ldap_logfd, MOD_LDAP_VERSION,
+ "attempting connection to URL %s",
+@@ -2029,6 +2118,130 @@
return PR_HANDLED(cmd);
}

@@ -242,10 +242,10 @@
+ return PR_HANDLED(cmd);
+}
+
- static int
- ldap_getconf(void)
- {
-@@ -2060,6 +2273,22 @@
+ /* Initialization routines
+ */
+
+@@ -2279,6 +2492,22 @@
}
}

@@ -268,19 +268,20 @@
return 0;
}

-@@ -2093,6 +2322,15 @@
- { "LDAPForceGeneratedHomedir", set_ldap_forcegenhdir, NULL },
- { "LDAPDefaultQuota", set_ldap_defaultquota, NULL },
- { "LDAPGroups", set_ldap_grouplookups, NULL },
-+ { "LDAPTLSCACertDir", set_ldap_tls_ca_cert_dir, NULL },
-+ { "LDAPTLSCACertFile", set_ldap_tls_ca_cert_file, NULL },
-+ { "LDAPTLSCertFile", set_ldap_tls_cert_file, NULL },
-+ { "LDAPTLSCipherSuite", set_ldap_tls_cipher_suite, NULL },
-+ { "LDAPTLSCrlCheck", set_ldap_tls_crl_check, NULL },
-+ { "LDAPTLSCrlFile", set_ldap_tls_crl_file, NULL },
-+ { "LDAPTLSDHFile", set_ldap_tls_dh_file, NULL },
-+ { "LDAPTLSKeyFile", set_ldap_tls_key_file, NULL },
-+ { "LDAPTLSRequireCert", set_ldap_tls_require_cert, NULL },
+@@ -2309,7 +2538,15 @@
+ { "LDAPServer", set_ldapserver, NULL },
+ { "LDAPUsers", set_ldapuserlookups, NULL },
+ { "LDAPUseTLS", set_ldapusetls, NULL },
+-
++ { "LDAPTLSCACertDir", set_ldap_tls_ca_cert_dir, NULL
},
++ { "LDAPTLSCACertFile", set_ldap_tls_ca_cert_file, NULL },
++ { "LDAPTLSCertFile", set_ldap_tls_cert_file, NULL
},
++ { "LDAPTLSCipherSuite", set_ldap_tls_cipher_suite, NULL },
++ { "LDAPTLSCrlCheck", set_ldap_tls_crl_check, NULL
},
++ { "LDAPTLSCrlFile", set_ldap_tls_crl_file, NULL },
++ { "LDAPTLSDHFile", set_ldap_tls_dh_file, NULL },
++ { "LDAPTLSKeyFile", set_ldap_tls_key_file, NULL },
++ { "LDAPTLSRequireCert", set_ldap_tls_require_cert, NULL },
{ NULL, NULL, NULL },
};

diff --git a/ftp/transmission/DETAILS b/ftp/transmission/DETAILS
index 4c7d388..de9e79a 100755
--- a/ftp/transmission/DETAILS
+++ b/ftp/transmission/DETAILS
@@ -1,5 +1,5 @@
SPELL=transmission
- VERSION=2.82
+ VERSION=2.83
SECURITY_PATCH=1
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_URL[0]=http://download.transmissionbt.com/files/$SOURCE
diff --git a/ftp/transmission/HISTORY b/ftp/transmission/HISTORY
index 03665ac..6f249ac 100644
--- a/ftp/transmission/HISTORY
+++ b/ftp/transmission/HISTORY
@@ -1,3 +1,6 @@
+2014-05-19 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.83
+
2013-08-22 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 2.82

diff --git a/ftp/transmission/transmission-2.82.tar.xz.sig
b/ftp/transmission/transmission-2.82.tar.xz.sig
deleted file mode 100644
index 650cd50..0000000
Binary files a/ftp/transmission/transmission-2.82.tar.xz.sig and /dev/null
differ
diff --git a/ftp/transmission/transmission-2.83.tar.xz.sig
b/ftp/transmission/transmission-2.83.tar.xz.sig
new file mode 100644
index 0000000..6e05fe1
Binary files /dev/null and b/ftp/transmission/transmission-2.83.tar.xz.sig
differ
diff --git a/http/webkitgtk/DETAILS b/http/webkitgtk/DETAILS
index 85ab13f..c279daf 100755
--- a/http/webkitgtk/DETAILS
+++ b/http/webkitgtk/DETAILS
@@ -1,12 +1,11 @@
SPELL=webkitgtk
- VERSION=2.2.4
+ VERSION=2.4.2
SOURCE=webkitgtk-$VERSION.tar.xz
SOURCE_URL[0]=http://www.webkitgtk.org/releases/$SOURCE
-
SOURCE_HASH=sha512:9467abb72dda5839274702ee9173d8d83599196446f80537cf18e9be4b42fb7e23fdeb7d053d87a0143de5b499163d693dd09c4f035a315df78c46d9f7408705
+
SOURCE_HASH=sha512:504eafb65228111b9bf12cadac40906ad8b2885cca60b7020fb04c23b6f0e158ca5ca79ee051cfe0994b176e41021400b8faf8367b00efd72fdef5e5cf5c70e1
SOURCE_DIRECTORY=$BUILD_DIRECTORY/webkitgtk-$VERSION
WEB_SITE=http://webkitgtk.org/
SECURITY_PATCH=8
- PATCHLEVEL=1
GATHER_DOCS=off
LICENSE[0]=GPL
ENTERED=20071208
diff --git a/http/webkitgtk/HISTORY b/http/webkitgtk/HISTORY
index 174c136..5ba99cd 100644
--- a/http/webkitgtk/HISTORY
+++ b/http/webkitgtk/HISTORY
@@ -1,3 +1,6 @@
+2014-05-16 Pol Vinogradov <vin.public AT gmail.com>
+ * DETAILS: version 2.4.2
+
2014-04-14 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: mesalib => MESALIB

diff --git a/http/webkitgtk3/DETAILS b/http/webkitgtk3/DETAILS
index a8d1e2e..4c300b4 100755
--- a/http/webkitgtk3/DETAILS
+++ b/http/webkitgtk3/DETAILS
@@ -1,12 +1,11 @@
SPELL=webkitgtk3
- VERSION=2.2.4
+ VERSION=2.4.2
SOURCE=webkitgtk-$VERSION.tar.xz
SOURCE_URL[0]=http://www.webkitgtk.org/releases/$SOURCE
-
SOURCE_HASH=sha512:9467abb72dda5839274702ee9173d8d83599196446f80537cf18e9be4b42fb7e23fdeb7d053d87a0143de5b499163d693dd09c4f035a315df78c46d9f7408705
+
SOURCE_HASH=sha512:504eafb65228111b9bf12cadac40906ad8b2885cca60b7020fb04c23b6f0e158ca5ca79ee051cfe0994b176e41021400b8faf8367b00efd72fdef5e5cf5c70e1
SOURCE_DIRECTORY=$BUILD_DIRECTORY/webkitgtk-$VERSION
WEB_SITE=http://webkitgtk.org/
SECURITY_PATCH=8
- PATCHLEVEL=1
GATHER_DOCS=off
LICENSE[0]=GPL
ENTERED=20071208
diff --git a/http/webkitgtk3/HISTORY b/http/webkitgtk3/HISTORY
index 3f05ccc..68624da 100644
--- a/http/webkitgtk3/HISTORY
+++ b/http/webkitgtk3/HISTORY
@@ -1,3 +1,6 @@
+2014-05-16 Pol Vinogradov <vin.public AT gmail.com>
+ * DETAILS: version 2.4.2
+
2014-04-14 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: mesalib => MESALIB

diff --git a/libs/readline/HISTORY b/libs/readline/HISTORY
index 0b16620..0ad5aff 100644
--- a/libs/readline/HISTORY
+++ b/libs/readline/HISTORY
@@ -1,4 +1,7 @@
-2014-04-12 Treevw Jelbert <treeve AT sourcemage.org>
+2014-05-16 Treeve Jelbert <treeve AT sourcemage.org>
+ * INSTAALL: add ldconfig, otherwise next spell fails
+
+2014-04-12 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 6.3

2011-02-15 Ladislav Hagara <hgr AT vabo.cz>
diff --git a/libs/readline/INSTALL b/libs/readline/INSTALL
index a3aaf2b..6a9aca9 100755
--- a/libs/readline/INSTALL
+++ b/libs/readline/INSTALL
@@ -10,4 +10,5 @@ if [[ "$INSTALL_INPUTRC" == y ]]; then
mkdir -p "$INSTALL_ROOT/etc/profile.d" &&
install -vm 755 "$SPELL_DIRECTORY/etc/profile.d/readline.sh" \
"$INSTALL_ROOT/etc/profile.d"
-fi
+fi &&
+ldconfig
diff --git a/shell-term-fm/vifm/BUILD b/shell-term-fm/vifm/BUILD
new file mode 100755
index 0000000..5e4b78e
--- /dev/null
+++ b/shell-term-fm/vifm/BUILD
@@ -0,0 +1,3 @@
+OPTS="$VIFM_OPTS $OPTS" &&
+
+default_build
diff --git a/shell-term-fm/vifm/CONFIGURE b/shell-term-fm/vifm/CONFIGURE
new file mode 100755
index 0000000..ad2f14f
--- /dev/null
+++ b/shell-term-fm/vifm/CONFIGURE
@@ -0,0 +1,3 @@
+config_query_option VIFM_OPTS "Enable remote command sending (insecure)?" n \
+ "--enable-remote-cmds" \
+ "--disable-remote-cmds"
diff --git a/shell-term-fm/vifm/DETAILS b/shell-term-fm/vifm/DETAILS
index e39b807..712f1ea 100755
--- a/shell-term-fm/vifm/DETAILS
+++ b/shell-term-fm/vifm/DETAILS
@@ -1,8 +1,8 @@
SPELL=vifm
- VERSION=0.7.6
+ VERSION=0.7.7
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:8a280d6c4cdef27b34c0865be4a26c5cb98c433a1b01418af230649e6868091fd987c5d75a77b8137fcb44b5c6178e5894f4ccc107d7c8d173146f9b605a45b6
+
SOURCE_HASH=sha512:a95ee365a287c06515c5541ce67e609dacb8b8640f0fec5b33bd3794a8f8445fd8052e5bbd42bda0d23f9c5b5e5591978412bcea0c7ceb6ab403fa271e219455
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://vifm.sourceforge.net/
LICENSE[0]=GPL
diff --git a/shell-term-fm/vifm/HISTORY b/shell-term-fm/vifm/HISTORY
index b80d2dc..41537cc 100644
--- a/shell-term-fm/vifm/HISTORY
+++ b/shell-term-fm/vifm/HISTORY
@@ -1,3 +1,7 @@
+2014-05-17 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.7.7
+ * BUILD, CONFIGURE: added, for additional options
+
2013-11-10 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 0.7.6

diff --git a/utils/iozone/DETAILS b/utils/iozone/DETAILS
index e0b68bd..f64e422 100755
--- a/utils/iozone/DETAILS
+++ b/utils/iozone/DETAILS
@@ -1,9 +1,10 @@
SPELL=iozone
- VERSION=3_397
+ VERSION=3_424
SOURCE="${SPELL}${VERSION}.tar"
SOURCE_URL[0]=http://www.${SPELL}.org/src/current/${SOURCE}
-
SOURCE_HASH=sha512:e154b56735c922173e7cf23344fa0a478982d202b3b831fd605481f69a77295281be121aa57a0164dc12edf5975f231339f6516da5c40906586d48ebacec7c23
+
SOURCE_HASH=sha512:3caad63bd388785983fb5d722c5713edde4131d7f4e2c882cc6578d19953d78f81514609e44da7583cf94290cf33cc76ff5020edf3669f8a017e9f6cc7d6002e
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}${VERSION}"
+ GATHER_DOCS=off
WEB_SITE="http://www.iozone.org/";
LICENSE[0]=GPL
ENTERED=20100723
diff --git a/utils/iozone/HISTORY b/utils/iozone/HISTORY
index 3ed93df..79aa626 100644
--- a/utils/iozone/HISTORY
+++ b/utils/iozone/HISTORY
@@ -1,3 +1,7 @@
+2014-05-16 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 3_424; don't do useless doc'ing
+ * INSTALL: verbosity++; install fileop and pit_server
+
2011-05-20 Sukneet Basuta <sukneet AT sourcemage.org>
* DETAILS: updated spell to 3_397

diff --git a/utils/iozone/INSTALL b/utils/iozone/INSTALL
index c7b5003..cc37cf9 100755
--- a/utils/iozone/INSTALL
+++ b/utils/iozone/INSTALL
@@ -1,4 +1,4 @@
cd ${SOURCE_DIRECTORY}/src/current &&
-install -m755 iozone ${INSTALL_ROOT}/usr/bin &&
+install -vm755 iozone fileop pit_server ${INSTALL_ROOT}/usr/bin &&
cd ${SOURCE_DIRECTORY}/docs &&
-install -m644 iozone.1 ${INSTALL_ROOT}/usr/share/man/man1
+install -vm644 iozone.1 ${INSTALL_ROOT}/usr/share/man/man1
diff --git a/x11-libs/wine/DETAILS b/x11-libs/wine/DETAILS
index 2555e4a..b114282 100755
--- a/x11-libs/wine/DETAILS
+++ b/x11-libs/wine/DETAILS
@@ -12,7 +12,7 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git"
FORCE_DOWNLOAD=1
else
if [[ $WINE_BRANCH == devel ]]; then
- VERSION=1.7.18
+ VERSION=1.7.19
else
VERSION=1.6.1
fi
diff --git a/x11-libs/wine/HISTORY b/x11-libs/wine/HISTORY
index c5d1d7c..3011505 100644
--- a/x11-libs/wine/HISTORY
+++ b/x11-libs/wine/HISTORY
@@ -1,3 +1,6 @@
+2014-05-17 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.7.19 (devel)
+
2014-05-03 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.7.18 (devel)

diff --git a/xorg-app/xfd/BUILD b/xorg-app/xfd/BUILD
new file mode 100755
index 0000000..a2d47ac
--- /dev/null
+++ b/xorg-app/xfd/BUILD
@@ -0,0 +1 @@
+LIBS+="-lXmu -lXrender" default_build
diff --git a/xorg-app/xfd/DEPENDS b/xorg-app/xfd/DEPENDS
index 201472b..d9a29d6 100755
--- a/xorg-app/xfd/DEPENDS
+++ b/xorg-app/xfd/DEPENDS
@@ -2,4 +2,6 @@ depends util-macros &&
depends -sub XAW7 libxaw &&
depends libxft &&
depends freetype2 &&
-depends fontconfig
+depends fontconfig &&
+depends libxmu &&
+depends libxrender
diff --git a/xorg-app/xfd/HISTORY b/xorg-app/xfd/HISTORY
index acf253c..7569d0f 100644
--- a/xorg-app/xfd/HISTORY
+++ b/xorg-app/xfd/HISTORY
@@ -1,3 +1,6 @@
+2014-05-18 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS, BUILD: add dependencies on libXrender and libXmu
+
2009-01-26 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* DEPENDS: killing of XPrint
* DETAILS: patchlevel++



  • [SM-Commit] GIT changes to devel-xorg-modular grimoire by Treeve Jelbert (7f6985689e02851528b7cbc5d4460814e3acd3ab), Treeve Jelbert, 05/20/2014

Archive powered by MHonArc 2.6.24.

Top of Page