Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Alin Nastac (mrness)" <mrness@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-misc/openswan/files: openswan-2.6.19-gentoo.patch openswan-2.6.19-qa-fixes.patch openswan-2.4.11-gentoo.patch openswan-2.6.16-qa-fixes.patch openswan-2.6.16-refine-connection.patch openswan-2.6.16-gentoo.patch openswan-2.4.11-implicit-decl.patch openswan-2.4.12-gentoo.patch openswan-2.4.12-deprecated-ldap.patch
Date: Wed, 03 Dec 2008 23:30:31
Message-Id: E1L81Aq-0008PP-NA@stork.gentoo.org
1 mrness 08/12/03 23:30:28
2
3 Added: openswan-2.6.19-gentoo.patch
4 openswan-2.6.19-qa-fixes.patch
5 Removed: openswan-2.4.11-gentoo.patch
6 openswan-2.6.16-qa-fixes.patch
7 openswan-2.6.16-refine-connection.patch
8 openswan-2.6.16-gentoo.patch
9 openswan-2.4.11-implicit-decl.patch
10 openswan-2.4.12-gentoo.patch
11 openswan-2.4.12-deprecated-ldap.patch
12 Log:
13 Remove obsolete versions.
14 Correct doc install path (#241976).
15 Version bump.
16 (Portage version: 2.1.4.4, RepoMan options: --force)
17
18 Revision Changes Path
19 1.1 net-misc/openswan/files/openswan-2.6.19-gentoo.patch
20
21 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/openswan/files/openswan-2.6.19-gentoo.patch?rev=1.1&view=markup
22 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/openswan/files/openswan-2.6.19-gentoo.patch?rev=1.1&content-type=text/plain
23
24 Index: openswan-2.6.19-gentoo.patch
25 ===================================================================
26 diff -Nru openswan-2.6.19.orig/Makefile.inc openswan-2.6.19/Makefile.inc
27 --- openswan-2.6.19.orig/Makefile.inc 2008-11-25 01:24:56.000000000 +0000
28 +++ openswan-2.6.19/Makefile.inc 2008-12-03 23:06:52.000000000 +0000
29 @@ -49,7 +49,7 @@
30 DESTDIR?=
31
32 # "local" part of tree, used in building other pathnames
33 -INC_USRLOCAL=/usr/local
34 +INC_USRLOCAL?=/usr
35
36 # PUBDIR is where the "ipsec" command goes; beware, many things define PATH
37 # settings which are assumed to include it (or at least, to include *some*
38 @@ -94,7 +94,7 @@
39
40 # sample configuration files go into
41 INC_DOCDIR?=share/doc
42 -FINALEXAMPLECONFDIR=${INC_USRLOCAL}/${INC_DOCDIR}/openswan
43 +FINALEXAMPLECONFDIR?=${INC_USRLOCAL}/${INC_DOCDIR}/openswan
44 EXAMPLECONFDIR=${DESTDIR}${FINALEXAMPLECONFDIR}
45
46 FINALDOCDIR?=${INC_USRLOCAL}/${INC_DOCDIR}/openswan
47 diff -Nru openswan-2.6.19.orig/programs/Makefile.manpages openswan-2.6.19/programs/Makefile.manpages
48 --- openswan-2.6.19.orig/programs/Makefile.manpages 2008-11-25 01:24:56.000000000 +0000
49 +++ openswan-2.6.19/programs/Makefile.manpages 2008-12-03 23:09:27.000000000 +0000
50 @@ -1,19 +1,19 @@
51 # xmlto is from http://cyberelk.net/tim/xmlto/
52 ifneq ($(strip $(XMLTO)),)
53 %.8: %.8.xml
54 - ${XMLTO} man $<
55 + ${XMLTO} --skip-validation man $<
56 @for m in ipsec_*.8; do if [ -f $$m ]; then mv $$m $@; fi; done
57
58 %.5: %.5.xml
59 - ${XMLTO} man $<
60 + ${XMLTO} --skip-validation man $<
61 @for m in ipsec_*.5; do if [ -f $$m ]; then mv $$m $@; fi; done
62
63 %.2: %.2.xml
64 - ${XMLTO} man $<
65 + ${XMLTO} --skip-validation man $<
66 @for m in ipsec_*.3; do if [ -f $$m ]; then mv $$m $@; fi; done
67
68 %.1: %.1.xml
69 - ${XMLTO} man $<
70 + ${XMLTO} --skip-validation man $<
71 @for m in ipsec_*.1; do if [ -f $$m ]; then mv $$m $@; fi; done
72 endif
73
74 diff -Nru openswan-2.6.19.orig/programs/setup/Makefile openswan-2.6.19/programs/setup/Makefile
75 --- openswan-2.6.19.orig/programs/setup/Makefile 2008-11-25 01:24:56.000000000 +0000
76 +++ openswan-2.6.19/programs/setup/Makefile 2008-12-03 23:06:52.000000000 +0000
77 @@ -18,7 +18,6 @@
78
79 # this dance is because setup has to get installed as /etc/rc.d/init.d/ipsec
80 # not as /etc/rc.d/init.d/setup.
81 -PROGRAMDIR=$(RCDIR)
82 PROGRAM=setup
83 EXTRA8MAN=setup.8
84
85 @@ -29,32 +28,6 @@
86 # into the $BINDIR.
87 #
88 # the priorities match those in setup's chkconfig line
89 -doinstall:: setup
90 - @rm -f $(BINDIR)/setup
91 - @$(INSTALL) $(INSTBINFLAGS) setup $(RCDIR)/ipsec
92 - @ln -s $(FINALRCDIR)/ipsec $(BINDIR)/setup
93 - -@for i in 0 1 2 3 4 5 6; do mkdir -p $(RCDIR)/../rc$$i.d; done
94 - -@cd $(RCDIR)/../rc0.d && ln -f -s ../init.d/ipsec K76ipsec
95 - -@cd $(RCDIR)/../rc1.d && ln -f -s ../init.d/ipsec K76ipsec
96 - -@cd $(RCDIR)/../rc2.d && ln -f -s ../init.d/ipsec S47ipsec
97 - -@cd $(RCDIR)/../rc3.d && ln -f -s ../init.d/ipsec S47ipsec
98 - -@cd $(RCDIR)/../rc4.d && ln -f -s ../init.d/ipsec S47ipsec
99 - -@cd $(RCDIR)/../rc5.d && ln -f -s ../init.d/ipsec S47ipsec
100 - -@cd $(RCDIR)/../rc6.d && ln -f -s ../init.d/ipsec K76ipsec
101 -
102 -install_file_list::
103 - @echo $(RCDIR)/ipsec
104 - @echo $(BINDIR)/setup
105 - @echo $(RCDIR)/../rc0.d/K76ipsec
106 - @echo $(RCDIR)/../rc1.d/K76ipsec
107 - @echo $(RCDIR)/../rc2.d/S47ipsec
108 - @echo $(RCDIR)/../rc3.d/S47ipsec
109 - @echo $(RCDIR)/../rc4.d/S47ipsec
110 - @echo $(RCDIR)/../rc5.d/S47ipsec
111 - @echo $(RCDIR)/../rc6.d/K76ipsec
112 -
113 -cleanall::
114 - @rm -f setup
115
116 #
117 # $Log: openswan-2.6.19-gentoo.patch,v $
118 # Revision 1.1 2008/12/03 23:30:28 mrness
119 # Remove obsolete versions.
120 # Correct doc install path (#241976).
121 # Version bump.
122 # (Portage version: 2.1.4.4, RepoMan options: --force)
123 #
124
125
126
127 1.1 net-misc/openswan/files/openswan-2.6.19-qa-fixes.patch
128
129 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/openswan/files/openswan-2.6.19-qa-fixes.patch?rev=1.1&view=markup
130 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/openswan/files/openswan-2.6.19-qa-fixes.patch?rev=1.1&content-type=text/plain
131
132 Index: openswan-2.6.19-qa-fixes.patch
133 ===================================================================
134 diff -Nru openswan-2.6.19.orig/programs/pluto/log.c openswan-2.6.19/programs/pluto/log.c
135 --- openswan-2.6.19.orig/programs/pluto/log.c 2008-11-25 01:24:56.000000000 +0000
136 +++ openswan-2.6.19/programs/pluto/log.c 2008-12-03 23:16:18.000000000 +0000
137 @@ -55,6 +55,7 @@
138 #include "kernel_alg.h"
139 #include "ike_alg.h"
140 #include "plutoalg.h"
141 +#include "virtual.h"
142
143 #ifndef NO_DB_OPS_STATS
144 #define NO_DB_CONTEXT
Report Message
Find on MARC Find on Google Groups