[csw-devel] SF.net SVN: gar:[19000] csw/mgar/pkg/texlive/trunk

[pfelecan at users.sourceforge.net]

Revision: 19000
          http://gar.svn.sourceforge.net/gar/?rev=19000&view=rev
Author:   pfelecan
Date:     2012-08-17 14:24:22 +0000 (Fri, 17 Aug 2012)
Log Message:
-----------
texlive/trunk:
- fully packaged
- monolithic package, i.e., not splitted in sub-packages
- not ready for release

Modified Paths:
--------------
    csw/mgar/pkg/texlive/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/texlive/trunk/files/0001-Fix-lacheck-buffer-overflow.patch

Modified: csw/mgar/pkg/texlive/trunk/Makefile
===================================================================
--- csw/mgar/pkg/texlive/trunk/Makefile	2012-08-17 13:52:32 UTC (rev 18999)
+++ csw/mgar/pkg/texlive/trunk/Makefile	2012-08-17 14:24:22 UTC (rev 19000)
@@ -21,9 +21,8 @@
 DISTNAME		=	$(DISTNAMEPREFIX)-source
 DISTFILES		=	$(DISTNAME).tar.xz
 DISTFILES		+=	$(DISTNAMEPREFIX)-extra.tar.xz
-NOEXTRACT		+=	$(DISTNAMEPREFIX)-extra.tar.xz
 DISTFILES		+=	$(DISTNAMEPREFIX)-texmf.tar.xz
-NOEXTRACT		+=	$(DISTNAMEPREFIX)-texmf.tar.xz
+PATCHFILES		+=	0001-Fix-lacheck-buffer-overflow.patch
 
 BUILD_DEP_PKGS	+=	CSWpoppler-dev
 BUILD_DEP_PKGS	+=	CSWpoppler-dev
@@ -32,6 +31,8 @@
 EXTRA_CFLAGS	+=	-std=gnu99 -D_XPG6
 EXTRA_CXXFLAGS	+=	-D_XPG6
 
+STRIP_LIBTOOL	=	1
+
 GARCOMPILER		=	GNU
 
 # must be a absolute path name if we don't want to have the object
@@ -69,23 +70,40 @@
 CONFIGURE_ARGS	+=	--with-x
 CONFIGURE_ARGS	+=	--with-xdvi-x-toolkit=xaw
 
-TEST_SCRIPTS	=	custom
-
 RUNTIME_DEP_PKGS	+=	CSWps2eps
 
+# EXTRA_MERGE_EXCLUDE_FILES	+=	
+
 include gar/category.mk
 
 PATH := /opt/csw/gnu:/opt/csw/libexec/flex-2.5.35/bin:$(PATH)
 
+# we build in a directory outside the source tree and gather the
+# licenses from the extra archive into one file:
 pre-configure-modulated:
 	mkdir -p $(OBJDIR)
+	cat $(WORKDIR)/$(DISTNAMEPREFIX)-extra/LICENSE.TL $(WORKDIR)/$(DISTNAMEPREFIX)-extra/LICENSE.CTAN > $(WORKSRC)/COPYING
 	$(MAKECOOKIE)
 
-# this is needed only because the lacheck test fails:
-test-custom:
-	cd $(WORKSRC) && /usr/bin/env -i $(BUILD_ENV) && $(MAKE) -i -k -C $(OBJDIR) check
+# this is necessary to link texk/ptexenc (libtool --mode=install) when
+# the kpathsea from teTeX is installed on the build system; this will
+# probably go away when teTeX is decommissioned.
+pre-install-modulated:
+	cd $(OBJDIR)/texk/ptexenc && gsed --in-place --expression='s;-L/opt/csw/lib;;g' libptexenc.la
 	$(MAKECOOKIE)
 
+post-install-modulated: xdup = --exclude=texmf/doc/xindy/alphabets-doc.pdf
+post-install-modulated: xdup += --exclude=texmf/doc/xindy/tex2xindy.pdf
+post-install-modulated: xdup += --exclude=texmf/doc/xindy/texindy.pdf
+post-install-modulated: xdup += --exclude=texmf/doc/xindy/xindy.pdf
+post-install-modulated: xdup += --exclude=texmf/dvipdfmx/dvipdfmx.cfg
+post-install-modulated: xdup += --exclude=texmf/xindy/modules/tex/inputenc/cp1250.xdy
+post-install-modulated: xdup += --exclude=texmf/xindy/modules/tex/inputenc/cp437.xdy
+post-install-modulated: xdup += --exclude=texmf/xindy/modules/tex/inputenc/cp850.xdy
+post-install-modulated:
+	gtar --directory=$(WORKDIR)/$(DISTNAMEPREFIX)-texmf --create $(xdup) --file=- . | gtar --directory=$(DESTDIR)/$(datadir) --extract --file=-
+	$(MAKECOOKIE)
+
 # this is private and not available publicly
 mydependencies:
 	for package in $(PACKAGES); do echo '___' $${package}; $(HOME)/bin/ocswdeplist --depth 1 --dependencies --packaging --csw --prototype $(HOME)/opencsw/$(NAME)/trunk/work/build-global/$${package}.prototype --target $(HOME)/opencsw/$(NAME)/trunk/work/pkgroot; done

Added: csw/mgar/pkg/texlive/trunk/files/0001-Fix-lacheck-buffer-overflow.patch
===================================================================
--- csw/mgar/pkg/texlive/trunk/files/0001-Fix-lacheck-buffer-overflow.patch	                        (rev 0)
+++ csw/mgar/pkg/texlive/trunk/files/0001-Fix-lacheck-buffer-overflow.patch	2012-08-17 14:24:22 UTC (rev 19000)
@@ -0,0 +1,58 @@
+From 6338bcdc8945730395760d207de6517161b19ef9 Mon Sep 17 00:00:00 2001
+From: Peter Felecan <pfelecan at opencsw.org>
+Date: Thu, 16 Aug 2012 11:16:01 +0200
+Subject: [PATCH] Fix lacheck buffer overflow
+
+The check target fails when the directory structure make the test
+source path too long.
+---
+ texk/lacheck/lacheck-1.26/lacheck.l | 3 ++-
+ texk/lacheck/lacheck.c              | 4 ++--
+ 2 files changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/texk/lacheck/lacheck-1.26/lacheck.l b/texk/lacheck/lacheck-1.26/lacheck.l
+index b6fd1ba..f3cd993 100644
+--- a/texk/lacheck/lacheck-1.26/lacheck.l
++++ b/texk/lacheck/lacheck-1.26/lacheck.l
+@@ -117,6 +117,7 @@
+ 
+ #include <stdio.h>
+ #include <string.h>
++#include <limits.h>
+ 
+ #if defined(WIN32) && !defined(__MINGW32__)
+ #include <win32lib.h>
+@@ -155,7 +156,7 @@ int check_top_level_end(char *end_command, int type);
+ 
+   /* global variables */
+ 
+-char returnval[100];
++char returnval[PATH_MAX + 1];
+ int line_count = 1;
+ int warn_count = 0;
+ char *file_name;
+diff --git a/texk/lacheck/lacheck.c b/texk/lacheck/lacheck.c
+index e08abeb..affed80 100644
+--- a/texk/lacheck/lacheck.c
++++ b/texk/lacheck/lacheck.c
+@@ -20,7 +20,7 @@
+ #include <string.h>
+ #include <errno.h>
+ #include <stdlib.h>
+-
++#include <limits.h>
+ /* end standard C headers. */
+ 
+ /* flex integer type definitions */
+@@ -2131,7 +2131,7 @@ int check_top_level_end(char *end_command, int type);
+ 
+   /* global variables */
+ 
+-char returnval[100];
++char returnval[PATH_MAX + 1];
+ int line_count = 1;
+ int warn_count = 0;
+ char *file_name;
+-- 
+1.7.11.3
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.