- (bal) PCRE no longer required. Banished from the source along with
fake-regex.h
This commit is contained in:
Ben Lindstrom
parent
ade03f6bad
commit
c97b1affc5
|
|
@ -1,4 +1,8 @@
|
||||||
20011205
|
20011207
|
||||||
|
- (bal) PCRE no longer required. Banished from the source along with
|
||||||
|
fake-regex.h
|
||||||
|
|
||||||
|
20011206
|
||||||
- (bal) OpenBSD CVS Sync
|
- (bal) OpenBSD CVS Sync
|
||||||
- deraadt@cvs.openbsd.org 2001/11/14 20:45:08
|
- deraadt@cvs.openbsd.org 2001/11/14 20:45:08
|
||||||
[sshd.c]
|
[sshd.c]
|
||||||
|
|
@ -6994,4 +6998,4 @@
|
||||||
- Wrote replacements for strlcpy and mkdtemp
|
- Wrote replacements for strlcpy and mkdtemp
|
||||||
- Released 1.0pre1
|
- Released 1.0pre1
|
||||||
|
|
||||||
$Id: ChangeLog,v 1.1687 2001/12/06 18:22:17 mouring Exp $
|
$Id: ChangeLog,v 1.1688 2001/12/07 17:20:47 mouring Exp $
|
||||||
|
|
|
||||||
8
INSTALL
8
INSTALL
|
|
@ -51,12 +51,6 @@ ftp://ftp.gnu.org/gnu/make/
|
||||||
OpenSSH has only been tested with GNU make. It may work with other
|
OpenSSH has only been tested with GNU make. It may work with other
|
||||||
'make' programs, but you are on your own.
|
'make' programs, but you are on your own.
|
||||||
|
|
||||||
PCRE (PERL-compatible Regular Expression library):
|
|
||||||
ftp://ftp.cus.cam.ac.uk/pub/software/programing/pcre/
|
|
||||||
|
|
||||||
Most platforms do not require this. However older Unices may not have a
|
|
||||||
posix regex library. PCRE provides a POSIX interface.
|
|
||||||
|
|
||||||
S/Key Libraries:
|
S/Key Libraries:
|
||||||
http://www.sparc.spb.su/solaris/skey/
|
http://www.sparc.spb.su/solaris/skey/
|
||||||
|
|
||||||
|
|
@ -230,4 +224,4 @@ Please refer to the "reporting bugs" section of the webpage at
|
||||||
http://www.openssh.com/
|
http://www.openssh.com/
|
||||||
|
|
||||||
|
|
||||||
$Id: INSTALL,v 1.46 2001/06/29 12:39:24 mouring Exp $
|
$Id: INSTALL,v 1.47 2001/12/07 17:20:48 mouring Exp $
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
/* $Id: acconfig.h,v 1.119 2001/11/03 19:09:33 tim Exp $ */
|
/* $Id: acconfig.h,v 1.120 2001/12/07 17:20:48 mouring Exp $ */
|
||||||
|
|
||||||
#ifndef _CONFIG_H
|
#ifndef _CONFIG_H
|
||||||
#define _CONFIG_H
|
#define _CONFIG_H
|
||||||
|
|
@ -59,9 +59,6 @@
|
||||||
/* Define if you are on Cygwin */
|
/* Define if you are on Cygwin */
|
||||||
#undef HAVE_CYGWIN
|
#undef HAVE_CYGWIN
|
||||||
|
|
||||||
/* Define if you lack native POSIX regex and you are using PCRE */
|
|
||||||
#undef HAVE_LIBPCRE
|
|
||||||
|
|
||||||
/* Define if you have a broken realpath. */
|
/* Define if you have a broken realpath. */
|
||||||
#undef BROKEN_REALPATH
|
#undef BROKEN_REALPATH
|
||||||
|
|
||||||
|
|
|
||||||
86
configure.ac
86
configure.ac
|
|
@ -1,4 +1,4 @@
|
||||||
# $Id: configure.ac,v 1.5 2001/11/27 01:19:43 tim Exp $
|
# $Id: configure.ac,v 1.6 2001/12/07 17:20:48 mouring Exp $
|
||||||
|
|
||||||
AC_INIT
|
AC_INIT
|
||||||
AC_CONFIG_SRCDIR([ssh.c])
|
AC_CONFIG_SRCDIR([ssh.c])
|
||||||
|
|
@ -317,46 +317,6 @@ AC_ARG_WITH(libs,
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
|
|
||||||
AC_ARG_WITH(pcre,
|
|
||||||
[ --with-pcre[[=PATH]] Override built in regex library with pcre
|
|
||||||
(optionally in PATH)],
|
|
||||||
[
|
|
||||||
case "$withval" in
|
|
||||||
no) ;;
|
|
||||||
*)
|
|
||||||
if test "x$withval" != "xyes"; then
|
|
||||||
if test -d "$withval/lib"; then
|
|
||||||
if test -n "${need_dash_r}"; then
|
|
||||||
LDFLAGS="-L${withval}/lib -R${withval}/lib ${LDFLAGS}"
|
|
||||||
else
|
|
||||||
LDFLAGS="-L${withval}/lib ${LDFLAGS}"
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
if test -n "${need_dash_r}"; then
|
|
||||||
LDFLAGS="-L${withval} -R${withval} ${LDFLAGS}"
|
|
||||||
else
|
|
||||||
LDFLAGS="-L${withval} ${LDFLAGS}"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
if test -d "$withval/include"; then
|
|
||||||
CPPFLAGS="-I${withval}/include ${CPPFLAGS}"
|
|
||||||
else
|
|
||||||
CPPFLAGS="-I${withval} ${CPPFLAGS}"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
AC_CHECK_HEADER(pcreposix.h,
|
|
||||||
AC_CHECK_LIB(pcre, pcre_info,[
|
|
||||||
AC_DEFINE(HAVE_LIBPCRE)
|
|
||||||
LIBS="$LIBS -lpcreposix -lpcre"
|
|
||||||
no_comp_check=yes],
|
|
||||||
AC_MSG_ERROR([*** unable to locate pcre library ***])),
|
|
||||||
AC_MSG_ERROR([*** unable to locate pcreposix.h include file ***]))
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
]
|
|
||||||
)
|
|
||||||
|
|
||||||
# Checks for libraries.
|
# Checks for libraries.
|
||||||
AC_CHECK_FUNC(yp_match, , AC_CHECK_LIB(nsl, yp_match))
|
AC_CHECK_FUNC(yp_match, , AC_CHECK_LIB(nsl, yp_match))
|
||||||
AC_CHECK_FUNC(setsockopt, , AC_CHECK_LIB(socket, setsockopt))
|
AC_CHECK_FUNC(setsockopt, , AC_CHECK_LIB(socket, setsockopt))
|
||||||
|
|
@ -398,48 +358,6 @@ AC_ARG_WITH(zlib,
|
||||||
|
|
||||||
AC_CHECK_LIB(z, deflate, ,AC_MSG_ERROR([*** zlib missing - please install first or check config.log ***]))
|
AC_CHECK_LIB(z, deflate, ,AC_MSG_ERROR([*** zlib missing - please install first or check config.log ***]))
|
||||||
|
|
||||||
# We don't want to check if we did an pcre override.
|
|
||||||
if test -z "$no_comp_check" ; then
|
|
||||||
AC_CHECK_FUNC(regcomp,
|
|
||||||
[
|
|
||||||
AC_CHECK_FUNC(regsub,
|
|
||||||
[
|
|
||||||
has_regcomp=no
|
|
||||||
],
|
|
||||||
[
|
|
||||||
AC_DEFINE(HAVE_REGCOMP)
|
|
||||||
has_regcomp=yes
|
|
||||||
]
|
|
||||||
)
|
|
||||||
],
|
|
||||||
[
|
|
||||||
has_regcomp=no
|
|
||||||
]
|
|
||||||
)
|
|
||||||
# Either regcomp wasn't defined or regsub is defined (which means
|
|
||||||
# that the libc regex is probably an old non-POSIX implementation.
|
|
||||||
# Now check for -lregex and -lpcreposix to find some usable regex
|
|
||||||
# implementation.
|
|
||||||
if test "$has_regcomp" = "no" ; then
|
|
||||||
AC_CHECK_LIB(regex, regcomp,
|
|
||||||
[
|
|
||||||
AC_DEFINE(HAVE_REGCOMP)
|
|
||||||
LIBS="$LIBS -lregex"
|
|
||||||
],
|
|
||||||
[
|
|
||||||
AC_CHECK_LIB(pcre, pcre_info,
|
|
||||||
[
|
|
||||||
AC_DEFINE(HAVE_LIBPCRE)
|
|
||||||
LIBS="$LIBS -lpcreposix -lpcre"
|
|
||||||
],
|
|
||||||
[
|
|
||||||
AC_MSG_ERROR([*** No regex library found.])
|
|
||||||
])
|
|
||||||
]
|
|
||||||
)
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
dnl UnixWare 2.x
|
dnl UnixWare 2.x
|
||||||
AC_CHECK_FUNC(strcasecmp,
|
AC_CHECK_FUNC(strcasecmp,
|
||||||
[], [ AC_CHECK_LIB(resolv, strcasecmp, LIBS="$LIBS -lresolv") ]
|
[], [ AC_CHECK_LIB(resolv, strcasecmp, LIBS="$LIBS -lresolv") ]
|
||||||
|
|
@ -459,7 +377,7 @@ AC_FUNC_STRFTIME
|
||||||
AC_CHECK_HEADERS(bstring.h crypt.h endian.h floatingpoint.h \
|
AC_CHECK_HEADERS(bstring.h crypt.h endian.h floatingpoint.h \
|
||||||
getopt.h glob.h lastlog.h limits.h login.h \
|
getopt.h glob.h lastlog.h limits.h login.h \
|
||||||
login_cap.h maillock.h netdb.h netgroup.h \
|
login_cap.h maillock.h netdb.h netgroup.h \
|
||||||
netinet/in_systm.h paths.h poll.h pty.h regex.h \
|
netinet/in_systm.h paths.h poll.h pty.h \
|
||||||
security/pam_appl.h shadow.h stddef.h stdint.h \
|
security/pam_appl.h shadow.h stddef.h stdint.h \
|
||||||
strings.h sys/bitypes.h sys/bsdtty.h sys/cdefs.h \
|
strings.h sys/bitypes.h sys/bsdtty.h sys/cdefs.h \
|
||||||
sys/poll.h sys/queue.h sys/select.h sys/stat.h \
|
sys/poll.h sys/queue.h sys/select.h sys/stat.h \
|
||||||
|
|
|
||||||
|
|
@ -1,106 +0,0 @@
|
||||||
/* $OpenBSD: regex.h,v 1.3 1997/09/21 10:45:48 niklas Exp $ */
|
|
||||||
/* $NetBSD: regex.h,v 1.4.6.1 1996/06/10 18:57:07 explorer Exp $ */
|
|
||||||
|
|
||||||
/*-
|
|
||||||
* Copyright (c) 1992 Henry Spencer.
|
|
||||||
* Copyright (c) 1992, 1993
|
|
||||||
* The Regents of the University of California. All rights reserved.
|
|
||||||
*
|
|
||||||
* This code is derived from software contributed to Berkeley by
|
|
||||||
* Henry Spencer of the University of Toronto.
|
|
||||||
*
|
|
||||||
* Redistribution and use in source and binary forms, with or without
|
|
||||||
* modification, are permitted provided that the following conditions
|
|
||||||
* are met:
|
|
||||||
* 1. Redistributions of source code must retain the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer.
|
|
||||||
* 2. Redistributions in binary form must reproduce the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer in the
|
|
||||||
* documentation and/or other materials provided with the distribution.
|
|
||||||
* 3. All advertising materials mentioning features or use of this software
|
|
||||||
* must display the following acknowledgement:
|
|
||||||
* This product includes software developed by the University of
|
|
||||||
* California, Berkeley and its contributors.
|
|
||||||
* 4. Neither the name of the University nor the names of its contributors
|
|
||||||
* may be used to endorse or promote products derived from this software
|
|
||||||
* without specific prior written permission.
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
|
|
||||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
||||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
||||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
|
|
||||||
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
||||||
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
||||||
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
||||||
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
||||||
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
||||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
||||||
* SUCH DAMAGE.
|
|
||||||
*
|
|
||||||
* @(#)regex.h 8.1 (Berkeley) 6/2/93
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef _REGEX_H_
|
|
||||||
#define _REGEX_H_
|
|
||||||
|
|
||||||
#include <sys/types.h>
|
|
||||||
|
|
||||||
/* types */
|
|
||||||
typedef off_t regoff_t;
|
|
||||||
|
|
||||||
typedef struct {
|
|
||||||
int re_magic;
|
|
||||||
size_t re_nsub; /* number of parenthesized subexpressions */
|
|
||||||
const char *re_endp; /* end pointer for REG_PEND */
|
|
||||||
struct re_guts *re_g; /* none of your business :-) */
|
|
||||||
} regex_t;
|
|
||||||
|
|
||||||
typedef struct {
|
|
||||||
regoff_t rm_so; /* start of match */
|
|
||||||
regoff_t rm_eo; /* end of match */
|
|
||||||
} regmatch_t;
|
|
||||||
|
|
||||||
/* regcomp() flags */
|
|
||||||
#define REG_BASIC 0000
|
|
||||||
#define REG_EXTENDED 0001
|
|
||||||
#define REG_ICASE 0002
|
|
||||||
#define REG_NOSUB 0004
|
|
||||||
#define REG_NEWLINE 0010
|
|
||||||
#define REG_NOSPEC 0020
|
|
||||||
#define REG_PEND 0040
|
|
||||||
#define REG_DUMP 0200
|
|
||||||
|
|
||||||
/* regerror() flags */
|
|
||||||
#define REG_NOMATCH 1
|
|
||||||
#define REG_BADPAT 2
|
|
||||||
#define REG_ECOLLATE 3
|
|
||||||
#define REG_ECTYPE 4
|
|
||||||
#define REG_EESCAPE 5
|
|
||||||
#define REG_ESUBREG 6
|
|
||||||
#define REG_EBRACK 7
|
|
||||||
#define REG_EPAREN 8
|
|
||||||
#define REG_EBRACE 9
|
|
||||||
#define REG_BADBR 10
|
|
||||||
#define REG_ERANGE 11
|
|
||||||
#define REG_ESPACE 12
|
|
||||||
#define REG_BADRPT 13
|
|
||||||
#define REG_EMPTY 14
|
|
||||||
#define REG_ASSERT 15
|
|
||||||
#define REG_INVARG 16
|
|
||||||
#define REG_ATOI 255 /* convert name to number (!) */
|
|
||||||
#define REG_ITOA 0400 /* convert number to name (!) */
|
|
||||||
|
|
||||||
/* regexec() flags */
|
|
||||||
#define REG_NOTBOL 00001
|
|
||||||
#define REG_NOTEOL 00002
|
|
||||||
#define REG_STARTEND 00004
|
|
||||||
#define REG_TRACE 00400 /* tracing of execution */
|
|
||||||
#define REG_LARGE 01000 /* force large representation */
|
|
||||||
#define REG_BACKR 02000 /* force use of backref code */
|
|
||||||
|
|
||||||
int regcomp(regex_t*, const char*, int);
|
|
||||||
size_t regerror(int, const regex_t*, char*, size_t);
|
|
||||||
int regexec(const regex_t*, const char*, size_t, regmatch_t[], int);
|
|
||||||
void regfree(regex_t*);
|
|
||||||
|
|
||||||
#endif /* !_REGEX_H_ */
|
|
||||||
Loading…
Reference in New Issue