modify spec
This commit is contained in:
daidai_is_here
parent
4e39096c94
commit
e770c49cb5
@ -1,40 +0,0 @@
|
||||
diff -up source/texk/kpathsea/texmf.cnf.fixme source/texk/kpathsea/texmf.cnf
|
||||
--- source/texk/kpathsea/texmf.cnf.fixme 2016-10-19 15:35:25.804218872 -0400
|
||||
+++ source/texk/kpathsea/texmf.cnf 2016-10-19 15:37:19.308035612 -0400
|
||||
@@ -491,17 +491,17 @@ RUBYINPUTS = .;$TEXMF/scripts/{$progna
|
||||
%
|
||||
TEXMFCNF = {\
|
||||
$SELFAUTOLOC,\
|
||||
-$SELFAUTOLOC/share/texmf-local/web2c,\
|
||||
-$SELFAUTOLOC/share/texmf-dist/web2c,\
|
||||
-$SELFAUTOLOC/share/texmf/web2c,\
|
||||
+$SELFAUTOLOC/share/texlive/texmf-local/web2c,\
|
||||
+$SELFAUTOLOC/share/texlive/texmf-dist/web2c,\
|
||||
+$SELFAUTOLOC/share/texlive/texmf/web2c,\
|
||||
$SELFAUTOLOC/texmf-local/web2c,\
|
||||
$SELFAUTOLOC/texmf-dist/web2c,\
|
||||
$SELFAUTOLOC/texmf/web2c,\
|
||||
\
|
||||
$SELFAUTODIR,\
|
||||
-$SELFAUTODIR/share/texmf-local/web2c,\
|
||||
-$SELFAUTODIR/share/texmf-dist/web2c,\
|
||||
-$SELFAUTODIR/share/texmf/web2c,\
|
||||
+$SELFAUTODIR/share/texlive/texmf-local/web2c,\
|
||||
+$SELFAUTODIR/share/texlive/texmf-dist/web2c,\
|
||||
+$SELFAUTODIR/share/texlive/texmf/web2c,\
|
||||
$SELFAUTODIR/texmf-local/web2c,\
|
||||
$SELFAUTODIR/texmf-dist/web2c,\
|
||||
$SELFAUTODIR/texmf/web2c,\
|
||||
@@ -509,9 +509,9 @@ $SELFAUTODIR/texmf/web2c,\
|
||||
$SELFAUTOGRANDPARENT/texmf-local/web2c,\
|
||||
$SELFAUTOPARENT,\
|
||||
\
|
||||
-$SELFAUTOPARENT/share/texmf-local/web2c,\
|
||||
-$SELFAUTOPARENT/share/texmf-dist/web2c,\
|
||||
-$SELFAUTOPARENT/share/texmf/web2c,\
|
||||
+$SELFAUTOPARENT/share/texlive/texmf-local/web2c,\
|
||||
+$SELFAUTOPARENT/share/texlive/texmf-dist/web2c,\
|
||||
+$SELFAUTOPARENT/share/texlive/texmf/web2c,\
|
||||
$SELFAUTOPARENT/texmf-local/web2c,\
|
||||
$SELFAUTOPARENT/texmf-dist/web2c,\
|
||||
$SELFAUTOPARENT/texmf/web2c\
|
||||
@ -1,41 +0,0 @@
|
||||
diff -up source/texk/kpathsea/mktexlsr.than source/texk/kpathsea/mktexlsr
|
||||
--- source/texk/kpathsea/mktexlsr.than 2015-07-28 21:31:52.595540260 -0400
|
||||
+++ source/texk/kpathsea/mktexlsr 2015-07-28 21:32:12.347422108 -0400
|
||||
@@ -217,7 +217,8 @@ for TEXMFLS_R in "$@"; do
|
||||
until PERMS=`kpsestat = "$db_file"`; do sleep 1; done
|
||||
chmod $PERMS "$db_file_tmp"
|
||||
rm -f "$db_file"
|
||||
- mv "$db_file_tmp" "$db_file"
|
||||
+ # selinux fix
|
||||
+ cp "$db_file_tmp" "$db_file"
|
||||
rm -rf "$db_dir_tmp"
|
||||
done
|
||||
|
||||
diff -up source/texk/texlive/linked_scripts/texlive/fmtutil.pl.orig source/texk/texlive/linked_scripts/texlive/fmtutil.pl
|
||||
--- source/texk/texlive/linked_scripts/texlive/fmtutil.pl.orig 2016-06-22 10:58:50.754708661 -0400
|
||||
+++ source/texk/texlive/linked_scripts/texlive/fmtutil.pl 2016-06-22 11:00:32.566943691 -0400
|
||||
@@ -679,7 +679,7 @@ sub rebuild_one_format {
|
||||
}
|
||||
TeXLive::TLUtils::mkdirhier($fulldestdir);
|
||||
|
||||
- if (!File::Copy::move( "$fmt.log", "$fulldestdir/$fmt.log")) {
|
||||
+ if (!File::Copy::copy( "$fmt.log", "$fulldestdir/$fmt.log")) {
|
||||
print_deferred_error("Cannot move $fmt.log to $fulldestdir.\n");
|
||||
}
|
||||
if ($opts{'recorder'}) {
|
||||
@@ -687,13 +687,13 @@ sub rebuild_one_format {
|
||||
# package dependencies for each format. Unfortunately omega-based
|
||||
# engines gratuitiously changed the extension from .fls to .ofl.
|
||||
my $recfile = $fmt . ($fmt =~ m/^(aleph|lamed)$/ ? ".ofl" : ".fls");
|
||||
- if (!File::Copy::move( $recfile, "$fulldestdir/$recfile")) {
|
||||
+ if (!File::Copy::copy( $recfile, "$fulldestdir/$recfile")) {
|
||||
print_deferred_error("Cannot move $recfile to $fulldestdir.\n");
|
||||
}
|
||||
}
|
||||
|
||||
my $destfile = "$fulldestdir/$fmtfile";
|
||||
- if (File::Copy::move( $fmtfile, $destfile )) {
|
||||
+ if (File::Copy::copy( $fmtfile, $destfile )) {
|
||||
print_info("$destfile installed.\n");
|
||||
#
|
||||
# original fmtutil.sh did some magic trick for mplib-luatex.mem
|
||||
@ -1,12 +0,0 @@
|
||||
diff -up source/texk/kpathsea/mktexlsr.than source/texk/kpathsea/mktexlsr
|
||||
--- source/texk/kpathsea/mktexlsr.than 2015-04-29 16:52:42.800897655 +0200
|
||||
+++ source/texk/kpathsea/mktexlsr 2015-04-29 16:53:12.500695909 +0200
|
||||
@@ -66,7 +66,7 @@ if tty -s; then verbose=true; else verbo
|
||||
dry_run=false
|
||||
trees=
|
||||
|
||||
-treefile="${TMPDIR-/tmp}/mktexlsrtrees$$.tmp"
|
||||
+treefile=`mktemp -q --tmpdir mktexlsrtrees.XXXXXXXXXX`
|
||||
trap 'cd /; rm -f $treefile; test -z "$db_dir_tmp" || rm -rf "$db_dir_tmp";
|
||||
exit' 0 1 2 3 7 13 15
|
||||
|
||||
@ -1,16 +0,0 @@
|
||||
diff -up source/m4/kpse-teckit-flags.m4.fix source/m4/kpse-teckit-flags.m4
|
||||
--- source/m4/kpse-teckit-flags.m4.fix 2015-07-28 21:46:52.411157717 -0400
|
||||
+++ source/m4/kpse-teckit-flags.m4 2015-07-28 21:47:03.570090966 -0400
|
||||
@@ -20,9 +20,8 @@ _KPSE_LIB_FLAGS([teckit], [TECkit], [],
|
||||
|
||||
# KPSE_TECKIT_OPTIONS([WITH-SYSTEM])
|
||||
# ----------------------------------
|
||||
-AC_DEFUN([KPSE_TECKIT_OPTIONS], [_KPSE_LIB_OPTIONS([teckit], [$1], [pkg-config])])
|
||||
+AC_DEFUN([KPSE_TECKIT_OPTIONS], [_KPSE_LIB_OPTIONS([teckit], [$1])])
|
||||
|
||||
# KPSE_TECKIT_SYSTEM_FLAGS
|
||||
-# -------------------------
|
||||
-AC_DEFUN([KPSE_TECKIT_SYSTEM_FLAGS], [dnl
|
||||
-_KPSE_PKG_CONFIG_FLAGS([teckit], [teckit])])
|
||||
+# ------------------------
|
||||
+AC_DEFUN([KPSE_TECKIT_SYSTEM_FLAGS], [_KPSE_LIB_FLAGS_SYSTEM([teckit], [TECkit])])
|
||||
@ -1,20 +0,0 @@
|
||||
diff -U0 texlive-2016/source/texk/kpathsea/ChangeLog.than texlive-2016/source/texk/kpathsea/ChangeLog
|
||||
--- texlive-2016/source/texk/kpathsea/ChangeLog.than 2017-03-07 17:36:09.052243607 +0100
|
||||
+++ texlive-2016/source/texk/kpathsea/ChangeLog 2017-03-07 17:36:55.525484239 +0100
|
||||
@@ -0,0 +1,5 @@
|
||||
+2016-11-30 Karl Berry <karl@ks.tug.org>
|
||||
+
|
||||
+ * texmf.cnf (shell_escape_commands): remove mpost, due to
|
||||
+ the -tex option. Oops! Report from Bruno Le Floch.
|
||||
+
|
||||
diff -up texlive-2016/source/texk/kpathsea/texmf.cnf.than texlive-2016/source/texk/kpathsea/texmf.cnf
|
||||
--- texlive-2016/source/texk/kpathsea/texmf.cnf.than 2017-03-07 17:37:14.160778751 +0100
|
||||
+++ texlive-2016/source/texk/kpathsea/texmf.cnf 2017-03-07 17:37:39.688812317 +0100
|
||||
@@ -568,7 +568,6 @@ extractbb,\
|
||||
gregorio,\
|
||||
kpsewhich,\
|
||||
makeindex,\
|
||||
-mpost,\
|
||||
repstopdf,\
|
||||
|
||||
% we'd like to allow:
|
||||
12251
texlive.spec
12251
texlive.spec
File diff suppressed because it is too large
Load Diff
192
tl-format.patch
192
tl-format.patch
@ -1,192 +0,0 @@
|
||||
diff -up source/texk/dvi2tty/dvi2tty-5.3.4/DVI.format source/texk/dvi2tty/dvi2tty-5.3.4/DVI
|
||||
diff -up source/texk/dvidvi/dvidvi.c.format source/texk/dvidvi/dvidvi.c
|
||||
--- source/texk/dvidvi/dvidvi.c.format 2015-07-28 21:21:51.170212574 -0400
|
||||
+++ source/texk/dvidvi/dvidvi.c 2015-07-28 21:22:27.842988620 -0400
|
||||
@@ -327,7 +327,7 @@ static void stringdvibuf(integer p, inte
|
||||
* Print a usage error messsage, and quit.
|
||||
*/
|
||||
static void usage(void) {
|
||||
- (void)fprintf(stderr,banner);
|
||||
+ (void)fprintf(stderr,"%s",banner);
|
||||
(void)fprintf(stderr,"Usage: dvidvi [options] input[.dvi] [output]\n");
|
||||
(void)fprintf(stderr,"where options are:\n");
|
||||
(void)fprintf(stderr," [-f n] first page printed [-l n] last page printed\n");
|
||||
@@ -806,7 +806,7 @@ default:
|
||||
} /* else argument with '-' */
|
||||
} /* for */
|
||||
if (*iname == 0) {
|
||||
- (void)fprintf(stderr, banner) ;
|
||||
+ (void)fprintf(stderr, "%s", banner) ;
|
||||
error("! no input file specified");
|
||||
}
|
||||
/* Inserted by djc@dsmail.hmi.de 3.8.1994 */
|
||||
@@ -817,7 +817,7 @@ default:
|
||||
}
|
||||
|
||||
if (*oname != 0 && !quiet) {
|
||||
- (void)fprintf(stderr, banner) ;
|
||||
+ (void)fprintf(stderr, "%s", banner) ;
|
||||
(void)fprintf(stderr, "%s -> %s\n",iname,oname);
|
||||
temp = nextstring ;
|
||||
}
|
||||
diff -up source/texk/ps2pk/objects.h.format source/texk/ps2pk/objects.h
|
||||
--- source/texk/ps2pk/objects.h.format 2015-07-28 21:24:03.356405337 -0400
|
||||
+++ source/texk/ps2pk/objects.h 2015-07-28 21:24:21.397295166 -0400
|
||||
@@ -231,7 +231,7 @@ struct xobject {
|
||||
/*SHARED*/
|
||||
/* NDW: personally, I want to see status and error messages! */
|
||||
#define IfTrace0(condition,model) \
|
||||
- {if (condition) printf(model);}
|
||||
+ {if (condition) printf("%s",model);}
|
||||
#define IfTrace1(condition,model,arg0) \
|
||||
{if (condition) printf(model,arg0);}
|
||||
#define IfTrace2(condition,model,arg0,arg1) \
|
||||
diff -up source/texk/web2c/cwebboot.cin.format source/texk/web2c/cwebboot.cin
|
||||
--- source/texk/web2c/cwebboot.cin.format 2015-07-28 21:24:28.351252699 -0400
|
||||
+++ source/texk/web2c/cwebboot.cin 2015-07-28 21:24:48.779127949 -0400
|
||||
@@ -1098,7 +1098,7 @@ void
|
||||
fatal(const char*s,const char*t)
|
||||
#line 1182 "cwebdir/common.w"
|
||||
{
|
||||
-if(*s)printf(s);
|
||||
+if(*s)printf("%s",s);
|
||||
err_print(t);
|
||||
history= fatal_message;exit(wrap_up());
|
||||
}
|
||||
diff -up source/texk/web2c/cwebdir/common.c.format source/texk/web2c/cwebdir/common.c
|
||||
--- source/texk/web2c/cwebdir/common.c.format 2015-07-28 21:24:56.764079186 -0400
|
||||
+++ source/texk/web2c/cwebdir/common.c 2015-07-28 21:25:24.830907788 -0400
|
||||
@@ -1063,7 +1063,7 @@ void
|
||||
fatal(s,t)
|
||||
char*s,*t;
|
||||
{
|
||||
-if(*s)printf(s);
|
||||
+if(*s)printf("%s",s);
|
||||
err_print(t);
|
||||
history= fatal_message;exit(wrap_up());
|
||||
}
|
||||
diff -up source/texk/web2c/cwebdir/common.w.format source/texk/web2c/cwebdir/common.w
|
||||
--- source/texk/web2c/cwebdir/common.w.format 2015-07-28 21:25:32.886858591 -0400
|
||||
+++ source/texk/web2c/cwebdir/common.w 2015-07-28 21:25:46.117777793 -0400
|
||||
@@ -1180,7 +1180,7 @@ concatenated to print the final error me
|
||||
fatal(s,t)
|
||||
char *s,*t;
|
||||
{
|
||||
- if (*s) printf(s);
|
||||
+ if (*s) printf("%s",s);
|
||||
err_print(t);
|
||||
history=fatal_message; exit(wrap_up());
|
||||
}
|
||||
diff -up source/texk/web2c/cwebdir/cweave.w.format source/texk/web2c/cwebdir/cweave.w
|
||||
--- source/texk/web2c/cwebdir/cweave.w.format 2015-07-28 21:25:55.096722960 -0400
|
||||
+++ source/texk/web2c/cwebdir/cweave.w 2015-07-28 21:26:13.680609471 -0400
|
||||
@@ -1784,7 +1784,7 @@ void
|
||||
print_cat(c) /* symbolic printout of a category */
|
||||
eight_bits c;
|
||||
{
|
||||
- printf(cat_name[c]);
|
||||
+ printf("%s",cat_name[c]);
|
||||
}
|
||||
|
||||
@ The token lists for translated \TEX/ output contain some special control
|
||||
diff -up source/texk/web2c/omegafonts/error_routines.c.format source/texk/web2c/omegafonts/error_routines.c
|
||||
--- source/texk/web2c/omegafonts/error_routines.c.format 2015-07-28 21:26:21.654560776 -0400
|
||||
+++ source/texk/web2c/omegafonts/error_routines.c 2015-07-28 21:27:54.356994659 -0400
|
||||
@@ -62,7 +62,7 @@ void
|
||||
yyerror(const_string fmt)
|
||||
{
|
||||
fprintf(stderr, "line %d (parsing): ", line_number);
|
||||
- fprintf(stderr, fmt);
|
||||
+ fprintf(stderr, "%s", fmt);
|
||||
fprintf(stderr, "\n");
|
||||
num_errors++;
|
||||
}
|
||||
@@ -72,7 +72,7 @@ void
|
||||
warning_0(const_string fmt)
|
||||
{
|
||||
fprintf(stderr, "line %d (warning): ", line_number);
|
||||
- fprintf(stderr, fmt);
|
||||
+ fprintf(stderr, "%s", fmt);
|
||||
fprintf(stderr, "\n");
|
||||
}
|
||||
|
||||
@@ -120,7 +120,7 @@ void
|
||||
fatal_error_0(const_string fmt)
|
||||
{
|
||||
fprintf(stderr, "line %d (fatal): ", line_number);
|
||||
- fprintf(stderr, fmt);
|
||||
+ fprintf(stderr, "%s", fmt);
|
||||
fprintf(stderr, "\n");
|
||||
exit(1);
|
||||
}
|
||||
@@ -156,7 +156,7 @@ void
|
||||
internal_error_0(const_string fmt)
|
||||
{
|
||||
fprintf(stderr, "line %d (internal): ", line_number);
|
||||
- fprintf(stderr, fmt);
|
||||
+ fprintf(stderr, "%s", fmt);
|
||||
fprintf(stderr, "\n");
|
||||
exit(2);
|
||||
}
|
||||
diff -up source/texk/web2c/omegafonts/out_routines.c.format source/texk/web2c/omegafonts/out_routines.c
|
||||
--- source/texk/web2c/omegafonts/out_routines.c.format 2015-07-28 21:28:09.547901891 -0400
|
||||
+++ source/texk/web2c/omegafonts/out_routines.c 2015-07-28 21:28:22.209824567 -0400
|
||||
@@ -368,5 +368,5 @@ out_digits(unsigned counter)
|
||||
void
|
||||
out(const_string sval)
|
||||
{
|
||||
- fprintf(file_output, sval);
|
||||
+ fprintf(file_output, "%s", sval);
|
||||
}
|
||||
diff -up source/texk/web2c/tiedir/tie.c.format source/texk/web2c/tiedir/tie.c
|
||||
--- source/texk/web2c/tiedir/tie.c.format 2015-07-28 21:28:30.242775511 -0400
|
||||
+++ source/texk/web2c/tiedir/tie.c 2015-07-28 21:29:04.979563380 -0400
|
||||
@@ -27,14 +27,14 @@
|
||||
\
|
||||
|
||||
#define term_out stdout
|
||||
-#define print(a)fprintf(term_out,a)
|
||||
+#define print(a)fprintf(term_out,"%s",a)
|
||||
#define print2(a,b)fprintf(term_out,a,b)
|
||||
#define print3(a,b,c)fprintf(term_out,a,b,c)
|
||||
#define print_c(v)fputc(v,term_out);
|
||||
#define new_line(v)fputc('\n',v)
|
||||
#define term_new_line new_line(term_out) \
|
||||
|
||||
-#define print_ln(v){fprintf(term_out,v);term_new_line;} \
|
||||
+#define print_ln(v){fprintf(term_out,"%s",v);term_new_line;} \
|
||||
|
||||
#define print2_ln(a,b){print2(a,b);term_new_line;}
|
||||
#define print3_ln(a,b,c){print3(a,b,c);term_new_line;} \
|
||||
diff -up source/texk/web2c/tiedir/tie.w.format source/texk/web2c/tiedir/tie.w
|
||||
--- source/texk/web2c/tiedir/tie.w.format 2015-07-28 21:29:13.361512193 -0400
|
||||
+++ source/texk/web2c/tiedir/tie.w 2015-07-28 21:30:18.135116633 -0400
|
||||
@@ -458,14 +458,14 @@ for terminating an output line and writi
|
||||
|
||||
@^system dependencies@>
|
||||
@d term_out stdout
|
||||
-@d print(a) fprintf(term_out,a) /* `|print|' means write on the terminal */
|
||||
+@d print(a) fprintf(term_out,"%s",a) /* `|print|' means write on the terminal */
|
||||
@d print2(a,b) fprintf(term_out,a,b) /* same with two arguments */
|
||||
@d print3(a,b,c) fprintf(term_out,a,b,c) /* same with three arguments */
|
||||
@d print_c(v) fputc(v,term_out); /* print a single character */
|
||||
@d new_line(v) fputc('\n',v) /* start new line */
|
||||
@d term_new_line new_line(term_out)
|
||||
/* start new line of the terminal */
|
||||
-@d print_ln(v) {fprintf(term_out,v);term_new_line;}
|
||||
+@d print_ln(v) {fprintf(term_out,"%s",v);term_new_line;}
|
||||
/* `|print|' and then start new line */
|
||||
@d print2_ln(a,b) {print2(a,b);term_new_line;} /* same with two arguments */
|
||||
@d print3_ln(a,b,c) {print3(a,b,c);term_new_line;}
|
||||
diff -up source/utils/devnag/src/devnag.c.format source/utils/devnag/src/devnag.c
|
||||
--- source/utils/devnag/src/devnag.c.format 2015-07-28 21:23:26.446630739 -0400
|
||||
+++ source/utils/devnag/src/devnag.c 2015-07-28 21:23:34.215583295 -0400
|
||||
@@ -2400,7 +2400,7 @@ void put_macro(short macro) {
|
||||
void err_ill(const char *str) {
|
||||
fprintf(stderr, "Error: illegal character(s) \"%s\" detected at line %d:\n",
|
||||
str, linenumber);
|
||||
- fprintf(stderr, inbuf);
|
||||
+ fprintf(stderr, "%s", inbuf);
|
||||
exit(1);
|
||||
}
|
||||
|
||||
@ -1,12 +0,0 @@
|
||||
diff -up texlive-2013/source/texk/kpathsea/progname.c.kpfix texlive-2013/source/texk/kpathsea/progname.c
|
||||
--- source/texk/kpathsea/progname.c.kpfix 2013-08-12 09:28:14.422522624 +0200
|
||||
+++ source/texk/kpathsea/progname.c 2013-08-12 12:16:02.958132658 +0200
|
||||
@@ -668,7 +668,7 @@ kpathsea_set_program_name (kpathsea kpse
|
||||
kpathsea_xputenv (kpse, "SELFAUTOLOC", fix_selfdir (sdir));
|
||||
sdir_parent = xdirname (sdir);
|
||||
kpathsea_xputenv (kpse, "SELFAUTODIR", fix_selfdir (sdir_parent));
|
||||
- sdir_grandparent = xdirname (sdir_parent);
|
||||
+ sdir_grandparent = strdup("/usr/share/texlive");
|
||||
kpathsea_xputenv (kpse, "SELFAUTOPARENT", fix_selfdir (sdir_grandparent));
|
||||
sdir_greatgrandparent = xdirname (sdir_grandparent);
|
||||
kpathsea_xputenv (kpse, "SELFAUTOGRANDPARENT", fix_selfdir (sdir_greatgrandparent));
|
||||
Loading…
x
Reference in New Issue
Block a user