diff options
| author | Rene Mayrhofer <rene@mayrhofer.eu.org> | 2007-06-03 18:57:59 +0000 |
|---|---|---|
| committer | Rene Mayrhofer <rene@mayrhofer.eu.org> | 2007-06-03 18:57:59 +0000 |
| commit | 200ab86b5f3bf87d81b2dd59d6c4c1b01cc75ac8 (patch) | |
| tree | 931c033f13380213524c0a247f4f3d0905080700 | |
| parent | 4050e1112784e1fadb7d6d8477c6a2b2daa27f7c (diff) | |
| download | vyos-strongswan-200ab86b5f3bf87d81b2dd59d6c4c1b01cc75ac8.tar.gz vyos-strongswan-200ab86b5f3bf87d81b2dd59d6c4c1b01cc75ac8.zip | |
- No longer patch for bashism, this fails to build.
- lex.yy.c has been rebuilt (maybe with newer lex).
| -rwxr-xr-x | debian/rules | 9 | ||||
| -rw-r--r-- | src/starter/lex.yy.c | 18 |
2 files changed, 4 insertions, 23 deletions
diff --git a/debian/rules b/debian/rules index 561f71492..1b2c7a2d8 100755 --- a/debian/rules +++ b/debian/rules @@ -98,15 +98,6 @@ install-strongswan: build $(MAKE) install DESTDIR=$(CURDIR)/debian/strongswan install --mode=0600 $(CURDIR)/debian/ipsec.secrets.proto $(CURDIR)/debian/strongswan/etc/ipsec.secrets - # use bash for init.d and _plutorun - # TODO: check if we still need this - patch $(CURDIR)/debian/strongswan/etc/init.d/ipsec < debian/use-bash1.diff - patch $(CURDIR)/debian/strongswan/usr/lib/ipsec/_plutorun < debian/use-bash2.diff - - # install the fswcert tool - #install $(CURDIR)/programs/fswcert/fswcert $(CURDIR)/debian/strongswan/usr/bin - #install $(CURDIR)/programs/fswcert/fswcert.8 $(CURDIR)/debian/strongswan/usr/share/man/man8 - # TODO: check if we still need this rm -f $(CURDIR)/debian/strongswan/etc/init.d/ipsec?* rm -f $(CURDIR)/debian/strongswan/usr/lib/ipsec/_plutorun?* diff --git a/src/starter/lex.yy.c b/src/starter/lex.yy.c index f8e6569f1..b3315f7ce 100644 --- a/src/starter/lex.yy.c +++ b/src/starter/lex.yy.c @@ -1186,7 +1186,7 @@ static int yy_get_next_buffer (void) /* Read in more data. */ YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]), - (yy_n_chars), num_to_read ); + (yy_n_chars), (size_t) num_to_read ); YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars); } @@ -1500,19 +1500,9 @@ static void yy_load_buffer_state (void) yyfree((void *) b ); } -#ifndef _UNISTD_H /* assume unistd.h has isatty() for us */ -#ifdef __cplusplus -extern "C" { -#endif -#ifdef __THROW /* this is a gnuism */ -extern int isatty (int ) __THROW; -#else +#ifndef __cplusplus extern int isatty (int ); -#endif -#ifdef __cplusplus -} -#endif -#endif +#endif /* __cplusplus */ /* Initializes or reinitializes a buffer. * This function is sometimes called more than once on the same buffer, @@ -1700,7 +1690,7 @@ YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size ) /** Setup the input buffer state to scan a string. The next call to yylex() will * scan from a @e copy of @a str. - * @param str a NUL-terminated string to scan + * @param yystr a NUL-terminated string to scan * * @return the newly allocated buffer state object. * @note If you want to scan bytes that may contain NUL values, then use |