- finished initial import of strongswan file tree

- removed a lot of old and unused stuff

5 files changed, 13 insertions, 10 deletions

diff --git a/Makefile.inc b/Makefile.inc
index 6b312ccf8..670bf1214 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -33,6 +33,9 @@ SHELL=/bin/sh
 
 ### paths within the source tree
 
+KLIPSINC=${FREESWANSRCDIR}/linux/include
+KLIPSSRC=${FREESWANSRCDIR}/linux/net/ipsec
+
 LIBFREESWANDIR=${FREESWANSRCDIR}/linux/lib/libfreeswan
 FREESWANLIB=${FREESWANSRCDIR}/lib/libfreeswan/libfreeswan.a
 
diff --git a/lib/libfreeswan/Makefile b/lib/libfreeswan/Makefile
index b7d4192c8..50a98b40d 100644
--- a/lib/libfreeswan/Makefile
+++ b/lib/libfreeswan/Makefile
@@ -76,7 +76,7 @@ install:
 	do \
 		$(INSTALL) $(INSTMANFLAGS) $(SRCDIR)/$$f $(MANDIR)/ipsec_$$f || exit 1 ; \
 	done
-	@$(FREESWANSRCDIR)/packaging/utils/manlink $(foreach man, $(MANS), ${SRCDIR}/$(man)) | \
+	@$(FREESWANSRCDIR)/utils/manlink $(foreach man, $(MANS), ${SRCDIR}/$(man)) | \
 	while read from to; \
 	do \
 		ln -s -f ipsec_$$from $(MANDIR)/$$to; \
@@ -88,7 +88,7 @@ install_file_list:
 	do \
 		echo $(MANDIR)/ipsec_$$f;\
 	done;
-	@$(FREESWANSRCDIR)/packaging/utils/manlink $(foreach man, $(MANS), ${SRCDIR}/$(man)) | \
+	@$(FREESWANSRCDIR)/utils/manlink $(foreach man, $(MANS), ${SRCDIR}/$(man)) | \
 	while read from to; \
 	do \
 		echo $(MANDIR)/$$to; \
diff --git a/programs/pluto/Makefile b/programs/pluto/Makefile
index 29e2a9ecd..c2660fd4f 100644
--- a/programs/pluto/Makefile
+++ b/programs/pluto/Makefile
@@ -314,13 +314,13 @@ install: all
 	$(INSTALL) $(INSTBINFLAGS) $(BINNAMEPLUTO) $(BINNAMEWHACK) $(LIBEXECDIR)
 	if $(USE_ADNS) ; then $(INSTALL) $(INSTBINFLAGS) $(BINNAMEADNS)                  $(LIBDIR) ; fi
 	$(INSTALL) $(INSTMANFLAGS) pluto.8 $(PMANDIR)/ipsec_pluto.8
-	sh ${FREESWANSRCDIR}/packaging/utils/manlink pluto.8 | \
+	sh ${FREESWANSRCDIR}/utils/manlink pluto.8 | \
 		while read from to ; \
 		do \
 			ln -s -f ipsec_$$from $(PMANDIR)/$$to; \
 		done
 	$(INSTALL) $(INSTMANFLAGS) ipsec.secrets.5 $(FMANDIR)
-	sh ${FREESWANSRCDIR}/packaging/utils/manlink ipsec.secrets.5 | \
+	sh ${FREESWANSRCDIR}/utils/manlink ipsec.secrets.5 | \
 		while read from to ; \
 		do \
 		 ln -s -f $$from $(FMANDIR)/$$to; \
@@ -331,13 +331,13 @@ install_file_list:
 	@if $(USE_ADNS) ; then echo $(LIBDIR)/$(BINNAMEADNS) ; fi
 	@echo $(LIBEXECDIR)/$(BINNAMEWHACK)
 	@echo $(PMANDIR)/ipsec_pluto.8
-	@sh ${FREESWANSRCDIR}/packaging/utils/manlink pluto.8 | \
+	@sh ${FREESWANSRCDIR}/utils/manlink pluto.8 | \
 		while read from to; \
 		do\
 			 echo $(PMANDIR)/$$to; \
 		done
 	@echo $(FMANDIR)/ipsec.secrets.5
-	@sh ${FREESWANSRCDIR}/packaging/utils/manlink ipsec.secrets.5 | \
+	@sh ${FREESWANSRCDIR}/utils/manlink ipsec.secrets.5 | \
 		while read from to; \
 		do \
 			echo $(FMANDIR)/$$to; \
diff --git a/programs/starter/lex.yy.c b/programs/starter/lex.yy.c
index 1626f1050..20d2edb08 100644
--- a/programs/starter/lex.yy.c
+++ b/programs/starter/lex.yy.c
@@ -497,7 +497,7 @@ char *yytext;
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * RCSID $Id: lex.yy.c,v 1.4 2006/03/28 22:32:49 as Exp $
+ * RCSID $Id: parser.l,v 1.5 2006/03/28 22:32:33 as Exp $
  */
 
 #include <string.h>
@@ -1706,10 +1706,10 @@ YY_BUFFER_STATE yy_scan_buffer  (char * base, yy_size_t  size )
  * @note If you want to scan bytes that may contain NUL values, then use
  *       yy_scan_bytes() instead.
  */
-YY_BUFFER_STATE yy_scan_string (yyconst char * __yystr )
+YY_BUFFER_STATE yy_scan_string (yyconst char * yystr )
 {
     
-	return yy_scan_bytes(__yystr,strlen(__yystr) );
+	return yy_scan_bytes(yystr,strlen(yystr) );
 }
 
 /** Setup the input buffer state to scan the given bytes. The next call to yylex() will
diff --git a/programs/starter/parser.tab.c b/programs/starter/parser.tab.c
index bc21a2fd3..7b2349e76 100644
--- a/programs/starter/parser.tab.c
+++ b/programs/starter/parser.tab.c
@@ -99,7 +99,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * RCSID $Id: parser.tab.c,v 1.5 2006/03/28 22:32:49 as Exp $
+ * RCSID $Id: parser.y,v 1.6 2006/01/17 23:43:36 as Exp $
  */
 
 #include <stdio.h>