1 |
mrness 09/06/24 17:18:36 |
2 |
|
3 |
Added: openswan-2.6.22-gentoo.patch |
4 |
Log: |
5 |
Version bump wrt security bug #275233. |
6 |
(Portage version: 2.1.6.13/cvs/Linux x86_64) |
7 |
|
8 |
Revision Changes Path |
9 |
1.1 net-misc/openswan/files/openswan-2.6.22-gentoo.patch |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/openswan/files/openswan-2.6.22-gentoo.patch?rev=1.1&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/openswan/files/openswan-2.6.22-gentoo.patch?rev=1.1&content-type=text/plain |
13 |
|
14 |
Index: openswan-2.6.22-gentoo.patch |
15 |
=================================================================== |
16 |
diff -Nru openswan-2.6.22.orig/lib/libdns/Makefile openswan-2.6.22/lib/libdns/Makefile |
17 |
--- openswan-2.6.22.orig/lib/libdns/Makefile 2009-06-23 04:53:08.000000000 +0200 |
18 |
+++ openswan-2.6.22/lib/libdns/Makefile 2009-06-24 18:54:55.000000000 +0200 |
19 |
@@ -30,8 +30,8 @@ |
20 |
-I${srcdir}../libisc/nothreads/include \ |
21 |
-I. -I./include -I${srcdir}include \ |
22 |
-I${srcdir}../libisc/include |
23 |
-CDEFINES = -g ${USERCOMPILE} ${PORTINCLUDE} |
24 |
-CWARNINGS = -Werror |
25 |
+CDEFINES = ${USERCOMPILE} ${PORTINCLUDE} |
26 |
+CWARNINGS = |
27 |
|
28 |
CFLAGS+=${CINCLUDES} ${CDEFINES} ${CWARNINGS} |
29 |
|
30 |
diff -Nru openswan-2.6.22.orig/lib/libisc/Makefile openswan-2.6.22/lib/libisc/Makefile |
31 |
--- openswan-2.6.22.orig/lib/libisc/Makefile 2009-06-23 04:53:08.000000000 +0200 |
32 |
+++ openswan-2.6.22/lib/libisc/Makefile 2009-06-24 18:54:55.000000000 +0200 |
33 |
@@ -22,8 +22,8 @@ |
34 |
-I${srcdir}nothreads/include \ |
35 |
-I. -I./include -I${srcdir}include \ |
36 |
$(PORTINCLUDE) -I${OPENSWANSRCDIR}/include |
37 |
-CDEFINES = -g -DHAVE_STRERROR ${USERCOMPILE} ${PORTINCLUDE} |
38 |
-# CWARNINGS = -Werror |
39 |
+CDEFINES = -DHAVE_STRERROR ${USERCOMPILE} ${PORTINCLUDE} |
40 |
+# CWARNINGS = |
41 |
|
42 |
CFLAGS+=${CINCLUDES} ${CDEFINES} ${CWARNINGS} |
43 |
|
44 |
diff -Nru openswan-2.6.22.orig/lib/liblwres/Makefile openswan-2.6.22/lib/liblwres/Makefile |
45 |
--- openswan-2.6.22.orig/lib/liblwres/Makefile 2009-06-23 04:53:08.000000000 +0200 |
46 |
+++ openswan-2.6.22/lib/liblwres/Makefile 2009-06-24 18:54:55.000000000 +0200 |
47 |
@@ -22,8 +22,8 @@ |
48 |
-I${srcdir}../libisc/${ISCARCH}/include \ |
49 |
-I${srcdir}../libisc/include \ |
50 |
-I. -I./include -I${srcdir}include |
51 |
-CDEFINES = -g |
52 |
-CWARNINGS = -Werror |
53 |
+CDEFINES = |
54 |
+CWARNINGS = |
55 |
|
56 |
CFLAGS+=${USERCOMPILE} ${PORTINCLUDE} ${CINCLUDES} ${CDEFINES} ${CWARNINGS} |
57 |
|
58 |
diff -Nru openswan-2.6.22.orig/Makefile.inc openswan-2.6.22/Makefile.inc |
59 |
--- openswan-2.6.22.orig/Makefile.inc 2009-06-23 04:53:08.000000000 +0200 |
60 |
+++ openswan-2.6.22/Makefile.inc 2009-06-24 18:54:55.000000000 +0200 |
61 |
@@ -49,7 +49,7 @@ |
62 |
DESTDIR?= |
63 |
|
64 |
# "local" part of tree, used in building other pathnames |
65 |
-INC_USRLOCAL=/usr/local |
66 |
+INC_USRLOCAL?=/usr |
67 |
|
68 |
# PUBDIR is where the "ipsec" command goes; beware, many things define PATH |
69 |
# settings which are assumed to include it (or at least, to include *some* |
70 |
@@ -94,7 +94,7 @@ |
71 |
|
72 |
# sample configuration files go into |
73 |
INC_DOCDIR?=share/doc |
74 |
-FINALEXAMPLECONFDIR=${INC_USRLOCAL}/${INC_DOCDIR}/openswan |
75 |
+FINALEXAMPLECONFDIR?=${INC_USRLOCAL}/${INC_DOCDIR}/openswan |
76 |
EXAMPLECONFDIR=${DESTDIR}${FINALEXAMPLECONFDIR} |
77 |
|
78 |
FINALDOCDIR?=${INC_USRLOCAL}/${INC_DOCDIR}/openswan |
79 |
diff -Nru openswan-2.6.22.orig/programs/Makefile.program openswan-2.6.22/programs/Makefile.program |
80 |
--- openswan-2.6.22.orig/programs/Makefile.program 2009-06-23 04:53:08.000000000 +0200 |
81 |
+++ openswan-2.6.22/programs/Makefile.program 2009-06-24 18:54:55.000000000 +0200 |
82 |
@@ -53,7 +53,6 @@ |
83 |
WERROR:= -Werror |
84 |
endif |
85 |
|
86 |
-CFLAGS+= ${WERROR} |
87 |
|
88 |
ifneq ($(LD_LIBRARY_PATH),) |
89 |
LDFLAGS=-L$(LD_LIBRARY_PATH) |
90 |
diff -Nru openswan-2.6.22.orig/programs/setup/Makefile openswan-2.6.22/programs/setup/Makefile |
91 |
--- openswan-2.6.22.orig/programs/setup/Makefile 2009-06-23 04:53:08.000000000 +0200 |
92 |
+++ openswan-2.6.22/programs/setup/Makefile 2009-06-24 18:54:55.000000000 +0200 |
93 |
@@ -18,7 +18,6 @@ |
94 |
|
95 |
# this dance is because setup has to get installed as /etc/rc.d/init.d/ipsec |
96 |
# not as /etc/rc.d/init.d/setup. |
97 |
-PROGRAMDIR=$(RCDIR) |
98 |
PROGRAM=setup |
99 |
EXTRA8MAN=setup.8 |
100 |
|
101 |
@@ -29,32 +28,6 @@ |
102 |
# into the $BINDIR. |
103 |
# |
104 |
# the priorities match those in setup's chkconfig line |
105 |
-doinstall:: setup |
106 |
- @rm -f $(BINDIR)/setup |
107 |
- @$(INSTALL) $(INSTBINFLAGS) setup $(RCDIR)/ipsec |
108 |
- @ln -s $(FINALRCDIR)/ipsec $(BINDIR)/setup |
109 |
- -@for i in 0 1 2 3 4 5 6; do mkdir -p $(RCDIR)/../rc$$i.d; done |
110 |
- -@cd $(RCDIR)/../rc0.d && ln -f -s ../init.d/ipsec K76ipsec |
111 |
- -@cd $(RCDIR)/../rc1.d && ln -f -s ../init.d/ipsec K76ipsec |
112 |
- -@cd $(RCDIR)/../rc2.d && ln -f -s ../init.d/ipsec S47ipsec |
113 |
- -@cd $(RCDIR)/../rc3.d && ln -f -s ../init.d/ipsec S47ipsec |
114 |
- -@cd $(RCDIR)/../rc4.d && ln -f -s ../init.d/ipsec S47ipsec |
115 |
- -@cd $(RCDIR)/../rc5.d && ln -f -s ../init.d/ipsec S47ipsec |
116 |
- -@cd $(RCDIR)/../rc6.d && ln -f -s ../init.d/ipsec K76ipsec |
117 |
- |
118 |
-install_file_list:: |
119 |
- @echo $(RCDIR)/ipsec |
120 |
- @echo $(BINDIR)/setup |
121 |
- @echo $(RCDIR)/../rc0.d/K76ipsec |
122 |
- @echo $(RCDIR)/../rc1.d/K76ipsec |
123 |
- @echo $(RCDIR)/../rc2.d/S47ipsec |
124 |
- @echo $(RCDIR)/../rc3.d/S47ipsec |
125 |
- @echo $(RCDIR)/../rc4.d/S47ipsec |
126 |
- @echo $(RCDIR)/../rc5.d/S47ipsec |
127 |
- @echo $(RCDIR)/../rc6.d/K76ipsec |
128 |
- |
129 |
-cleanall:: |
130 |
- @rm -f setup |
131 |
|
132 |
# |
133 |
# $Log: openswan-2.6.22-gentoo.patch,v $ |
134 |
# Revision 1.1 2009/06/24 17:18:36 mrness |
135 |
# Version bump wrt security bug #275233. |
136 |
# (Portage version: 2.1.6.13/cvs/Linux x86_64) |
137 |
# |
138 |
diff -Nru openswan-2.6.22.orig/testing/utils/make-uml.sh openswan-2.6.22/testing/utils/make-uml.sh |
139 |
--- openswan-2.6.22.orig/testing/utils/make-uml.sh 2009-06-23 04:53:08.000000000 +0200 |
140 |
+++ openswan-2.6.22/testing/utils/make-uml.sh 2009-06-24 18:54:55.000000000 +0200 |
141 |
@@ -262,7 +262,7 @@ |
142 |
|
143 |
cd $OPENSWANSRCDIR || exit 1 |
144 |
|
145 |
-make WERROR=-Werror USE_OBJDIR=true programs |
146 |
+make USE_OBJDIR=true programs |
147 |
|
148 |
# now, execute the Makefile that we have created! |
149 |
cd $POOLSPACE && make $OPENSWANHOSTS |