1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
|
Description: <short summary of the patch>
TODO: Put a short summary on the line above and replace this paragraph
with a longer explanation of this change. Complete the meta-information
with other relevant fields (see below for details). To make it easier, the
information below has been extracted from the changelog. Adjust it or drop
it.
.
cxref (1.6d-1) unstable; urgency=low
.
* New upstream release
* Bug fix: "it] Italian translation of debconf templates", thanks to
Francesca Ciceri (Closes: #656256).
* Bug fix: "CPPFLAGS hardening flags missing", thanks to Simon Ruderich
(Closes: #665202). Applied CPPFLAGS hardening patch
Author: Camm Maguire <camm@debian.org>
Bug-Debian: http://bugs.debian.org/656256
Bug-Debian: http://bugs.debian.org/665202
---
The information above should follow the Patch Tagging Guidelines, please
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
are templates for supplementary fields that you might want to add:
Origin: <vendor|upstream|other>, <url of original patch>
Bug: <url in upstream bugtracker>
Bug-Debian: http://bugs.debian.org/<bugnumber>
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: <YYYY-MM-DD>
--- cxref-1.6d.orig/cpp/Makefile.in
+++ cxref-1.6d/cpp/Makefile.in
@@ -36,6 +36,7 @@ CC=@CC@
LD=@CC@
CFLAGS=@CFLAGS@
+CPPFLAGS=@CPPFLAGS@
LDFLAGS=@LDFLAGS@
# The Yacc program
@@ -94,20 +95,20 @@ distclean : clean
########
cccp.o : cccp.c config.h pcp.h autoconfig.h
- $(CC) -c $(CFLAGS) $< -o $@ $(INCLUDE) -DIN_GCC \
+ $(CC) -c $(CFLAGS) $(CPPFLAGS) $< -o $@ $(INCLUDE) -DIN_GCC \
'-DCXREF_CPP_DEFINES="$(datadir)/cxref-cpp.defines"'
@touch $@
cexp.o : cexp.c config.h autoconfig.h gansidecl.h ansidecl.h system.h libiberty.h intl.h
- $(CC) -c $(CFLAGS) $< -o $@ $(INCLUDE) -DIN_GCC
+ $(CC) -c $(CFLAGS) $(CPPFLAGS) $< -o $@ $(INCLUDE) -DIN_GCC
@touch $@
prefix.o : prefix.c config.h autoconfig.h gansidecl.h ansidecl.h system.h libiberty.h prefix.h
- $(CC) -c $(CFLAGS) $< -o $@ $(INCLUDE) -DIN_GCC -DPREFIX=\"/\"
+ $(CC) -c $(CFLAGS) $(CPPFLAGS) $< -o $@ $(INCLUDE) -DIN_GCC -DPREFIX=\"/\"
@touch $@
version.o : version.c
- $(CC) -c $(CFLAGS) $< -o $@ $(INCLUDE) -DIN_GCC
+ $(CC) -c $(CFLAGS) $(CPPFLAGS) $< -o $@ $(INCLUDE) -DIN_GCC
@touch $@
########
--- cxref-1.6d.orig/query/Makefile.in
+++ cxref-1.6d/query/Makefile.in
@@ -35,6 +35,7 @@ CC=@CC@
LD=@CC@
CFLAGS=@CFLAGS@
+CPPFLAGS=@CPPFLAGS@
LDFLAGS=@LDFLAGS@
########
@@ -85,7 +86,7 @@ cxref-query : $(OBJ_FILES)
.SUFFIXES: .c .o
.c.o:
- $(CC) -c $(CFLAGS) $< -o $@ $(INCLUDE)
+ $(CC) -c $(CFLAGS) $(CPPFLAGS) $< -o $@ $(INCLUDE)
query.o : query.c query.h ../src/cxref.h ../src/datatype.h ../src/memory.h
input.o : input.c query.h ../src/cxref.h ../src/datatype.h ../src/memory.h
--- cxref-1.6d.orig/src/Makefile.in
+++ cxref-1.6d/src/Makefile.in
@@ -32,6 +32,7 @@ CC=@CC@
LD=@CC@
CFLAGS=@CFLAGS@
+CPPFLAGS=@CPPFLAGS@
LDFLAGS=@LDFLAGS@
# The Yacc program
@@ -174,15 +175,15 @@ cpp_dir=@abs_top_builddir@/cpp
.SUFFIXES: .c .o
.c.o:
- $(CC) -c $(CFLAGS) $< -o $@ $(INCLUDE)
+ $(CC) -c $(CFLAGS) $(CPPFLAGS) $< -o $@ $(INCLUDE)
cxref.o : cxref.c cxref.h datatype.h memory.h parse-yy.h version.h
- [ ! -f ../cpp/cxref-cpp ] || $(CC) -c $(CFLAGS) cxref.c -o $@ $(INCLUDE) "-DCXREF_CPP=\"$(cpp_dir)/cxref-cpp -cxref-cpp-defines $(cpp_dir)/cxref-cpp.defines -lang-c -C -dD -dI\""
- [ -f ../cpp/cxref-cpp ] || $(CC) -c $(CFLAGS) cxref.c -o $@ $(INCLUDE)
+ [ ! -f ../cpp/cxref-cpp ] || $(CC) -c $(CFLAGS) $(CPPFLAGS) cxref.c -o $@ $(INCLUDE) "-DCXREF_CPP=\"$(cpp_dir)/cxref-cpp -cxref-cpp-defines $(cpp_dir)/cxref-cpp.defines -lang-c -C -dD -dI\""
+ [ -f ../cpp/cxref-cpp ] || $(CC) -c $(CFLAGS) $(CPPFLAGS) cxref.c -o $@ $(INCLUDE)
cxref-inst.o : cxref.c cxref.h datatype.h memory.h parse-yy.h
- [ ! -f ../cpp/cxref-cpp ] || $(CC) -c $(CFLAGS) cxref.c -o $@ $(INCLUDE) '-DCXREF_CPP="cxref-cpp -lang-c -C -dD -dI"'
- [ -f ../cpp/cxref-cpp ] || $(CC) -c $(CFLAGS) cxref.c -o $@ $(INCLUDE)
+ [ ! -f ../cpp/cxref-cpp ] || $(CC) -c $(CFLAGS) $(CPPFLAGS) cxref.c -o $@ $(INCLUDE) '-DCXREF_CPP="cxref-cpp -lang-c -C -dD -dI"'
+ [ -f ../cpp/cxref-cpp ] || $(CC) -c $(CFLAGS) $(CPPFLAGS) cxref.c -o $@ $(INCLUDE)
func.o : func.c cxref.h datatype.h memory.h parse-yy.h
type.o : type.c cxref.h datatype.h memory.h parse-yy.h
@@ -202,7 +203,7 @@ latex-style.o: latex-style.c
html.o : html.c cxref.h datatype.h memory.h version.h
html-style.o : html-style.c
rtf.o : rtf.c cxref.h datatype.h memory.h version.h
- $(CC) -c $(CFLAGS) $< -o $@ -DPAGE=\"$(PAGE)\" $(INCLUDE)
+ $(CC) -c $(CFLAGS) $(CPPFLAGS) $< -o $@ -DPAGE=\"$(PAGE)\" $(INCLUDE)
sgml.o : sgml.c cxref.h datatype.h memory.h version.h
parse-yacc.o : parse-yacc.c cxref.h datatype.h memory.h parse-yy.h parse-yacc.h
|
