- Fix bugs by enabling curl (and the other one just with a new

  upstream release.)
- Also enable SSH agent interface.

3 files changed, 54 insertions, 27 deletions

diff --git a/debian/changelog b/debian/changelog
index c55cdd1f1..a23584f5e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,14 +1,13 @@
-strongswan (4.2.9-1) UNRELEASED; urgency=low
+strongswan (4.2.9-1) unstable; urgency=low
 
-  * (NOT RELEASED YET) New upstream release
+  * New upstream release, fixes a MOBIKE issue.
+    Closes: #507542: strongswan: endless loop
+  * Explicitly enable compilation with libcurl for CRL fetching
+    Closes: #497756: strongswan: not compiled with curl support; crl 
+                     fetching not available
+  * Enable compilation with SSH agent support.
 
- -- Rene Mayrhofer <rene@mayrhofer.eu.org>  Fri, 05 Dec 2008 17:21:42 +0100
-
-strongswan (4.2.8-1) UNRELEASED; urgency=low
-
-  * (NOT RELEASED YET) New upstream release
-
- -- Rene Mayrhofer <rene@mayrhofer.eu.org>  Wed, 29 Oct 2008 12:23:37 +0100
+ -- Rene Mayrhofer <rmayr@debian.org>  Fri, 05 Dec 2008 17:21:42 +0100
 
 strongswan (4.2.4-5) unstable; urgency=high
 
diff --git a/debian/rules b/debian/rules
index 90ccca852..34053f91b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,12 +12,12 @@ export DEB_BUILD_HARDENING=1
 
 CONFIGUREARGS := --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
 		--libexecdir=/usr/lib \
-		--enable-http --enable-ldap \
+		--enable-http --enable-ldap --enable-curl \
 		--enable-nonblocking --enable-thread \
 		--enable-smartcard --enable-cisco-quirks \
 		--with-default-pkcs11=/usr/lib/opensc-pkcs11.so \
 		--enable-mediation \
-		--enable-openssl \
+		--enable-openssl --enable-agent \
 		--disable-aes --disable-des --disable-fips-prf --disable-gmp \
 		--disable-md5 --disable-sha1 --disable-sha2
 	# Could enable --enable-nat-transport, but this is actually insecure,
diff --git a/src/starter/lex.yy.c b/src/starter/lex.yy.c
index 4b3405eda..659391b9e 100644
--- a/src/starter/lex.yy.c
+++ b/src/starter/lex.yy.c
@@ -8,7 +8,7 @@
 #define FLEX_SCANNER
 #define YY_FLEX_MAJOR_VERSION 2
 #define YY_FLEX_MINOR_VERSION 5
-#define YY_FLEX_SUBMINOR_VERSION 34
+#define YY_FLEX_SUBMINOR_VERSION 35
 #if YY_FLEX_SUBMINOR_VERSION > 0
 #define FLEX_BETA
 #endif
@@ -53,7 +53,6 @@ typedef int flex_int32_t;
 typedef unsigned char flex_uint8_t; 
 typedef unsigned short int flex_uint16_t;
 typedef unsigned int flex_uint32_t;
-#endif /* ! C99 */
 
 /* Limits of integral types. */
 #ifndef INT8_MIN
@@ -84,6 +83,8 @@ typedef unsigned int flex_uint32_t;
 #define UINT32_MAX             (4294967295U)
 #endif
 
+#endif /* ! C99 */
+
 #endif /* ! FLEXINT_H */
 
 #ifdef __cplusplus
@@ -178,13 +179,6 @@ extern FILE *yyin, *yyout;
 
 #define unput(c) yyunput( c, (yytext_ptr)  )
 
-/* The following is because we cannot portably get our hands on size_t
- * (without autoconf's help, which isn't available because we want
- * flex-generated scanners to compile on their own).
- * Given that the standard has decreed that size_t exists since 1989,
- * I guess we can afford to depend on it. Manoj.
- */
-
 #ifndef YY_TYPEDEF_YY_SIZE_T
 #define YY_TYPEDEF_YY_SIZE_T
 typedef size_t yy_size_t;
@@ -618,7 +612,7 @@ int _parser_y_include (const char *filename)
     return 0;
 }
 
-#line 622 "lex.yy.c"
+#line 616 "lex.yy.c"
 
 #define INITIAL 0
 
@@ -636,6 +630,35 @@ int _parser_y_include (const char *filename)
 
 static int yy_init_globals (void );
 
+/* Accessor methods to globals.
+   These are made visible to non-reentrant scanners for convenience. */
+
+int yylex_destroy (void );
+
+int yyget_debug (void );
+
+void yyset_debug (int debug_flag  );
+
+YY_EXTRA_TYPE yyget_extra (void );
+
+void yyset_extra (YY_EXTRA_TYPE user_defined  );
+
+FILE *yyget_in (void );
+
+void yyset_in  (FILE * in_str  );
+
+FILE *yyget_out (void );
+
+void yyset_out  (FILE * out_str  );
+
+int yyget_leng (void );
+
+char *yyget_text (void );
+
+int yyget_lineno (void );
+
+void yyset_lineno (int line_number  );
+
 /* Macros after this point can all be overridden by user definitions in
  * section 1.
  */
@@ -668,7 +691,12 @@ static int input (void );
 
 /* Amount of stuff to slurp up with each read. */
 #ifndef YY_READ_BUF_SIZE
+#ifdef __ia64__
+/* On IA-64, the buffer size is 16k, not 8k */
+#define YY_READ_BUF_SIZE 16384
+#else
 #define YY_READ_BUF_SIZE 8192
+#endif /* __ia64__ */
 #endif
 
 /* Copy whatever the last rule matched to the standard output. */
@@ -676,7 +704,7 @@ static int input (void );
 /* This used to be an fputs(), but since the string might contain NUL's,
  * we now use fwrite().
  */
-#define ECHO fwrite( yytext, yyleng, 1, yyout )
+#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0)
 #endif
 
 /* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
@@ -687,7 +715,7 @@ static int input (void );
 	if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
 		{ \
 		int c = '*'; \
-		int n; \
+		size_t n; \
 		for ( n = 0; n < max_size && \
 			     (c = getc( yyin )) != EOF && c != '\n'; ++n ) \
 			buf[n] = (char) c; \
@@ -775,7 +803,7 @@ YY_DECL
 #line 135 "parser.l"
 
 
-#line 779 "lex.yy.c"
+#line 807 "lex.yy.c"
 
 	if ( !(yy_init) )
 		{
@@ -959,7 +987,7 @@ YY_RULE_SETUP
 #line 185 "parser.l"
 ECHO;
 	YY_BREAK
-#line 963 "lex.yy.c"
+#line 991 "lex.yy.c"
 
 	case YY_END_OF_BUFFER:
 		{
@@ -1681,8 +1709,8 @@ YY_BUFFER_STATE yy_scan_string (yyconst char * yystr )
 
 /** Setup the input buffer state to scan the given bytes. The next call to yylex() will
  * scan from a @e copy of @a bytes.
- * @param bytes the byte buffer to scan
- * @param len the number of bytes in the buffer pointed to by @a bytes.
+ * @param yybytes the byte buffer to scan
+ * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes.
  * 
  * @return the newly allocated buffer state object.
  */