external_deps.lst | 7 +++----
more_fonts/fonts/ttf_gentium/makefile.mk | 8 ++++----
more_fonts/prj/d.lst | 4 ++--
sal/osl/unx/pipe.c | 16 +++++++---------
4 files changed, 16 insertions(+), 19 deletions(-)
New commits:
commit 6a5f06057202eaeeee1f9a9aa2f3a35f087b28f3
Author: Don Lewis <truck...@apache.org>
Date: Fri Sep 2 07:31:31 2016 +0000
Update Gentium font.
Patch-by: Pedro Giffuni <p...@apache.org>
diff --git a/external_deps.lst b/external_deps.lst
index 8012615..3e4fe10 100644
--- a/external_deps.lst
+++ b/external_deps.lst
@@ -287,10 +287,9 @@ if (WITH_CATB_FONTS==YES)
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
if (WITH_CATB_FONTS == YES)
- MD5 = 35efabc239af896dfb79be7ebdd6e6b9
- name = gentiumbasic-fonts-1.10.zip
- # This seems to be the original host, but the MD5 sum does not match.
- # URL1 =
http://scripts.sil.org/cms/scripts/render_download.php?format=file&media_id=GentiumBasic_110&filename=GentiumBasic_110.zip
+ MD5 = 1725634df4bb3dcb1b2c91a6175f8789
+ name = GentiumBasic_1102.zip
+ URL1 = http://software.sil.org/downloads/gentium/GentiumBasic_1102.zip
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
if (ENABLE_CATEGORY_B==YES && SYSTEM_HYPH!=YES)
diff --git a/more_fonts/fonts/ttf_gentium/makefile.mk
b/more_fonts/fonts/ttf_gentium/makefile.mk
index 0178d46..970e986 100644
--- a/more_fonts/fonts/ttf_gentium/makefile.mk
+++ b/more_fonts/fonts/ttf_gentium/makefile.mk
@@ -39,9 +39,9 @@ TARGET=ttf_gentium
# --- Files --------------------------------------------------------
-TARFILE_NAME=gentiumbasic-fonts-1.10
-TARFILE_MD5=35efabc239af896dfb79be7ebdd6e6b9
-TARFILE_ROOTDIR=gentiumbasic-fonts-1.10
+TARFILE_NAME=GentiumBasic_1102
+TARFILE_MD5=1725634df4bb3dcb1b2c91a6175f8789
+TARFILE_ROOTDIR=GentiumBasic_1102
PATCH_FILES=
@@ -62,4 +62,4 @@ BUILD_FLAGS=
.INCLUDE : tg_ext.mk
.ENDIF
-.ENDIF
\ No newline at end of file
+.ENDIF
diff --git a/more_fonts/prj/d.lst b/more_fonts/prj/d.lst
index 1bb7e3d..0a2ba3b 100644
--- a/more_fonts/prj/d.lst
+++ b/more_fonts/prj/d.lst
@@ -6,5 +6,5 @@ mkdir: %COMMON_DEST%\pck%_EXT%
..\%__SRC%\misc\build\croscorefonts-1.31.0\*.ttf
%COMMON_DEST%\pck%_EXT%\*.ttf
..\%__SRC%\misc\build\crosextrafonts-20130214\*.ttf
%COMMON_DEST%\pck%_EXT%\*.ttf
..\%__SRC%\misc\build\crosextrafonts-carlito-20130920\*.ttf
%COMMON_DEST%\pck%_EXT%\*.ttf
-..\%__SRC%\misc\build\gentiumbasic-fonts-1.10\*.ttf
%COMMON_DEST%\pck%_EXT%\*.ttf
-..\%__SRC%\misc\build\gentiumbasic-fonts-1.10\OFL.txt
%COMMON_DEST%\pck%_EXT%\LICENSE_gentium
+..\%__SRC%\misc\build\GentiumBasic_1102\*.ttf
%COMMON_DEST%\pck%_EXT%\*.ttf
+..\%__SRC%\misc\build\GentiumBasic_1102\OFL.txt
%COMMON_DEST%\pck%_EXT%\LICENSE_gentium
commit f717de8ec6762949fd4cd7bfc4a761f9fe70e923
Author: Don Lewis <truck...@apache.org>
Date: Fri Sep 2 07:14:17 2016 +0000
Fix improper usage of strncat() and snprintf(). Flagged by -Wstrncat-size
compiler warning from clang.
diff --git a/sal/osl/unx/pipe.c b/sal/osl/unx/pipe.c
index d1db9ce..eb48dae 100644
--- a/sal/osl/unx/pipe.c
+++ b/sal/osl/unx/pipe.c
@@ -35,8 +35,8 @@
#define PIPEDEFAULTPATH "/tmp"
#define PIPEALTERNATEPATH "/var/tmp"
-#define PIPENAMEMASK "OSL_PIPE_%s"
-#define SECPIPENAMEMASK "OSL_PIPE_%s_%s"
+#define PIPENAMEMASK "%s/OSL_PIPE_%s"
+#define SECPIPENAMEMASK "%s/OSL_PIPE_%s_%s"
sal_Bool SAL_CALL osl_psz_getUserIdent(oslSecurity Security, sal_Char
*pszIdent, sal_uInt32 nMax);
oslPipe SAL_CALL osl_psz_createPipe(const sal_Char *pszPipeName,
oslPipeOptions Options, oslSecurity Security);
@@ -166,20 +166,18 @@ oslPipe SAL_CALL osl_psz_createPipe(const sal_Char
*pszPipeName, oslPipeOptions
struct sockaddr_un addr;
sal_Char name[PATH_MAX + 1];
+ const sal_Char *pPath;
oslPipe pPipe;
if (access(PIPEDEFAULTPATH, R_OK|W_OK) == 0)
{
- strncpy(name, PIPEDEFAULTPATH, sizeof(name));
+ pPath = PIPEDEFAULTPATH;
}
else
{
- strncpy(name, PIPEALTERNATEPATH, sizeof(name));
+ pPath = PIPEALTERNATEPATH;
}
-
- strncat(name, "/", sizeof(name));
-
if (Security)
{
sal_Char Ident[256];
@@ -188,11 +186,11 @@ oslPipe SAL_CALL osl_psz_createPipe(const sal_Char
*pszPipeName, oslPipeOptions
OSL_VERIFY(osl_psz_getUserIdent(Security, Ident, sizeof(Ident)));
- snprintf(&name[strlen(name)], sizeof(name), SECPIPENAMEMASK, Ident,
pszPipeName);
+ snprintf(name, sizeof(name), SECPIPENAMEMASK, pPath, Ident,
pszPipeName);
}
else
{
- snprintf(&name[strlen(name)], sizeof(name), PIPENAMEMASK, pszPipeName);
+ snprintf(name, sizeof(name), PIPENAMEMASK, pPath, pszPipeName);
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
