* [gentoo-commits] gentoo-x86 commit in net-misc/openswan/files: openswan-2.6.22-gentoo.patch
@ 2009-06-24 17:18 Alin Nastac (mrness)
0 siblings, 0 replies; 2+ messages in thread
From: Alin Nastac (mrness) @ 2009-06-24 17:18 UTC (permalink / raw
To: gentoo-commits
mrness 09/06/24 17:18:36
Added: openswan-2.6.22-gentoo.patch
Log:
Version bump wrt security bug #275233.
(Portage version: 2.1.6.13/cvs/Linux x86_64)
Revision Changes Path
1.1 net-misc/openswan/files/openswan-2.6.22-gentoo.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/openswan/files/openswan-2.6.22-gentoo.patch?rev=1.1&view=markup
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
Index: openswan-2.6.22-gentoo.patch
===================================================================
diff -Nru openswan-2.6.22.orig/lib/libdns/Makefile openswan-2.6.22/lib/libdns/Makefile
--- openswan-2.6.22.orig/lib/libdns/Makefile 2009-06-23 04:53:08.000000000 +0200
+++ openswan-2.6.22/lib/libdns/Makefile 2009-06-24 18:54:55.000000000 +0200
@@ -30,8 +30,8 @@
-I${srcdir}../libisc/nothreads/include \
-I. -I./include -I${srcdir}include \
-I${srcdir}../libisc/include
-CDEFINES = -g ${USERCOMPILE} ${PORTINCLUDE}
-CWARNINGS = -Werror
+CDEFINES = ${USERCOMPILE} ${PORTINCLUDE}
+CWARNINGS =
CFLAGS+=${CINCLUDES} ${CDEFINES} ${CWARNINGS}
diff -Nru openswan-2.6.22.orig/lib/libisc/Makefile openswan-2.6.22/lib/libisc/Makefile
--- openswan-2.6.22.orig/lib/libisc/Makefile 2009-06-23 04:53:08.000000000 +0200
+++ openswan-2.6.22/lib/libisc/Makefile 2009-06-24 18:54:55.000000000 +0200
@@ -22,8 +22,8 @@
-I${srcdir}nothreads/include \
-I. -I./include -I${srcdir}include \
$(PORTINCLUDE) -I${OPENSWANSRCDIR}/include
-CDEFINES = -g -DHAVE_STRERROR ${USERCOMPILE} ${PORTINCLUDE}
-# CWARNINGS = -Werror
+CDEFINES = -DHAVE_STRERROR ${USERCOMPILE} ${PORTINCLUDE}
+# CWARNINGS =
CFLAGS+=${CINCLUDES} ${CDEFINES} ${CWARNINGS}
diff -Nru openswan-2.6.22.orig/lib/liblwres/Makefile openswan-2.6.22/lib/liblwres/Makefile
--- openswan-2.6.22.orig/lib/liblwres/Makefile 2009-06-23 04:53:08.000000000 +0200
+++ openswan-2.6.22/lib/liblwres/Makefile 2009-06-24 18:54:55.000000000 +0200
@@ -22,8 +22,8 @@
-I${srcdir}../libisc/${ISCARCH}/include \
-I${srcdir}../libisc/include \
-I. -I./include -I${srcdir}include
-CDEFINES = -g
-CWARNINGS = -Werror
+CDEFINES =
+CWARNINGS =
CFLAGS+=${USERCOMPILE} ${PORTINCLUDE} ${CINCLUDES} ${CDEFINES} ${CWARNINGS}
diff -Nru openswan-2.6.22.orig/Makefile.inc openswan-2.6.22/Makefile.inc
--- openswan-2.6.22.orig/Makefile.inc 2009-06-23 04:53:08.000000000 +0200
+++ openswan-2.6.22/Makefile.inc 2009-06-24 18:54:55.000000000 +0200
@@ -49,7 +49,7 @@
DESTDIR?=
# "local" part of tree, used in building other pathnames
-INC_USRLOCAL=/usr/local
+INC_USRLOCAL?=/usr
# PUBDIR is where the "ipsec" command goes; beware, many things define PATH
# settings which are assumed to include it (or at least, to include *some*
@@ -94,7 +94,7 @@
# sample configuration files go into
INC_DOCDIR?=share/doc
-FINALEXAMPLECONFDIR=${INC_USRLOCAL}/${INC_DOCDIR}/openswan
+FINALEXAMPLECONFDIR?=${INC_USRLOCAL}/${INC_DOCDIR}/openswan
EXAMPLECONFDIR=${DESTDIR}${FINALEXAMPLECONFDIR}
FINALDOCDIR?=${INC_USRLOCAL}/${INC_DOCDIR}/openswan
diff -Nru openswan-2.6.22.orig/programs/Makefile.program openswan-2.6.22/programs/Makefile.program
--- openswan-2.6.22.orig/programs/Makefile.program 2009-06-23 04:53:08.000000000 +0200
+++ openswan-2.6.22/programs/Makefile.program 2009-06-24 18:54:55.000000000 +0200
@@ -53,7 +53,6 @@
WERROR:= -Werror
endif
-CFLAGS+= ${WERROR}
ifneq ($(LD_LIBRARY_PATH),)
LDFLAGS=-L$(LD_LIBRARY_PATH)
diff -Nru openswan-2.6.22.orig/programs/setup/Makefile openswan-2.6.22/programs/setup/Makefile
--- openswan-2.6.22.orig/programs/setup/Makefile 2009-06-23 04:53:08.000000000 +0200
+++ openswan-2.6.22/programs/setup/Makefile 2009-06-24 18:54:55.000000000 +0200
@@ -18,7 +18,6 @@
# this dance is because setup has to get installed as /etc/rc.d/init.d/ipsec
# not as /etc/rc.d/init.d/setup.
-PROGRAMDIR=$(RCDIR)
PROGRAM=setup
EXTRA8MAN=setup.8
@@ -29,32 +28,6 @@
# into the $BINDIR.
#
# the priorities match those in setup's chkconfig line
-doinstall:: setup
- @rm -f $(BINDIR)/setup
- @$(INSTALL) $(INSTBINFLAGS) setup $(RCDIR)/ipsec
- @ln -s $(FINALRCDIR)/ipsec $(BINDIR)/setup
- -@for i in 0 1 2 3 4 5 6; do mkdir -p $(RCDIR)/../rc$$i.d; done
- -@cd $(RCDIR)/../rc0.d && ln -f -s ../init.d/ipsec K76ipsec
- -@cd $(RCDIR)/../rc1.d && ln -f -s ../init.d/ipsec K76ipsec
- -@cd $(RCDIR)/../rc2.d && ln -f -s ../init.d/ipsec S47ipsec
- -@cd $(RCDIR)/../rc3.d && ln -f -s ../init.d/ipsec S47ipsec
- -@cd $(RCDIR)/../rc4.d && ln -f -s ../init.d/ipsec S47ipsec
- -@cd $(RCDIR)/../rc5.d && ln -f -s ../init.d/ipsec S47ipsec
- -@cd $(RCDIR)/../rc6.d && ln -f -s ../init.d/ipsec K76ipsec
-
-install_file_list::
- @echo $(RCDIR)/ipsec
- @echo $(BINDIR)/setup
- @echo $(RCDIR)/../rc0.d/K76ipsec
- @echo $(RCDIR)/../rc1.d/K76ipsec
- @echo $(RCDIR)/../rc2.d/S47ipsec
- @echo $(RCDIR)/../rc3.d/S47ipsec
- @echo $(RCDIR)/../rc4.d/S47ipsec
- @echo $(RCDIR)/../rc5.d/S47ipsec
- @echo $(RCDIR)/../rc6.d/K76ipsec
-
-cleanall::
- @rm -f setup
#
# $Log: openswan-2.6.22-gentoo.patch,v $
# Revision 1.1 2009/06/24 17:18:36 mrness
# Version bump wrt security bug #275233.
# (Portage version: 2.1.6.13/cvs/Linux x86_64)
#
diff -Nru openswan-2.6.22.orig/testing/utils/make-uml.sh openswan-2.6.22/testing/utils/make-uml.sh
--- openswan-2.6.22.orig/testing/utils/make-uml.sh 2009-06-23 04:53:08.000000000 +0200
+++ openswan-2.6.22/testing/utils/make-uml.sh 2009-06-24 18:54:55.000000000 +0200
@@ -262,7 +262,7 @@
cd $OPENSWANSRCDIR || exit 1
-make WERROR=-Werror USE_OBJDIR=true programs
+make USE_OBJDIR=true programs
# now, execute the Makefile that we have created!
cd $POOLSPACE && make $OPENSWANHOSTS
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in net-misc/openswan/files: openswan-2.6.22-gentoo.patch
@ 2009-12-05 8:01 Alin Nastac (mrness)
0 siblings, 0 replies; 2+ messages in thread
From: Alin Nastac (mrness) @ 2009-12-05 8:01 UTC (permalink / raw
To: gentoo-commits
mrness 09/12/05 08:01:45
Removed: openswan-2.6.22-gentoo.patch
Log:
Use selected CC (#293277). Install more doc files (#294533).
(Portage version: 2.1.6.13/cvs/Linux x86_64)
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-12-05 8:01 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-06-24 17:18 [gentoo-commits] gentoo-x86 commit in net-misc/openswan/files: openswan-2.6.22-gentoo.patch Alin Nastac (mrness)
-- strict thread matches above, loose matches on Subject: below --
2009-12-05 8:01 Alin Nastac (mrness)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox