sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to stable-0.61 grimoire by Vlad Glagolev (a8e1f830d278834c9dbc4e14a6631cc495afb081)

From: Vlad Glagolev <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to stable-0.61 grimoire by Vlad Glagolev (a8e1f830d278834c9dbc4e14a6631cc495afb081)
Date: Sun, 9 Sep 2012 12:45:41 -0500

GIT changes to stable-0.61 grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

crypto/seahorse/DEPENDS | 1 +
crypto/seahorse/HISTORY | 3 +++
http/firefox/BUILD | 11 ++++++++++-
http/firefox/DETAILS | 6 +++---
http/firefox/HISTORY | 6 ++++++
http/seamonkey/DETAILS | 6 +++---
http/seamonkey/HISTORY | 4 ++++
http/seamonkey/PRE_BUILD | 1 -
http/seamonkey/ldap.patch | 15 ---------------
lua-forge/lua/BUILD | 4 ++++
lua-forge/lua/DETAILS | 4 ++--
lua-forge/lua/HISTORY | 14 ++++++++++++++
lua-forge/lua/lua.pc | 2 +-
lua-forge/lua/shared.patch | 2 +-
net/wpa_supplicant/HISTORY | 3 +++
net/wpa_supplicant/INSTALL | 6 ++++--
security/fwknop/DETAILS | 3 ++-
security/fwknop/HISTORY | 8 ++++++++
security/fwknop/INSTALL | 11 -----------
security/fwknop/PRE_BUILD | 4 ++--
security/fwknop/command.patch | 14 ++++++++++++++
security/fwknop/digest.patch | 27 +++++++++++++++++++++++++++
22 files changed, 112 insertions(+), 43 deletions(-)

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

fwknop: fixed a bug for command type access message (introduced in 2.0.1)
(cherry picked from commit 0a6efb16f308760828dd47c0059799c68ce979be)

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

fwknop: => 2.0.3 (security)
(cherry picked from commit 6dd0f31d87554572ca3be6d23dd288f48058f825)

commit 11a30f7ae61ac6830765c0eb9e6bece8257ccb54
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

wpa_supplicant: fix qt4/gui switch
(cherry picked from commit db3fe9e22529e8a2bd237d263d581c6b481cda74)

commit 35ebd23ea718192801b3f825816d299105bc208f
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

seahorse: depends on gcr
(cherry picked from commit 863db5ec4dc0570a7e7b7147c5ecc440a4b51e01)

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

lua: dynamically link liblua.so with libdl.so
(cherry picked from commit 744bee0d4a4fe3e851361c535b3d7b0543c6853b)

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

lua: => 5.2.1
(cherry picked from commit 259d54a1d69b83fc2ef9eef8bd496d6dd56a1785)

commit 4dd2164172afd98f3901e87e31999b241b49cc71
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

lua: fix x86_64 check in BUILD
(cherry picked from commit 0955d0d4ab4b8a9129d3c9c6f2ba7dbcd92fc13c)

commit 0775aacb84cde2ead0c8ca6dede773a55b66ae4b
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

lua: if x86_64, force fPIC CFLAG
(cherry picked from commit 46e6e242329849ccdc741bb309bb1154951df9e1)

commit 84a650bf10d59b53f3e06cba44110dd0f331ade9
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

seamonkey 2.12, SECURITY_PATCH=45
(cherry picked from commit 2184f35a31d2a80511cb254979fdaec16b804a3b)

commit bec954fcce6ab6927cdecf9b1aebc83f1e9fe86f
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

firefox 15.0, SECURITY_PATCH=52
(cherry picked from commit 8ea7dbac4c254a3225674a44b2508c3b9cd73341)

commit 107f6e5bf6010ee038438ec786f1ac0a1dea3dc7
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

firefox: Avoid buggy GCC 4.6 AVX code generation
(cherry picked from commit 416645109a3858772005fbdae6c7bd8ec5f9f817)

diff --git a/crypto/seahorse/DEPENDS b/crypto/seahorse/DEPENDS
index 8c4a285..8f22cfc 100755
--- a/crypto/seahorse/DEPENDS
+++ b/crypto/seahorse/DEPENDS
@@ -2,6 +2,7 @@ depends gnupg &&
depends gpgme &&
depends gconf2 &&
depends dbus-glib &&
+depends gcr &&
depends libgnome-keyring &&
depends gnome-doc-utils &&

diff --git a/crypto/seahorse/HISTORY b/crypto/seahorse/HISTORY
index a6b3b73..7973af8 100644
--- a/crypto/seahorse/HISTORY
+++ b/crypto/seahorse/HISTORY
@@ -1,3 +1,6 @@
+2012-08-31 Ismael Luceno <ismael AT sourcemage.org>
+ * DEPENDS: depends on gcr
+
2013-04-03 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 3.4.0

diff --git a/http/firefox/BUILD b/http/firefox/BUILD
index e7cd074..1f2ae04 100755
--- a/http/firefox/BUILD
+++ b/http/firefox/BUILD
@@ -16,7 +16,16 @@ CXXFLAGS="${CXXFLAGS//-O3/-O2}" &&
#
CFLAGS="${CFLAGS//-ffast-math/}" &&
CXXFLAGS="${CXXFLAGS//-ffast-math/}" &&
-
+
+#
+# Avoid buggy GCC 4.6 AVX code generation, which breaks libxul
+#
+local gccver=$(gcc -dumpversion)
+if [ ${gccver%.*} = 4.6 ]; then
+ CFLAGS="${CFLAGS//-mavx} -mno-avx"
+ CXXFLAGS="${CXXFLAGS//-mavx} -mno-avx"
+fi
+
echo ac_add_options --enable-optimize=-O2 >> .mozconfig &&

make_single &&
diff --git a/http/firefox/DETAILS b/http/firefox/DETAILS
index 049209b..8bc5ee3 100755
--- a/http/firefox/DETAILS
+++ b/http/firefox/DETAILS
@@ -1,13 +1,13 @@
SPELL=firefox
if [[ $FIREFOX_CVS == y ]]; then
- VERSION=14.0.1
+ VERSION=15.0
SOURCE=$SPELL-$VERSION.source.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_GPG=firefox.gpg:$SOURCE2:UPSTREAM_KEY

SOURCE_URL[0]=http://releases.mozilla.org/pub/mozilla.org/${SPELL}/releases/${VERSION}/source/${SOURCE}
SOURCE2_URL[0]=$SOURCE_URL.asc
else
- VERSION=14.0.1
+ VERSION=15.0
SOURCE=$SPELL-$VERSION.source.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_GPG=firefox.gpg:$SOURCE2:UPSTREAM_KEY
@@ -15,7 +15,7 @@ else

SOURCE_URL[1]=ftp://ftp.mozilla.org/pub/$SPELL/releases/$VERSION/source/$SOURCE

SOURCE_URL[2]=ftp://ftp.in2p3.fr/pub/mozilla/$SPELL/releases/$VERSION/source/$SOURCE
SOURCE2_URL[0]=$SOURCE_URL.asc
- SECURITY_PATCH=51
+ SECURITY_PATCH=52
fi
SOURCE2_IGNORE=signature
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index 0c87bd4..2924c60 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,9 @@
+2012-08-28 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 15.0, SECURITY_PATCH=52
+
+2012-08-22 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD: Avoid buggy GCC 4.6 AVX code generation
+
2012-07-18 Pol Vinogradov <vin.public AT gmail.com>
* DETAILS: 14.0.1, SECURITY_PATCH=51
* PRE_BUILD, installer.patch: added fix for
diff --git a/http/seamonkey/DETAILS b/http/seamonkey/DETAILS
index 0ae5ed3..33a16e5 100755
--- a/http/seamonkey/DETAILS
+++ b/http/seamonkey/DETAILS
@@ -1,13 +1,13 @@
SPELL=seamonkey
- VERSION=2.11
+ VERSION=2.12
SOURCE=$SPELL-$VERSION.source.tar.bz2
-
SOURCE_HASH=sha512:3ea0db394134e70f7900873f12496b13b9f621519bf0182dc0fb9b6b266d822b913770750e68fba64dcc2b25940799a16dabbb87a3ecf1ce8b19ed409925607d
+
SOURCE_HASH=sha512:8fad273ec6dcb5f506d7126a38649b1cc60711955904a4e1f1be0c6046c9b56c3129f4eaeb0b223de09a6f2c3230f7dbaa36715b9868a5a77a804c9fb55099bb
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URI=seamonkey/releases/$VERSION/source/$SOURCE
SOURCE_URL[0]=ftp://ftp.mozilla.org/pub/mozilla.org/$SOURCE_URI
SOURCE_URL[1]=http://releases.mozilla.org/pub/mozilla.org/$SOURCE_URI
WEB_SITE=http://www.seamonkey-project.org/
- SECURITY_PATCH=44
+ SECURITY_PATCH=45
TMPFS=off
ENTERED=20010922
LICENSE[0]=MPL
diff --git a/http/seamonkey/HISTORY b/http/seamonkey/HISTORY
index 6d97762..f684a89 100644
--- a/http/seamonkey/HISTORY
+++ b/http/seamonkey/HISTORY
@@ -1,3 +1,7 @@
+2012-08-29 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.12, SECURITY_PATCH=45
+ * PRE_BUILD, ldap.patch: patch removed
+
2012-07-18 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.11, SECURITY_PATCH=44

diff --git a/http/seamonkey/PRE_BUILD b/http/seamonkey/PRE_BUILD
index 98d515b..eb06c1e 100755
--- a/http/seamonkey/PRE_BUILD
+++ b/http/seamonkey/PRE_BUILD
@@ -8,5 +8,4 @@ sed -i
's#VPX_CODEC_USE_INPUT_PARTITION#VPX_CODEC_USE_INPUT_FRAGMENTS#' mozilla/
# ignore packaging errors for the libs we have in a system
sedit "/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@" suite/installer/Makefile.in &&

-patch -p0 < "$SPELL_DIRECTORY/ldap.patch" &&
patch -p0 < "$SPELL_DIRECTORY/mailnews.patch"
diff --git a/http/seamonkey/ldap.patch b/http/seamonkey/ldap.patch
deleted file mode 100644
index a4ede55..0000000
--- a/http/seamonkey/ldap.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- bridge/bridge.mk.orig 2011-11-21 14:20:07.000000000 +0400
-+++ bridge/bridge.mk 2011-12-10 03:22:55.578752146 +0400
-@@ -38,10 +38,10 @@
-
- APP_LIBXUL_DIRS += $(DEPTH)$(SUBDIR)/mozilla/xpfe/components/autocomplete
-
--#ifdef MOZ_LDAP_XPCOM
-+ifdef MOZ_LDAP_XPCOM
- APP_LIBXUL_STATICDIRS += $(DEPTH)$(SUBDIR)/ldap/sdks/c-sdk
- APP_LIBXUL_DIRS += $(DEPTH)$(SUBDIR)/ldap/xpcom
--#endif
-+endif
-
- #ifdef MOZ_MORK
- APP_LIBXUL_DIRS += $(DEPTH)$(SUBDIR)/db/mork
diff --git a/lua-forge/lua/BUILD b/lua-forge/lua/BUILD
index 24153e7..a3bd3d7 100755
--- a/lua-forge/lua/BUILD
+++ b/lua-forge/lua/BUILD
@@ -1,3 +1,7 @@
+if [ "${SMGL_COMPAT_ARCHS[1]}" = x86_64 ]; then
+ CFLAGS="${CFLAGS} -fPIC"
+fi &&
+
make CFLAGS="-DLUA_USE_POSIX \
-DLUA_USE_DLOPEN \
-DLUA_COMPAT_MODULE \
diff --git a/lua-forge/lua/DETAILS b/lua-forge/lua/DETAILS
index 43fa479..4234f23 100755
--- a/lua-forge/lua/DETAILS
+++ b/lua-forge/lua/DETAILS
@@ -1,11 +1,11 @@
SPELL=lua
- VERSION=5.2.0
+ VERSION=5.2.1
PATCHLEVEL=1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://www.lua.org/ftp/$SOURCE
SOURCE_URL[1]=http://www.tecgraf.puc-rio.br/lua/mirror/ftp/$SOURCE
-
SOURCE_HASH=sha512:48c4a35323309c983a785a320b9a5058401c8b6cc0a4296ace66ab13ecb435d5274fdbaa28498f232619bda3bdee6eae9d264421406a83e55a418e2a6e95388a
+
SOURCE_HASH=sha512:d0548d2cc2aa4fb4b5ae19d0ff675027370e3ee22d6e1ba448651c6f1f6f5e6b6214c81b760a23954f1e270936248bc021b9594a75191de4c1921e73d1ae48fb
WEB_SITE=http://www.lua.org/
ENTERED=20020309
LICENSE[0]=MIT
diff --git a/lua-forge/lua/HISTORY b/lua-forge/lua/HISTORY
index 4773505..af1f8da 100644
--- a/lua-forge/lua/HISTORY
+++ b/lua-forge/lua/HISTORY
@@ -1,3 +1,17 @@
+2012-09-02 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: PATCHLEVEL=1
+ * shared.patch: link with libdl.so
+
+2012-06-16 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 5.2.1
+ * lua.pc: updated to 5.2.1
+
+2012-05-26 Sukneet Basuta <sukneet AT sourcemage.org>
+ * BUILD: fix x86_64 check
+
+2012-05-25 Sukneet Basuta <sukneet AT sourcemage.org>
+ * BUILD: if x86_64, force fPIC CFLAG
+
2011-12-27 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: PATCHLEVEL=1
* BUILD: added flags for loading DSO, old plugin compatibility
diff --git a/lua-forge/lua/lua.pc b/lua-forge/lua/lua.pc
index 6f55d19..d4113d8 100644
--- a/lua-forge/lua/lua.pc
+++ b/lua-forge/lua/lua.pc
@@ -5,7 +5,7 @@
# grep '^V=' ../Makefile
V= 5.2
# grep '^R=' ../Makefile
-R= 5.2.0
+R= 5.2.1

# grep '^INSTALL_.*=' ../Makefile | sed 's/INSTALL_TOP/prefix/'
prefix= /usr
diff --git a/lua-forge/lua/shared.patch b/lua-forge/lua/shared.patch
index ec6b091..fa07115 100644
--- a/lua-forge/lua/shared.patch
+++ b/lua-forge/lua/shared.patch
@@ -17,7 +17,7 @@
$(CC) -o $@ $(LDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS)

+$(LUA_SO): $(CORE_O) $(LIB_O)
-+ $(CC) -o $@ -shared $(LDFLAGS) $(CORE_O) $(LIB_O)
++ $(CC) -o $@ -shared $(LDFLAGS) $(CORE_O) $(LIB_O) -ldl
+
clean:
$(RM) $(ALL_T) $(ALL_O)
diff --git a/net/wpa_supplicant/HISTORY b/net/wpa_supplicant/HISTORY
index 0913401..9abd8cf 100644
--- a/net/wpa_supplicant/HISTORY
+++ b/net/wpa_supplicant/HISTORY
@@ -1,3 +1,6 @@
+2012-05-20 Thomas Orgis <sobukus AT sourcemage.org>
+ * INSTALL: qt4 is the switch for wpa_gui
+
2011-10-10 Bor Kraljič <pyrobor AT ver.si>
* DEPENDS: removed optional dependency on qt-x11

diff --git a/net/wpa_supplicant/INSTALL b/net/wpa_supplicant/INSTALL
index 07cd6b7..bde3a13 100755
--- a/net/wpa_supplicant/INSTALL
+++ b/net/wpa_supplicant/INSTALL
@@ -1,3 +1,5 @@
+cd "$SOURCE_DIRECTORY/wpa_supplicant" &&
+
make DESTDIR="$INSTALL_ROOT" install &&

install -vm 644 doc/docbook/*.8 "$INSTALL_ROOT/usr/share/man/man8" &&
@@ -6,8 +8,8 @@ install -vm 644 doc/docbook/*.5
"$INSTALL_ROOT/usr/share/man/man5" &&
install -vm 755 -d "$INSTALL_ROOT/usr/share/doc/wpa_supplicant" &&
install -vm 644 wpa_supplicant.conf
"$INSTALL_ROOT/usr/share/doc/wpa_supplicant" &&

-if is_depends_enabled $SPELL qt-x11; then
- install -vm 755 wpa_gui/wpa_gui "$INSTALL_ROOT/usr/sbin"
+if is_depends_enabled $SPELL qt4; then
+ install -vm 755 wpa_gui-qt4/wpa_gui "$INSTALL_ROOT/usr/sbin"
fi &&

if is_depends_enabled $SPELL dbus; then
diff --git a/security/fwknop/DETAILS b/security/fwknop/DETAILS
index 6f226e9..14eda1c 100755
--- a/security/fwknop/DETAILS
+++ b/security/fwknop/DETAILS
@@ -1,5 +1,6 @@
SPELL=fwknop
- VERSION=2.0
+ VERSION=2.0.3
+ SECURITY_PATCH=1
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_URL[0]=http://www.cipherdyne.org/fwknop/download/$SOURCE
diff --git a/security/fwknop/HISTORY b/security/fwknop/HISTORY
index dd7ad08..4305df7 100644
--- a/security/fwknop/HISTORY
+++ b/security/fwknop/HISTORY
@@ -1,3 +1,11 @@
+2012-09-08 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.0.3; SECURITY_PATCH++
+ * INSTALL: dropped, fixed by upstream
+ * PRE_BUILD: apply the patches
+ * command.patch: added, to fix a bug for command type access message
+ (introduced in 2.0.1)
+ * digest.patch: added, to fix compilation with no file cache
+
2012-04-27 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 2.0; updated short desc
* DEPENDS: perl is no more -- as of version 2, fwknop has been fully
diff --git a/security/fwknop/INSTALL b/security/fwknop/INSTALL
deleted file mode 100755
index 8e6319e..0000000
--- a/security/fwknop/INSTALL
+++ /dev/null
@@ -1,11 +0,0 @@
-default_install &&
-
-if list_find "$FWKNOP_OPTS" "--enable-server"; then
- install -vm 755 -d "$INSTALL_ROOT/etc/fwknop" &&
-
- install_config_file "$SOURCE_DIRECTORY/server/access.conf" \
- "$INSTALL_ROOT/etc/fwknop/access.conf" &&
-
- install_config_file "$SOURCE_DIRECTORY/server/fwknopd.conf" \
- "$INSTALL_ROOT/etc/fwknop/fwknopd.conf"
-fi
diff --git a/security/fwknop/PRE_BUILD b/security/fwknop/PRE_BUILD
index 2f7639a..a2c62d7 100755
--- a/security/fwknop/PRE_BUILD
+++ b/security/fwknop/PRE_BUILD
@@ -1,5 +1,5 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

-# don't trash fwknopd configs (without castfs)
-sed -i "s:install-dist_fwknopdDATA install-man:install-man:"
server/Makefile.in
+patch -p0 < "$SPELL_DIRECTORY/command.patch" &&
+patch -p0 < "$SPELL_DIRECTORY/digest.patch"
diff --git a/security/fwknop/command.patch b/security/fwknop/command.patch
new file mode 100644
index 0000000..640a7fe
--- /dev/null
+++ b/security/fwknop/command.patch
@@ -0,0 +1,14 @@
+--- lib/fko_decode.c.orig Wed Sep 5 06:04:48 2012
++++ lib/fko_decode.c Sat Sep 8 15:11:00 2012
+@@ -285,9 +285,9 @@ fko_decode_spa_data(fko_ctx_t ctx)
+
+ b64_decode(tbuf, (unsigned char*)ctx->message);
+
+- /* Require a message similar to: 1.2.3.4,tcp/22
++ /* Require a message similar to: 1.2.3.4,tcp/22 (if it's not command
message)
+ */
+- if(validate_access_msg(ctx->message) != FKO_SUCCESS)
++ if(ctx->message_type != FKO_COMMAND_MSG &&
validate_access_msg(ctx->message) != FKO_SUCCESS)
+ {
+ free(tbuf);
+ return(FKO_ERROR_INVALID_DATA);
diff --git a/security/fwknop/digest.patch b/security/fwknop/digest.patch
new file mode 100644
index 0000000..04e1a0c
--- /dev/null
+++ b/security/fwknop/digest.patch
@@ -0,0 +1,27 @@
+--- server/replay_cache.c.orig Wed Sep 5 06:04:48 2012
++++ server/replay_cache.c Sat Sep 8 09:46:56 2012
+@@ -565,7 +565,6 @@ is_replay_dbm_cache(fko_srv_options_t *opts, char *dig
+ #endif
+ datum db_key, db_ent;
+
+- char *digest = NULL;
+ int digest_len, res = SPA_MSG_SUCCESS;
+
+ digest_cache_info_t dc_info;
+@@ -638,7 +637,6 @@ add_replay_dbm_cache(fko_srv_options_t *opts, char *di
+ #endif
+ datum db_key, db_ent;
+
+- char *digest = NULL;
+ int digest_len, res = SPA_MSG_SUCCESS;
+
+ digest_cache_info_t dc_info;
+@@ -705,7 +703,7 @@ add_replay_dbm_cache(fko_srv_options_t *opts, char *di
+
+ return(res);
+ #endif /* NO_DIGEST_CACHE */
+-
++}
+ #endif /* USE_FILE_CACHE */
+
+ #if USE_FILE_CACHE

[SM-Commit] GIT changes to stable-0.61 grimoire by Vlad Glagolev (a8e1f830d278834c9dbc4e14a6631cc495afb081), Vlad Glagolev, 09/09/2012