From 6d7a7f4776711758cf5b59028378f01cd8eba493 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 13 Jun 2009 14:56:04 +0200 Subject: FreeBSD compatibility patches - update ipset and libpri to latest upstream --- package/openswan/Makefile | 4 + package/openswan/patches/patch-Makefile_inc | 11 +++ package/openswan/patches/patch-doc_Makefile | 11 +++ .../patches/patch-programs_Makefile_program | 88 +++++++++++++++++++++- 4 files changed, 113 insertions(+), 1 deletion(-) create mode 100644 package/openswan/patches/patch-Makefile_inc create mode 100644 package/openswan/patches/patch-doc_Makefile (limited to 'package/openswan') diff --git a/package/openswan/Makefile b/package/openswan/Makefile index c75edc34e..2fdb07849 100644 --- a/package/openswan/Makefile +++ b/package/openswan/Makefile @@ -31,6 +31,8 @@ do-build: IPSECDIR="/usr/lib/ipsec" \ INC_USRLOCAL="/usr" \ MODPROBE="insmod" \ + OSDEP="linux" \ + BUILDENV="linux" \ programs do-install: @@ -43,6 +45,8 @@ do-install: IPSECDIR="/usr/lib/ipsec" \ INC_USRLOCAL="/usr" \ MODPROBE="insmod" \ + OSDEP="linux" \ + BUILDENV="linux" \ install rm -rf ${IDIR_OPENSWAN}/usr/share rm -rf ${IDIR_OPENSWAN}/usr/man diff --git a/package/openswan/patches/patch-Makefile_inc b/package/openswan/patches/patch-Makefile_inc new file mode 100644 index 000000000..653528eb9 --- /dev/null +++ b/package/openswan/patches/patch-Makefile_inc @@ -0,0 +1,11 @@ +--- openswan-2.6.21.orig/Makefile.inc 2009-03-30 15:11:28.000000000 +0200 ++++ openswan-2.6.21/Makefile.inc 2009-06-13 14:48:55.000000000 +0200 +@@ -163,7 +163,7 @@ INSTALL=install + # how backup names are composed. + # Note that the install procedures will never overwrite an existing config + # file, which is why -b is not specified for them. +-INSTBINFLAGS=-b --suffix=.old ++INSTBINFLAGS= + INSTSUIDFLAGS=--mode=u+rxs,g+rx,o+rx --group=root -b --suffix=.old + INSTMANFLAGS= + INSTCONFFLAGS= diff --git a/package/openswan/patches/patch-doc_Makefile b/package/openswan/patches/patch-doc_Makefile new file mode 100644 index 000000000..d5accab8c --- /dev/null +++ b/package/openswan/patches/patch-doc_Makefile @@ -0,0 +1,11 @@ +--- openswan-2.6.21.orig/doc/Makefile 2009-03-30 15:11:28.000000000 +0200 ++++ openswan-2.6.21/doc/Makefile 2009-06-13 14:35:32.000000000 +0200 +@@ -91,7 +91,7 @@ install: ${alldocs} ${SAMPLEMAN} + do \ + $(INSTALL) $$file ${DOCDIR} || exit 1;\ + done; +- /bin/bash -c 'MANDIR=${MANTREE}; /usr/bin/find ${OPENSWANSRCDIR}/programs ${OPENSWANSRCDIR}/lib ${OPENSWANSRCDIR}/linux -type f -name "*.[1-8]" -print | grep -v lwres | grep -v CVS | while read f; do if [ -f $$f ]; then manNo=$${f##*.}; F=$${f##*/}; /bin/mkdir -p $$MANDIR/man$$manNo; /bin/cp -fp $$f $$MANDIR/man$$manNo/ipsec_$$F; fi; done' ++ bash -c 'MANDIR=${MANTREE}; find ${OPENSWANSRCDIR}/programs ${OPENSWANSRCDIR}/lib ${OPENSWANSRCDIR}/linux -type f -name "*.[1-8]" -print | grep -v lwres | grep -v CVS | while read f; do if [ -f $$f ]; then manNo=$${f##*.}; F=$${f##*/}; mkdir -p $$MANDIR/man$$manNo; cp -fp $$f $$MANDIR/man$$manNo/ipsec_$$F; fi; done' + + install_file_list: + @$(foreach f, $(alldocs), \ diff --git a/package/openswan/patches/patch-programs_Makefile_program b/package/openswan/patches/patch-programs_Makefile_program index 2fc6e60ce..74f5c8751 100644 --- a/package/openswan/patches/patch-programs_Makefile_program +++ b/package/openswan/patches/patch-programs_Makefile_program @@ -1,6 +1,6 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ --- openswan-2.6.21.orig/programs/Makefile.program 2009-03-30 15:11:28.000000000 +0200 -+++ openswan-2.6.21/programs/Makefile.program 2009-05-22 01:09:17.000000000 +0200 ++++ openswan-2.6.21/programs/Makefile.program 2009-06-13 14:42:38.000000000 +0200 @@ -49,9 +49,9 @@ CFLAGS+=-DFINALCONFFILE=\"${FINALCONFFIL CFLAGS+=-DFINALVARDIR=\"${FINALVARDIR}\" @@ -14,3 +14,89 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ CFLAGS+= ${WERROR} +@@ -108,67 +108,67 @@ endif + ifneq ($(NOINSTALL),true) + + doinstall:: $(PROGRAM) $(CONFFILES) $(EXTRA8MAN) $(EXTRA5MAN) $(EXTRA5PROC) $(LIBFILES) $(CONFDFILES) +- @mkdir -p $(PROGRAMDIR) $(MANDIR8) $(MANDIR5) $(LIBDIR) $(CONFDIR) $(CONFDDIR) $(CONFDDIR)/$(CONFDSUBDIR) $(EXAMPLECONFDIR) ++ mkdir -p $(PROGRAMDIR) $(MANDIR8) $(MANDIR5) $(LIBDIR) $(CONFDIR) $(CONFDDIR) $(CONFDDIR)/$(CONFDSUBDIR) $(EXAMPLECONFDIR) + @if [ -n "$(PROGRAM)" ]; then $(INSTALL) $(INSTBINFLAGS) $(PROGRAM) $(PROGRAMDIR); fi +- @$(foreach f, $(addsuffix .8, $(PROGRAM)), \ ++ $(foreach f, $(addsuffix .8, $(PROGRAM)), \ + g=`if [ -r $f ]; then echo $f; else echo ${srcdir}/$f; fi`; \ + $(INSTALL) $(INSTMANFLAGS) $$g $(MANDIR8)/$(MANPROGPREFIX)$f || exit 1; \ + ) +- @$(foreach f, $(EXTRA8MAN), \ ++ $(foreach f, $(EXTRA8MAN), \ + g=`if [ -r $f ]; then echo $f; else echo ${srcdir}/$f; fi`; \ + $(INSTALL) $(INSTMANFLAGS) $$g $(MANDIR8)/ipsec_$f || exit 1; \ + ) +- @$(foreach f, $(EXTRA5MAN), \ ++ $(foreach f, $(EXTRA5MAN), \ + g=`if [ -r $f ]; then echo $f; else echo ${srcdir}/$f; fi`; \ + $(INSTALL) $(INSTMANFLAGS) $$g $(MANDIR5)/$f || exit 1 ;\ + ) +- @$(foreach f, $(EXTRA5PROC), \ ++ $(foreach f, $(EXTRA5PROC), \ + g=`if [ -r $f ]; then echo $f; else echo ${srcdir}/$f; fi`; \ + $(INSTALL) $(INSTMANFLAGS) $$g $(MANDIR5)/ipsec_$f || exit 1 ;\ + ) +- @$(foreach f, $(LIBFILES), \ ++ $(foreach f, $(LIBFILES), \ + g=`if [ -r $f ]; then echo $f; else echo ${srcdir}/$f; fi`; \ + $(INSTALL) $(INSTCONFFLAGS) $$g $(LIBDIR)/$f || exit 1 ;\ + ) +- @$(foreach f, $(CONFFILES), \ ++ $(foreach f, $(CONFFILES), \ + g=`if [ -r $f ]; then echo $f; else echo ${srcdir}/$f; fi`; \ + if [ ! -f $(CONFDIR)/$f ]; then $(INSTALL) $(INSTCONFFLAGS) $$g $(CONFDIR)/$f || exit 1; fi;\ + $(INSTALL) $(INSTCONFFLAGS) $$g $(EXAMPLECONFDIR)/$f-sample || exit 1; \ + ) +- @$(foreach f, $(EXCONFFILES), \ ++ $(foreach f, $(EXCONFFILES), \ + g=`if [ -r $f ]; then echo $f; else echo ${srcdir}/$f; fi`; \ + $(INSTALL) $(INSTCONFFLAGS) $$g $(EXAMPLECONFDIR)/$f-sample || exit 1; \ + ) +- @$(foreach f, $(CONFDFILES), \ ++ $(foreach f, $(CONFDFILES), \ + g=`if [ -r $f ]; then echo $f; else echo ${srcdir}/$f; fi`; \ + if [ ! -f $(CONFDDIR)/$(CONFDSUBDIR)/$f ]; then $(INSTALL) $(INSTCONFFLAGS) $$g $(CONFDDIR)/$(CONFDSUBDIR)/$f || exit 1; fi;\ + ) + + install_file_list:: +- @if [ -n "$(PROGRAM)" ]; then echo $(PROGRAMDIR)/$(PROGRAM); fi +- @$(foreach f, $(addsuffix .8, $(PROGRAM)), \ ++ if [ -n "$(PROGRAM)" ]; then echo $(PROGRAMDIR)/$(PROGRAM); fi ++ $(foreach f, $(addsuffix .8, $(PROGRAM)), \ + echo $(MANDIR8)/${MANPROGPREFIX}$f; \ + ) +- @$(foreach f, $(EXTRA8MAN), \ ++ $(foreach f, $(EXTRA8MAN), \ + echo $(MANDIR8)/ipsec_$f; \ + ) +- @$(foreach f, $(EXTRA5MAN), \ ++ $(foreach f, $(EXTRA5MAN), \ + echo $(MANDIR5)/$f;\ + ) +- @$(foreach f, $(EXTRA5PROC), \ ++ $(foreach f, $(EXTRA5PROC), \ + echo $(MANDIR5)/ipsec_$f; \ + ) +- @$(foreach f, $(LIBFILES), \ ++ $(foreach f, $(LIBFILES), \ + echo $(LIBDIR)/$f;\ + ) +- @$(foreach f, $(CONFFILES), \ ++ $(foreach f, $(CONFFILES), \ + echo $(CONFDIR)/$f;\ + echo $(EXAMPLECONFDIR)/$f-sample;\ + ) +- @$(foreach f, $(EXCONFFILES), \ ++ $(foreach f, $(EXCONFFILES), \ + echo $(EXAMPLECONFDIR)/$f-sample;\ + ) +- @$(foreach f, $(CONFDFILES), \ ++ $(foreach f, $(CONFDFILES), \ + echo $(CONFDDIR)/${CONFDSUBDIR}/$f;\ + ) + -- cgit v1.2.3