diff options
author | Dave Woodfall <dave@slackbuilds.org> | 2022-02-04 23:51:22 +0000 |
---|---|---|
committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2022-02-06 11:42:45 +0700 |
commit | 20ea37b60d36d41708511f98aa96d7c0f5fefa46 (patch) | |
tree | a2745a4b69f7649adcff37f9eb8c920b16d17e54 /libraries | |
parent | 55b4713d29eb921d237fda57a14649eb5a25c714 (diff) |
libraries/ptlib: Removed.
Signed-off-by: Dave Woodfall <dave@slackbuilds.org>
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'libraries')
-rw-r--r-- | libraries/ptlib/README | 9 | ||||
-rw-r--r-- | libraries/ptlib/make-4.3.patch | 29 | ||||
-rw-r--r-- | libraries/ptlib/ptlib-2.10.10-mga-bison-parameter.patch | 39 | ||||
-rw-r--r-- | libraries/ptlib/ptlib-2.10.11-bison_fixes-2.patch | 2951 | ||||
-rw-r--r-- | libraries/ptlib/ptlib-2.10.11-openssl11.patch | 212 | ||||
-rw-r--r-- | libraries/ptlib/ptlib-gcc8.patch | 12 | ||||
-rw-r--r-- | libraries/ptlib/ptlib.SlackBuild | 128 | ||||
-rw-r--r-- | libraries/ptlib/ptlib.info | 10 | ||||
-rw-r--r-- | libraries/ptlib/slack-desc | 19 | ||||
-rw-r--r-- | libraries/ptlib/ssl3.patch | 19 |
10 files changed, 0 insertions, 3428 deletions
diff --git a/libraries/ptlib/README b/libraries/ptlib/README deleted file mode 100644 index cdfb6fd88de0f..0000000000000 --- a/libraries/ptlib/README +++ /dev/null @@ -1,9 +0,0 @@ -PTLib - Portable Tools Library - -PTLib is a moderately large class library that has it's genesis many -years ago as PWLib (Portable Windows Library), a method to produce -applications to run on both Microsoft Windows and Unix systems. It -has also been ported to many other systems. -Since then the system has grown to include many classes that assist -in writing complete multi-platform applications. So it became a -Portable Tools Library and was renamed to PTLib. diff --git a/libraries/ptlib/make-4.3.patch b/libraries/ptlib/make-4.3.patch deleted file mode 100644 index eb115f6f041a3..0000000000000 --- a/libraries/ptlib/make-4.3.patch +++ /dev/null @@ -1,29 +0,0 @@ -Index: ptlib-2.10.11/make/common.mak -=================================================================== ---- ptlib-2.10.11.orig/make/common.mak -+++ ptlib-2.10.11/make/common.mak -@@ -370,20 +370,20 @@ ifdef VERSION_FILE - # If not specified, find the various version components in the VERSION_FILE - - ifndef MAJOR_VERSION -- MAJOR_VERSION:=$(strip $(subst \#define,, $(subst $(MAJOR_VERSION_DEFINE),,\ -+ MAJOR_VERSION:=$(strip $(subst #define,, $(subst $(MAJOR_VERSION_DEFINE),,\ - $(shell grep "define *$(MAJOR_VERSION_DEFINE) *" $(VERSION_FILE))))) - endif - ifndef MINOR_VERSION -- MINOR_VERSION:=$(strip $(subst \#define,, $(subst $(MINOR_VERSION_DEFINE),,\ -+ MINOR_VERSION:=$(strip $(subst #define,, $(subst $(MINOR_VERSION_DEFINE),,\ - $(shell grep "define *$(MINOR_VERSION_DEFINE)" $(VERSION_FILE))))) - endif - ifndef BUILD_TYPE -- BUILD_TYPE:=$(strip $(subst \#define,,$(subst BUILD_TYPE,,\ -+ BUILD_TYPE:=$(strip $(subst #define,,$(subst BUILD_TYPE,,\ - $(subst AlphaCode,alpha,$(subst BetaCode,beta,$(subst ReleaseCode,.,\ - $(shell grep "define *BUILD_TYPE" $(VERSION_FILE)))))))) - endif - ifndef BUILD_NUMBER -- BUILD_NUMBER:=$(strip $(subst \#define,,$(subst $(BUILD_NUMBER_DEFINE),,\ -+ BUILD_NUMBER:=$(strip $(subst #define,,$(subst $(BUILD_NUMBER_DEFINE),,\ - $(shell grep "define *$(BUILD_NUMBER_DEFINE)" $(VERSION_FILE))))) - endif - diff --git a/libraries/ptlib/ptlib-2.10.10-mga-bison-parameter.patch b/libraries/ptlib/ptlib-2.10.10-mga-bison-parameter.patch deleted file mode 100644 index fcc8d0d2e7a8c..0000000000000 --- a/libraries/ptlib/ptlib-2.10.10-mga-bison-parameter.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- ptlib-2.10.11/./src/ptlib/common/getdate.y 2013-08-15 01:20:26.000000000 +0200 -+++ /mnt/chroot/cauldron/home/dan/rpm/BUILD/ptlib-2.10.11/src/ptlib/common/getdate.y 2013-12-15 00:24:27.866481490 +0100 -@@ -121,9 +121,9 @@ - static int yylex(); - - #ifdef __GNUC__ --static int yyerror(char const *msg); -+static int yyerror(void *, char const *msg); - #else --static void yyerror(char const *msg); -+static void yyerror(void *, char const *msg); - #endif - - -@@ -132,7 +132,8 @@ - - %} - --%pure_parser -+%pure-parser -+%parse-param {void *parseParam} - - %union { - time_t Number; -@@ -1018,12 +1019,12 @@ - #endif - - #ifdef __GNUC__ --int yyerror(const char * s) -+int yyerror(void *var, const char * s) - { - return 0; - } - #else --static void yyerror(const char * s) -+static void yyerror(void *var, const char * s) - { - } - #endif diff --git a/libraries/ptlib/ptlib-2.10.11-bison_fixes-2.patch b/libraries/ptlib/ptlib-2.10.11-bison_fixes-2.patch deleted file mode 100644 index 7f5d66cf24e89..0000000000000 --- a/libraries/ptlib/ptlib-2.10.11-bison_fixes-2.patch +++ /dev/null @@ -1,2951 +0,0 @@ -Submitted By: Armin K. <krejzi at email dot com> -Updated By: Bruce Dubbs <bduubs at linuxfromscratch dot org> -Date: 2013-08-20 - 2016-05-04 -Initial Package Version: 2.10.10 -Upstream Status: Reported -Origin: Self -Description: Adds pregenerated C file which isn't generated correctly - with Bison 3.0. -Update: Add fixes for gcc-6 - -diff -Naur ptlib-2.10.11.orig/include/ptlib/critsec.h ptlib-2.10.11/include/ptlib/critsec.h ---- ptlib-2.10.11.orig/include/ptlib/critsec.h 2013-08-14 18:20:32.000000000 -0500 -+++ ptlib-2.10.11/include/ptlib/critsec.h 2016-05-04 19:40:01.626203961 -0500 -@@ -40,7 +40,7 @@ - #if P_HAS_ATOMIC_INT - - #if defined(__GNUC__) --# if __GNUC__ >= 4 && __GNUC_MINOR__ >= 2 -+# if (__GNUC__ >= 4 && __GNUC_MINOR__ >= 2) || __GNUC__ >= 5 - # include <ext/atomicity.h> - # else - # include <bits/atomicity.h> -diff -Naur ptlib-2.10.11.orig/make/unix.mak ptlib-2.10.11/make/unix.mak ---- ptlib-2.10.11.orig/make/unix.mak 2013-08-14 18:20:27.000000000 -0500 -+++ ptlib-2.10.11/make/unix.mak 2016-05-04 19:38:50.921583820 -0500 -@@ -729,4 +729,6 @@ - - LDLIBS += -l$(PTLIB_BASE)$(LIB_TYPE) - -+STDCCFLAGS += -Wno-deprecated-declarations -+ - # End of unix.mak -diff -Naur ptlib-2.10.11.orig/src/ptlib/common/getdate.tab.c ptlib-2.10.11/src/ptlib/common/getdate.tab.c ---- ptlib-2.10.11.orig/src/ptlib/common/getdate.tab.c 1969-12-31 18:00:00.000000000 -0600 -+++ ptlib-2.10.11/src/ptlib/common/getdate.tab.c 2016-05-04 19:38:59.892281859 -0500 -@@ -0,0 +1,2884 @@ -+/* A Bison parser, made by GNU Bison 2.7.12-4996. */ -+ -+/* Bison implementation for Yacc-like parsers in C -+ -+ Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc. -+ -+ This program is free software: you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation, either version 3 of the License, or -+ (at your option) any later version. -+ -+ This program is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program. If not, see <http://www.gnu.org/licenses/>. */ -+ -+/* As a special exception, you may create a larger work that contains -+ part or all of the Bison parser skeleton and distribute that work -+ under terms of your choice, so long as that work isn't itself a -+ parser generator using the skeleton or a modified version thereof -+ as a parser skeleton. Alternatively, if you modify or redistribute -+ the parser skeleton itself, you may (at your option) remove this -+ special exception, which will cause the skeleton and the resulting -+ Bison output files to be licensed under the GNU General Public -+ License without this special exception. -+ -+ This special exception was added by the Free Software Foundation in -+ version 2.2 of Bison. */ -+ -+/* C LALR(1) parser skeleton written by Richard Stallman, by -+ simplifying the original so-called "semantic" parser. */ -+ -+/* All symbols defined below should begin with yy or YY, to avoid -+ infringing on user name space. This should be done even for local -+ variables, as they might otherwise be expanded by user macros. -+ There are some unavoidable exceptions within include files to -+ define necessary library symbols; they are noted "INFRINGES ON -+ USER NAME SPACE" below. */ -+ -+/* Identify Bison output. */ -+#define YYBISON 1 -+ -+/* Bison version. */ -+#define YYBISON_VERSION "2.7.12-4996" -+ -+/* Skeleton name. */ -+#define YYSKELETON_NAME "yacc.c" -+ -+/* Pure parsers. */ -+#define YYPURE 1 -+ -+/* Push parsers. */ -+#define YYPUSH 0 -+ -+/* Pull parsers. */ -+#define YYPULL 1 -+ -+ -+ -+ -+/* Copy the first part of user declarations. */ -+/* Line 371 of yacc.c */ -+#line 1 "ptlib/common/getdate.y" -+ -+/* -+** Originally written by Steven M. Bellovin <smb@research.att.com> while -+** at the University of North Carolina at Chapel Hill. Later tweaked by -+** a couple of people on Usenet. Completely overhauled by Rich $alz -+** <rsalz@bbn.com> and Jim Berets <jberets@bbn.com> in August, 1990; -+** -+** Major hack to coerce it into use with the Equivalence Portable -+** Windows Library. -+** -+** This grammar has 10 shift/reduce conflicts. -+** -+** This code is in the public domain and has no copyright. -+*/ -+/* SUPPRESS 287 on yaccpar_sccsid *//* Unused static variable */ -+/* SUPPRESS 288 on yyerrlab *//* Label unused */ -+ -+ -+#include <time.h> -+#include <string.h> -+#include <ctype.h> -+#include <stdlib.h> -+ -+#ifndef EOF -+#include <stdio.h> -+#endif -+ -+ -+#ifdef _WIN32 -+#ifdef _MSC_VER -+#pragma warning(disable:4131 4701 4996) -+#endif -+#define STDAPICALLTYPE __stdcall -+#define MSDOS -+#else -+#define STDAPICALLTYPE -+#endif -+ -+ -+extern int STDAPICALLTYPE PTimeGetChar(void * stream); -+extern void STDAPICALLTYPE PTimeUngetChar(void * stream, int c); -+int STDAPICALLTYPE PTimeGetDateOrder(); -+int STDAPICALLTYPE PTimeIsMonthName(const char *, int, int); -+int STDAPICALLTYPE PTimeIsDayName(const char *, int, int); -+ -+ -+#define EPOCH 1970 -+#define HOUR(x) ((time_t)(x) * 60) -+#define SECSPERDAY (24L * 60L * 60L) -+ -+ -+/* -+** An entry in the lexical lookup table. -+*/ -+typedef struct _TABLE { -+ char *name; -+ int type; -+ time_t value; -+} TABLE; -+ -+ -+/* -+** Daylight-savings mode: on, off, or not yet known. -+*/ -+typedef enum _DSTMODE { -+ DSTon, DSToff, DSTmaybe -+} DSTMODE; -+ -+/* -+** Meridian: am, pm, or 24-hour style. -+*/ -+typedef enum _MERIDIAN { -+ MERam, MERpm, MER24 -+} MERIDIAN; -+ -+ -+/* -+** Global variables. We could get rid of most of these by using a good -+** union as the yacc stack. (This routine was originally written before -+** yacc had the %union construct.) Maybe someday; right now we only use -+** the %union very rarely. -+*/ -+struct Variables { -+ void *yyInput; -+ DSTMODE yyDSTmode; -+ time_t yyDayOrdinal; -+ time_t yyDayNumber; -+ int yyHaveDate; -+ int yyHaveDay; -+ int yyHaveRel; -+ int yyHaveTime; -+ int yyHaveZone; -+ time_t yyTimezone; -+ time_t yyDay; -+ time_t yyHour; -+ time_t yyMinutes; -+ time_t yyMonth; -+ time_t yySeconds; -+ time_t yyYear; -+ MERIDIAN yyMeridian; -+ time_t yyRelMonth; -+ time_t yyRelSeconds; -+}; -+ -+#define VARIABLE ((struct Variables*)parseParam) -+ -+ -+#define YYPURE 1 -+#define YYLEX_PARAM VARIABLE -+#define YYPARSE_PARAM parseParam -+ -+#define yyparse PTime_yyparse -+#define yylex PTime_yylex -+#define yyerror PTime_yyerror -+ -+#define GCC_VERSION (__GNUC__ * 10000 \ -+ + __GNUC_MINOR__ * 100 \ -+ + __GNUC_PATCHLEVEL__) -+ -+static int yyparse(void *); -+static int yylex(); -+ -+#ifdef __GNUC__ -+static int yyerror(char const *msg); -+#else -+static void yyerror(char const *msg); -+#endif -+ -+ -+static void SetPossibleDate(struct Variables*, time_t, time_t, time_t); -+ -+ -+ -+/* Line 371 of yacc.c */ -+#line 202 "ptlib/common/getdate.tab.c" -+ -+# ifndef YY_NULL -+# if defined __cplusplus && 201103L <= __cplusplus -+# define YY_NULL nullptr -+# else -+# define YY_NULL 0 -+# endif -+# endif -+ -+/* Enabling verbose error messages. */ -+#ifdef YYERROR_VERBOSE -+# undef YYERROR_VERBOSE -+# define YYERROR_VERBOSE 1 -+#else -+# define YYERROR_VERBOSE 0 -+#endif -+ -+ -+/* Enabling traces. */ -+#ifndef YYDEBUG -+# define YYDEBUG 0 -+#endif -+#if YYDEBUG -+extern int yydebug; -+#endif -+ -+/* Tokens. */ -+#ifndef YYTOKENTYPE -+# define YYTOKENTYPE -+ /* Put the tokens into the symbol table, so that GDB and other debuggers -+ know about them. */ -+ enum yytokentype { -+ tAGO = 258, -+ tDAY = 259, -+ tDAYZONE = 260, -+ tID = 261, -+ tMERIDIAN = 262, -+ tMINUTE_UNIT = 263, -+ tMONTH = 264, -+ tMONTH_UNIT = 265, -+ tSNUMBER = 266, -+ tS4DIGITNUMBER = 267, -+ tUNUMBER = 268, -+ t4DIGITNUMBER = 269, -+ t6DIGITNUMBER = 270, -+ t8DIGITNUMBER = 271, -+ tSEC_UNIT = 272, -+ tZONE = 273, -+ tMILZONE = 274, -+ tRFC3339 = 275, -+ tDST = 276 -+ }; -+#endif -+ -+ -+#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED -+typedef union YYSTYPE -+{ -+/* Line 387 of yacc.c */ -+#line 137 "ptlib/common/getdate.y" -+ -+ time_t Number; -+ enum _MERIDIAN Meridian; -+ -+ -+/* Line 387 of yacc.c */ -+#line 269 "ptlib/common/getdate.tab.c" -+} YYSTYPE; -+# define YYSTYPE_IS_TRIVIAL 1 -+# define yystype YYSTYPE /* obsolescent; will be withdrawn */ -+# define YYSTYPE_IS_DECLARED 1 -+#endif -+ -+ -+#ifdef YYPARSE_PARAM -+#if defined __STDC__ || defined __cplusplus -+int yyparse (void *YYPARSE_PARAM); -+#else -+int yyparse (); -+#endif -+#else /* ! YYPARSE_PARAM */ -+#if defined __STDC__ || defined __cplusplus -+int yyparse (void); -+#else -+int yyparse (); -+#endif -+#endif /* ! YYPARSE_PARAM */ -+ -+ -+ -+/* Copy the second part of user declarations. */ -+ -+/* Line 390 of yacc.c */ -+#line 296 "ptlib/common/getdate.tab.c" -+ -+#ifdef short -+# undef short -+#endif -+ -+#ifdef YYTYPE_UINT8 -+typedef YYTYPE_UINT8 yytype_uint8; -+#else -+typedef unsigned char yytype_uint8; -+#endif -+ -+#ifdef YYTYPE_INT8 -+typedef YYTYPE_INT8 yytype_int8; -+#elif (defined __STDC__ || defined __C99__FUNC__ \ -+ || defined __cplusplus || defined _MSC_VER) -+typedef signed char yytype_int8; -+#else -+typedef short int yytype_int8; -+#endif -+ -+#ifdef YYTYPE_UINT16 -+typedef YYTYPE_UINT16 yytype_uint16; -+#else -+typedef unsigned short int yytype_uint16; -+#endif -+ -+#ifdef YYTYPE_INT16 -+typedef YYTYPE_INT16 yytype_int16; -+#else -+typedef short int yytype_int16; -+#endif -+ -+#ifndef YYSIZE_T -+# ifdef __SIZE_TYPE__ -+# define YYSIZE_T __SIZE_TYPE__ -+# elif defined size_t -+# define YYSIZE_T size_t -+# elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \ -+ || defined __cplusplus || defined _MSC_VER) -+# include <stddef.h> /* INFRINGES ON USER NAME SPACE */ -+# define YYSIZE_T size_t -+# else -+# define YYSIZE_T unsigned int -+# endif -+#endif -+ -+#define YYSIZE_MAXIMUM ((YYSIZE_T) -1) -+ -+#ifndef YY_ -+# if defined YYENABLE_NLS && YYENABLE_NLS -+# if ENABLE_NLS -+# include <libintl.h> /* INFRINGES ON USER NAME SPACE */ -+# define YY_(Msgid) dgettext ("bison-runtime", Msgid) -+# endif -+# endif -+# ifndef YY_ -+# define YY_(Msgid) Msgid -+# endif -+#endif -+ -+#ifndef __attribute__ -+/* This feature is available in gcc versions 2.5 and later. */ -+# if (! defined __GNUC__ || __GNUC__ < 2 \ -+ || (__GNUC__ == 2 && __GNUC_MINOR__ < 5)) -+# define __attribute__(Spec) /* empty */ -+# endif -+#endif -+ -+/* Suppress unused-variable warnings by "using" E. */ -+#if ! defined lint || defined __GNUC__ -+# define YYUSE(E) ((void) (E)) -+#else -+# define YYUSE(E) /* empty */ -+#endif -+ -+ -+/* Identity function, used to suppress warnings about constant conditions. */ -+#ifndef lint -+# define YYID(N) (N) -+#else -+#if (defined __STDC__ || defined __C99__FUNC__ \ -+ || defined __cplusplus || defined _MSC_VER) -+static int -+YYID (int yyi) -+#else -+static int -+YYID (yyi) -+ int yyi; -+#endif -+{ -+ return yyi; -+} -+#endif -+ -+#if ! defined yyoverflow || YYERROR_VERBOSE -+ -+/* The parser invokes alloca or malloc; define the necessary symbols. */ -+ -+# ifdef YYSTACK_USE_ALLOCA -+# if YYSTACK_USE_ALLOCA -+# ifdef __GNUC__ -+# define YYSTACK_ALLOC __builtin_alloca -+# elif defined __BUILTIN_VA_ARG_INCR -+# include <alloca.h> /* INFRINGES ON USER NAME SPACE */ -+# elif defined _AIX -+# define YYSTACK_ALLOC __alloca -+# elif defined _MSC_VER -+# include <malloc.h> /* INFRINGES ON USER NAME SPACE */ -+# define alloca _alloca -+# else -+# define YYSTACK_ALLOC alloca -+# if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \ -+ || defined __cplusplus || defined _MSC_VER) -+# include <stdlib.h> /* INFRINGES ON USER NAME SPACE */ -+ /* Use EXIT_SUCCESS as a witness for stdlib.h. */ -+# ifndef EXIT_SUCCESS -+# define EXIT_SUCCESS 0 -+# endif -+# endif -+# endif -+# endif -+# endif -+ -+# ifdef YYSTACK_ALLOC -+ /* Pacify GCC's `empty if-body' warning. */ -+# define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0)) -+# ifndef YYSTACK_ALLOC_MAXIMUM -+ /* The OS might guarantee only one guard page at the bottom of the stack, -+ and a page size can be as small as 4096 bytes. So we cannot safely -+ invoke alloca (N) if N exceeds 4096. Use a slightly smaller number -+ to allow for a few compiler-allocated temporary stack slots. */ -+# define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2006 */ -+# endif -+# else -+# define YYSTACK_ALLOC YYMALLOC -+# define YYSTACK_FREE YYFREE -+# ifndef YYSTACK_ALLOC_MAXIMUM -+# define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM -+# endif -+# if (defined __cplusplus && ! defined EXIT_SUCCESS \ -+ && ! ((defined YYMALLOC || defined malloc) \ -+ && (defined YYFREE || defined free))) -+# include <stdlib.h> /* INFRINGES ON USER NAME SPACE */ -+# ifndef EXIT_SUCCESS -+# define EXIT_SUCCESS 0 -+# endif -+# endif -+# ifndef YYMALLOC -+# define YYMALLOC malloc -+# if ! defined malloc && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \ -+ || defined __cplusplus || defined _MSC_VER) -+void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */ -+# endif -+# endif -+# ifndef YYFREE -+# define YYFREE free -+# if ! defined free && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \ -+ || defined __cplusplus || defined _MSC_VER) -+void free (void *); /* INFRINGES ON USER NAME SPACE */ -+# endif -+# endif -+# endif -+#endif /* ! defined yyoverflow || YYERROR_VERBOSE */ -+ -+ -+#if (! defined yyoverflow \ -+ && (! defined __cplusplus \ -+ || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL))) -+ -+/* A type that is properly aligned for any stack member. */ -+union yyalloc -+{ -+ yytype_int16 yyss_alloc; -+ YYSTYPE yyvs_alloc; -+}; -+ -+/* The size of the maximum gap between one aligned stack and the next. */ -+# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1) -+ -+/* The size of an array large to enough to hold all stacks, each with -+ N elements. */ -+# define YYSTACK_BYTES(N) \ -+ ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \ -+ + YYSTACK_GAP_MAXIMUM) -+ -+# define YYCOPY_NEEDED 1 -+ -+/* Relocate STACK from its old location to the new one. The -+ local variables YYSIZE and YYSTACKSIZE give the old and new number of -+ elements in the stack, and YYPTR gives the new location of the -+ stack. Advance YYPTR to a properly aligned location for the next -+ stack. */ -+# define YYSTACK_RELOCATE(Stack_alloc, Stack) \ -+ do \ -+ { \ -+ YYSIZE_T yynewbytes; \ -+ YYCOPY (&yyptr->Stack_alloc, Stack, yysize); \ -+ Stack = &yyptr->Stack_alloc; \ -+ yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \ -+ yyptr += yynewbytes / sizeof (*yyptr); \ -+ } \ -+ while (YYID (0)) -+ -+#endif -+ -+#if defined YYCOPY_NEEDED && YYCOPY_NEEDED -+/* Copy COUNT objects from SRC to DST. The source and destination do -+ not overlap. */ -+# ifndef YYCOPY -+# if defined __GNUC__ && 1 < __GNUC__ -+# define YYCOPY(Dst, Src, Count) \ -+ __builtin_memcpy (Dst, Src, (Count) * sizeof (*(Src))) -+# else -+# define YYCOPY(Dst, Src, Count) \ -+ do \ -+ { \ -+ YYSIZE_T yyi; \ -+ for (yyi = 0; yyi < (Count); yyi++) \ -+ (Dst)[yyi] = (Src)[yyi]; \ -+ } \ -+ while (YYID (0)) -+# endif -+# endif -+#endif /* !YYCOPY_NEEDED */ -+ -+/* YYFINAL -- State number of the termination state. */ -+#define YYFINAL 2 -+/* YYLAST -- Last index in YYTABLE. */ -+#define YYLAST 105 -+ -+/* YYNTOKENS -- Number of terminals. */ -+#define YYNTOKENS 25 -+/* YYNNTS -- Number of nonterminals. */ -+#define YYNNTS 12 -+/* YYNRULES -- Number of rules. */ -+#define YYNRULES 51 -+/* YYNRULES -- Number of states. */ -+#define YYNSTATES 63 -+ -+/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ -+#define YYUNDEFTOK 2 -+#define YYMAXUTOK 276 -+ -+#define YYTRANSLATE(YYX) \ -+ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) -+ -+/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX. */ -+static const yytype_uint8 yytranslate[] = -+{ -+ 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, -+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, -+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, -+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, -+ 2, 2, 2, 2, 23, 2, 2, 24, 2, 2, -+ 2, 2, 2, 2, 2, 2, 2, 2, 22, 2, -+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, -+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, -+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, -+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, -+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, -+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, -+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, -+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, -+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, -+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, -+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, -+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, -+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, -+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, -+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, -+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, -+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, -+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, -+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, -+ 2, 2, 2, 2, 2, 2, 1, 2, 3, 4, -+ 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, -+ 15, 16, 17, 18, 19, 20, 21 -+}; -+ -+#if YYDEBUG -+/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in -+ YYRHS. */ -+static const yytype_uint8 yyprhs[] = -+{ -+ 0, 0, 3, 4, 7, 9, 11, 13, 15, 17, -+ 19, 22, 25, 28, 33, 38, 45, 52, 54, 56, -+ 59, 61, 63, 66, 69, 73, 79, 84, 86, 90, -+ 93, 98, 101, 105, 108, 110, 113, 116, 118, 121, -+ 124, 126, 129, 132, 134, 136, 138, 140, 142, 144, -+ 146, 147 -+}; -+ -+/* YYRHS -- A `-1'-separated list of the rules' RHS. */ -+static const yytype_int8 yyrhs[] = -+{ -+ 26, 0, -1, -1, 26, 27, -1, 28, -1, 29, -+ -1, 31, -1, 30, -1, 32, -1, 35, -1, 13, -+ 7, -1, 14, 12, -1, 15, 12, -1, 34, 22, -+ 34, 36, -1, 34, 22, 34, 12, -1, 34, 22, -+ 34, 22, 34, 36, -1, 34, 22, 34, 22, 34, -+ 12, -1, 18, -1, 5, -1, 18, 21, -1, 19, -+ -1, 4, -1, 4, 23, -1, 34, 4, -1, 34, -+ 24, 34, -1, 34, 24, 34, 24, 34, -1, 34, -+ 11, 11, 20, -1, 16, -1, 34, 9, 11, -1, -+ 9, 34, -1, 9, 34, 23, 34, -1, 34, 9, -+ -1, 34, 9, 34, -1, 33, 3, -1, 33, -1, -+ 34, 8, -1, 11, 8, -1, 8, -1, 11, 17, -+ -1, 34, 17, -1, 17, -1, 11, 10, -1, 34, -+ 10, -1, 10, -1, 13, -1, 14, -1, 15, -1, -+ 13, -1, 14, -1, 15, -1, -1, 7, -1 -+}; -+ -+/* YYRLINE[YYN] -- source line where rule number YYN was defined. */ -+static const yytype_uint16 yyrline[] = -+{ -+ 0, 153, 153, 154, 157, 160, 163, 166, 169, 172, -+ 175, 181, 189, 197, 203, 210, 216, 226, 230, 235, -+ 239, 249, 253, 257, 263, 266, 269, 273, 278, 282, -+ 289, 294, 301, 306, 310, 313, 316, 319, 322, 325, -+ 328, 331, 334, 337, 342, 345, 348, 353, 379, 390, -+ 407, 410 -+}; -+#endif -+ -+#if YYDEBUG || YYERROR_VERBOSE || 0 -+/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM. -+ First, the terminals, then, starting at YYNTOKENS, nonterminals. */ -+static const char *const yytname[] = -+{ -+ "$end", "error", "$undefined", "tAGO", "tDAY", "tDAYZONE", "tID", -+ "tMERIDIAN", "tMINUTE_UNIT", "tMONTH", "tMONTH_UNIT", "tSNUMBER", -+ "tS4DIGITNUMBER", "tUNUMBER", "t4DIGITNUMBER", "t6DIGITNUMBER", -+ "t8DIGITNUMBER", "tSEC_UNIT", "tZONE", "tMILZONE", "tRFC3339", "tDST", -+ "':'", "','", "'/'", "$accept", "spec", "item", "time", "zone", "day", -+ "date", "rel", "relunit", "unumber", "number", "o_merid", YY_NULL -+}; -+#endif -+ -+# ifdef YYPRINT -+/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to -+ token YYLEX-NUM. */ -+static const yytype_uint16 yytoknum[] = -+{ -+ 0, 256, 257, 258, 259, 260, 261, 262, 263, 264, -+ 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, -+ 275, 276, 58, 44, 47 -+}; -+# endif -+ -+/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ -+static const yytype_uint8 yyr1[] = -+{ -+ 0, 25, 26, 26, 27, 27, 27, 27, 27, 27, -+ 28, 28, 28, 28, 28, 28, 28, 29, 29, 29, -+ 29, 30, 30, 30, 31, 31, 31, 31, 31, 31, -+ 31, 31, 31, 32, 32, 33, 33, 33, 33, 33, -+ 33, 33, 33, 33, 34, 34, 34, 35, 35, 35, -+ 36, 36 -+}; -+ -+/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ -+static const yytype_uint8 yyr2[] = -+{ -+ 0, 2, 0, 2, 1, 1, 1, 1, 1, 1, -+ 2, 2, 2, 4, 4, 6, 6, 1, 1, 2, -+ 1, 1, 2, 2, 3, 5, 4, 1, 3, 2, -+ 4, 2, 3, 2, 1, 2, 2, 1, 2, 2, -+ 1, 2, 2, 1, 1, 1, 1, 1, 1, 1, -+ 0, 1 -+}; -+ -+/* YYDEFACT[STATE-NAME] -- Default reduction number in state STATE-NUM. -+ Performed when YYTABLE doesn't specify something else to do. Zero -+ means the default is an error. */ -+static const yytype_uint8 yydefact[] = -+{ -+ 2, 0, 1, 21, 18, 37, 0, 43, 0, 44, -+ 45, 46, 27, 40, 17, 20, 3, 4, 5, 7, -+ 6, 8, 34, 0, 9, 22, 44, 45, 46, 29, -+ 36, 41, 38, 10, 11, 12, 19, 33, 23, 35, -+ 31, 42, 0, 39, 0, 0, 0, 28, 32, 0, -+ 50, 24, 30, 26, 51, 14, 0, 13, 0, 50, -+ 25, 16, 15 -+}; -+ -+/* YYDEFGOTO[NTERM-NUM]. */ -+static const yytype_int8 yydefgoto[] = -+{ -+ -1, 1, 16, 17, 18, 19, 20, 21, 22, 23, -+ 24, 57 -+}; -+ -+/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing -+ STATE-NUM. */ -+#define YYPACT_NINF -27 -+static const yytype_int8 yypact[] = -+{ -+ -27, 49, -27, -10, -27, -27, -11, -27, 1, 10, -+ 69, 86, -27, -27, -9, -27, -27, -27, -27, -27, -+ -27, -27, 13, -3, -27, -27, -27, -27, -27, 8, -+ -27, -27, -27, -27, -27, -27, -27, -27, -27, -27, -+ 30, -27, 9, -27, -11, -11, -11, -27, -27, 12, -+ 15, 18, -27, -27, -27, -27, -11, -27, -11, 23, -+ -27, -27, -27 -+}; -+ -+/* YYPGOTO[NTERM-NUM]. */ -+static const yytype_int8 yypgoto[] = -+{ -+ -27, -27, -27, -27, -27, -27, -27, -27, -27, -6, -+ -27, -26 -+}; -+ -+/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If -+ positive, shift that token. If negative, reduce the rule which -+ number is the opposite. If YYTABLE_NINF, syntax error. */ -+#define YYTABLE_NINF -50 -+static const yytype_int8 yytable[] = -+{ -+ 29, 38, 26, 27, 28, 39, 40, 41, 42, 30, -+ -47, 31, 36, 25, 43, -47, 37, 33, 32, 44, -+ 49, 45, 54, -47, -47, -47, -47, 55, -47, -47, -+ 54, 46, 53, 62, 48, 61, 0, 56, 50, 51, -+ 52, 47, 58, 26, 27, 28, 0, 0, 0, 2, -+ 59, 0, 60, 3, 4, 0, 0, 5, 6, 7, -+ 8, 0, 9, 10, 11, 12, 13, 14, 15, -48, -+ 0, 0, 0, 0, -48, 0, 0, 0, 0, 0, -+ 0, 34, -48, -48, -48, -48, -49, -48, -48, 0, -+ 0, -49, 0, 0, 0, 0, 0, 0, 35, -49, -+ -49, -49, -49, 0, -49, -49 -+}; -+ -+#define yypact_value_is_default(Yystate) \ -+ (!!((Yystate) == (-27))) -+ -+#define yytable_value_is_error(Yytable_value) \ -+ YYID (0) -+ -+static const yytype_int8 yycheck[] = -+{ -+ 6, 4, 13, 14, 15, 8, 9, 10, 11, 8, -+ 0, 10, 21, 23, 17, 5, 3, 7, 17, 22, -+ 11, 24, 7, 13, 14, 15, 16, 12, 18, 19, -+ 7, 23, 20, 59, 40, 12, -1, 22, 44, 45, -+ 46, 11, 24, 13, 14, 15, -1, -1, -1, 0, -+ 56, -1, 58, 4, 5, -1, -1, 8, 9, 10, -+ 11, -1, 13, 14, 15, 16, 17, 18, 19, 0, -+ -1, -1, -1, -1, 5, -1, -1, -1, -1, -1, -+ -1, 12, 13, 14, 15, 16, 0, 18, 19, -1, -+ -1, 5, -1, -1, -1, -1, -1, -1, 12, 13, -+ 14, 15, 16, -1, 18, 19 -+}; -+ -+/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing -+ symbol of state STATE-NUM. */ -+static const yytype_uint8 yystos[] = -+{ -+ 0, 26, 0, 4, 5, 8, 9, 10, 11, 13, -+ 14, 15, 16, 17, 18, 19, 27, 28, 29, 30, -+ 31, 32, 33, 34, 35, 23, 13, 14, 15, 34, -+ 8, 10, 17, 7, 12, 12, 21, 3, 4, 8, -+ 9, 10, 11, 17, 22, 24, 23, 11, 34, 11, -+ 34, 34, 34, 20, 7, 12, 22, 36, 24, 34, -+ 34, 12, 36 -+}; -+ -+#define yyerrok (yyerrstatus = 0) -+#define yyclearin (yychar = YYEMPTY) -+#define YYEMPTY (-2) -+#define YYEOF 0 -+ -+#define YYACCEPT goto yyacceptlab -+#define YYABORT goto yyabortlab -+#define YYERROR goto yyerrorlab -+ -+ -+/* Like YYERROR except do call yyerror. This remains here temporarily -+ to ease the transition to the new meaning of YYERROR, for GCC. -+ Once GCC version 2 has supplanted version 1, this can go. However, -+ YYFAIL appears to be in use. Nevertheless, it is formally deprecated -+ in Bison 2.4.2's NEWS entry, where a plan to phase it out is -+ discussed. */ -+ -+#define YYFAIL goto yyerrlab -+#if defined YYFAIL -+ /* This is here to suppress warnings from the GCC cpp's -+ -Wunused-macros. Normally we don't worry about that warning, but -+ some users do, and we want to make it easy for users to remove -+ YYFAIL uses, which will produce warnings from Bison 2.5. */ -+#endif -+ -+#define YYRECOVERING() (!!yyerrstatus) -+ -+#define YYBACKUP(Token, Value) \ -+do \ -+ if (yychar == YYEMPTY) \ -+ { \ -+ yychar = (Token); \ -+ yylval = (Value); \ -+ YYPOPSTACK (yylen); \ -+ yystate = *yyssp; \ -+ goto yybackup; \ -+ } \ -+ else \ -+ { \ -+ yyerror (YY_("syntax error: cannot back up")); \ -+ YYERROR; \ -+ } \ -+while (YYID (0)) -+ -+/* Error token number */ -+#define YYTERROR 1 -+#define YYERRCODE 256 -+ -+ -+/* This macro is provided for backward compatibility. */ -+#ifndef YY_LOCATION_PRINT -+# define YY_LOCATION_PRINT(File, Loc) ((void) 0) -+#endif -+ -+ -+/* YYLEX -- calling `yylex' with the right arguments. */ -+#ifdef YYLEX_PARAM -+# define YYLEX yylex (&yylval, YYLEX_PARAM) -+#else -+# define YYLEX yylex (&yylval) -+#endif -+ -+/* Enable debugging if requested. */ -+#if YYDEBUG -+ -+# ifndef YYFPRINTF -+# include <stdio.h> /* INFRINGES ON USER NAME SPACE */ -+# define YYFPRINTF fprintf -+# endif -+ -+# define YYDPRINTF(Args) \ -+do { \ -+ if (yydebug) \ -+ YYFPRINTF Args; \ -+} while (YYID (0)) -+ -+# define YY_SYMBOL_PRINT(Title, Type, Value, Location) \ -+do { \ -+ if (yydebug) \ -+ { \ -+ YYFPRINTF (stderr, "%s ", Title); \ -+ yy_symbol_print (stderr, \ -+ Type, Value); \ -+ YYFPRINTF (stderr, "\n"); \ -+ } \ -+} while (YYID (0)) -+ -+ -+/*--------------------------------. -+| Print this symbol on YYOUTPUT. | -+`--------------------------------*/ -+ -+/*ARGSUSED*/ -+#if (defined __STDC__ || defined __C99__FUNC__ \ -+ || defined __cplusplus || defined _MSC_VER) -+static void -+yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep) -+#else -+static void -+yy_symbol_value_print (yyoutput, yytype, yyvaluep) -+ FILE *yyoutput; -+ int yytype; -+ YYSTYPE const * const yyvaluep; -+#endif -+{ -+ FILE *yyo = yyoutput; -+ YYUSE (yyo); -+ if (!yyvaluep) -+ return; -+# ifdef YYPRINT -+ if (yytype < YYNTOKENS) -+ YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep); -+# else -+ YYUSE (yyoutput); -+# endif -+ YYUSE (yytype); -+} -+ -+ -+/*--------------------------------. -+| Print this symbol on YYOUTPUT. | -+`--------------------------------*/ -+ -+#if (defined __STDC__ || defined __C99__FUNC__ \ -+ || defined __cplusplus || defined _MSC_VER) -+static void -+yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep) -+#else -+static void -+yy_symbol_print (yyoutput, yytype, yyvaluep) -+ FILE *yyoutput; -+ int yytype; -+ YYSTYPE const * const yyvaluep; -+#endif -+{ -+ if (yytype < YYNTOKENS) -+ YYFPRINTF (yyoutput, "token %s (", yytname[yytype]); -+ else -+ YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]); -+ -+ yy_symbol_value_print (yyoutput, yytype, yyvaluep); -+ YYFPRINTF (yyoutput, ")"); -+} -+ -+/*------------------------------------------------------------------. -+| yy_stack_print -- Print the state stack from its BOTTOM up to its | -+| TOP (included). | -+`------------------------------------------------------------------*/ -+ -+#if (defined __STDC__ || defined __C99__FUNC__ \ -+ || defined __cplusplus || defined _MSC_VER) -+static void -+yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop) -+#else -+static void -+yy_stack_print (yybottom, yytop) -+ yytype_int16 *yybottom; -+ yytype_int16 *yytop; -+#endif -+{ -+ YYFPRINTF (stderr, "Stack now"); -+ for (; yybottom <= yytop; yybottom++) -+ { -+ int yybot = *yybottom; -+ YYFPRINTF (stderr, " %d", yybot); -+ } -+ YYFPRINTF (stderr, "\n"); -+} -+ -+# define YY_STACK_PRINT(Bottom, Top) \ -+do { \ -+ if (yydebug) \ -+ yy_stack_print ((Bottom), (Top)); \ -+} while (YYID (0)) -+ -+ -+/*------------------------------------------------. -+| Report that the YYRULE is going to be reduced. | -+`------------------------------------------------*/ -+ -+#if (defined __STDC__ || defined __C99__FUNC__ \ -+ || defined __cplusplus || defined _MSC_VER) -+static void -+yy_reduce_print (YYSTYPE *yyvsp, int yyrule) -+#else -+static void -+yy_reduce_print (yyvsp, yyrule) -+ YYSTYPE *yyvsp; -+ int yyrule; -+#endif -+{ -+ int yynrhs = yyr2[yyrule]; -+ int yyi; -+ unsigned long int yylno = yyrline[yyrule]; -+ YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n", -+ yyrule - 1, yylno); -+ /* The symbols being reduced. */ -+ for (yyi = 0; yyi < yynrhs; yyi++) -+ { -+ YYFPRINTF (stderr, " $%d = ", yyi + 1); -+ yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi], -+ &(yyvsp[(yyi + 1) - (yynrhs)]) -+ ); -+ YYFPRINTF (stderr, "\n"); -+ } -+} -+ -+# define YY_REDUCE_PRINT(Rule) \ -+do { \ -+ if (yydebug) \ -+ yy_reduce_print (yyvsp, Rule); \ -+} while (YYID (0)) -+ -+/* Nonzero means print parse trace. It is left uninitialized so that -+ multiple parsers can coexist. */ -+int yydebug; -+#else /* !YYDEBUG */ -+# define YYDPRINTF(Args) -+# define YY_SYMBOL_PRINT(Title, Type, Value, Location) -+# define YY_STACK_PRINT(Bottom, Top) -+# define YY_REDUCE_PRINT(Rule) -+#endif /* !YYDEBUG */ -+ -+ -+/* YYINITDEPTH -- initial size of the parser's stacks. */ -+#ifndef YYINITDEPTH -+# define YYINITDEPTH 200 -+#endif -+ -+/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only -+ if the built-in stack extension method is used). -+ -+ Do not make this value too large; the results are undefined if -+ YYSTACK_ALLOC_MAXIMUM < YYSTACK_BYTES (YYMAXDEPTH) -+ evaluated with infinite-precision integer arithmetic. */ -+ -+#ifndef YYMAXDEPTH -+# define YYMAXDEPTH 10000 -+#endif -+ -+ -+#if YYERROR_VERBOSE -+ -+# ifndef yystrlen -+# if defined __GLIBC__ && defined _STRING_H -+# define yystrlen strlen -+# else -+/* Return the length of YYSTR. */ -+#if (defined __STDC__ || defined __C99__FUNC__ \ -+ || defined __cplusplus || defined _MSC_VER) -+static YYSIZE_T -+yystrlen (const char *yystr) -+#else -+static YYSIZE_T -+yystrlen (yystr) -+ const char *yystr; -+#endif -+{ -+ YYSIZE_T yylen; -+ for (yylen = 0; yystr[yylen]; yylen++) -+ continue; -+ return yylen; -+} -+# endif -+# endif -+ -+# ifndef yystpcpy -+# if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE -+# define yystpcpy stpcpy -+# else -+/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in -+ YYDEST. */ -+#if (defined __STDC__ || defined __C99__FUNC__ \ -+ || defined __cplusplus || defined _MSC_VER) -+static char * -+yystpcpy (char *yydest, const char *yysrc) -+#else -+static char * -+yystpcpy (yydest, yysrc) -+ char *yydest; -+ const char *yysrc; -+#endif -+{ -+ char *yyd = yydest; -+ const char *yys = yysrc; -+ -+ while ((*yyd++ = *yys++) != '\0') -+ continue; -+ -+ return yyd - 1; -+} -+# endif -+# endif -+ -+# ifndef yytnamerr -+/* Copy to YYRES the contents of YYSTR after stripping away unnecessary -+ quotes and backslashes, so that it's suitable for yyerror. The -+ heuristic is that double-quoting is unnecessary unless the string -+ contains an apostrophe, a comma, or backslash (other than -+ backslash-backslash). YYSTR is taken from yytname. If YYRES is -+ null, do not copy; instead, return the length of what the result -+ would have been. */ -+static YYSIZE_T -+yytnamerr (char *yyres, const char *yystr) -+{ -+ if (*yystr == '"') -+ { -+ YYSIZE_T yyn = 0; -+ char const *yyp = yystr; -+ -+ for (;;) -+ switch (*++yyp) -+ { -+ case '\'': -+ case ',': -+ goto do_not_strip_quotes; -+ -+ case '\\': -+ if (*++yyp != '\\') -+ goto do_not_strip_quotes; -+ /* Fall through. */ -+ default: -+ if (yyres) -+ yyres[yyn] = *yyp; -+ yyn++; -+ break; -+ -+ case '"': -+ if (yyres) -+ yyres[yyn] = '\0'; -+ return yyn; -+ } -+ do_not_strip_quotes: ; -+ } -+ -+ if (! yyres) -+ return yystrlen (yystr); -+ -+ return yystpcpy (yyres, yystr) - yyres; -+} -+# endif -+ -+/* Copy into *YYMSG, which is of size *YYMSG_ALLOC, an error message -+ about the unexpected token YYTOKEN for the state stack whose top is -+ YYSSP. -+ -+ Return 0 if *YYMSG was successfully written. Return 1 if *YYMSG is -+ not large enough to hold the message. In that case, also set -+ *YYMSG_ALLOC to the required number of bytes. Return 2 if the -+ required number of bytes is too large to store. */ -+static int -+yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg, -+ yytype_int16 *yyssp, int yytoken) -+{ -+ YYSIZE_T yysize0 = yytnamerr (YY_NULL, yytname[yytoken]); -+ YYSIZE_T yysize = yysize0; -+ enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 }; -+ /* Internationalized format string. */ -+ const char *yyformat = YY_NULL; -+ /* Arguments of yyformat. */ -+ char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM]; -+ /* Number of reported tokens (one for the "unexpected", one per -+ "expected"). */ -+ int yycount = 0; -+ -+ /* There are many possibilities here to consider: -+ - Assume YYFAIL is not used. It's too flawed to consider. See -+ <http://lists.gnu.org/archive/html/bison-patches/2009-12/msg00024.html> -+ for details. YYERROR is fine as it does not invoke this -+ function. -+ - If this state is a consistent state with a default action, then -+ the only way this function was invoked is if the default action -+ is an error action. In that case, don't check for expected -+ tokens because there are none. -+ - The only way there can be no lookahead present (in yychar) is if -+ this state is a consistent state with a default action. Thus, -+ detecting the absence of a lookahead is sufficient to determine -+ that there is no unexpected or expected token to report. In that -+ case, just report a simple "syntax error". -+ - Don't assume there isn't a lookahead just because this state is a -+ consistent state with a default action. There might have been a -+ previous inconsistent state, consistent state with a non-default -+ action, or user semantic action that manipulated yychar. -+ - Of course, the expected token list depends on states to have -+ correct lookahead information, and it depends on the parser not -+ to perform extra reductions after fetching a lookahead from the -+ scanner and before detecting a syntax error. Thus, state merging -+ (from LALR or IELR) and default reductions corrupt the expected -+ token list. However, the list is correct for canonical LR with -+ one exception: it will still contain any token that will not be -+ accepted due to an error action in a later state. -+ */ -+ if (yytoken != YYEMPTY) -+ { -+ int yyn = yypact[*yyssp]; -+ yyarg[yycount++] = yytname[yytoken]; -+ if (!yypact_value_is_default (yyn)) -+ { -+ /* Start YYX at -YYN if negative to avoid negative indexes in -+ YYCHECK. In other words, skip the first -YYN actions for -+ this state because they are default actions. */ -+ int yyxbegin = yyn < 0 ? -yyn : 0; -+ /* Stay within bounds of both yycheck and yytname. */ -+ int yychecklim = YYLAST - yyn + 1; -+ int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS; -+ int yyx; -+ -+ for (yyx = yyxbegin; yyx < yyxend; ++yyx) -+ if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR -+ && !yytable_value_is_error (yytable[yyx + yyn])) -+ { -+ if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM) -+ { -+ yycount = 1; -+ yysize = yysize0; -+ break; -+ } -+ yyarg[yycount++] = yytname[yyx]; -+ { -+ YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULL, yytname[yyx]); -+ if (! (yysize <= yysize1 -+ && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) -+ return 2; -+ yysize = yysize1; -+ } -+ } -+ } -+ } -+ -+ switch (yycount) -+ { -+# define YYCASE_(N, S) \ -+ case N: \ -+ yyformat = S; \ -+ break -+ YYCASE_(0, YY_("syntax error")); -+ YYCASE_(1, YY_("syntax error, unexpected %s")); -+ YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s")); -+ YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s")); -+ YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s")); -+ YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s")); -+# undef YYCASE_ -+ } -+ -+ { -+ YYSIZE_T yysize1 = yysize + yystrlen (yyformat); -+ if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) -+ return 2; -+ yysize = yysize1; -+ } -+ -+ if (*yymsg_alloc < yysize) -+ { -+ *yymsg_alloc = 2 * yysize; -+ if (! (yysize <= *yymsg_alloc -+ && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM)) -+ *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM; -+ return 1; -+ } -+ -+ /* Avoid sprintf, as that infringes on the user's name space. -+ Don't have undefined behavior even if the translation -+ produced a string with the wrong number of "%s"s. */ -+ { -+ char *yyp = *yymsg; -+ int yyi = 0; -+ while ((*yyp = *yyformat) != '\0') -+ if (*yyp == '%' && yyformat[1] == 's' && yyi < yycount) -+ { -+ yyp += yytnamerr (yyp, yyarg[yyi++]); -+ yyformat += 2; -+ } -+ else -+ { -+ yyp++; -+ yyformat++; -+ } -+ } -+ return 0; -+} -+#endif /* YYERROR_VERBOSE */ -+ -+/*-----------------------------------------------. -+| Release the memory associated to this symbol. | -+`-----------------------------------------------*/ -+ -+/*ARGSUSED*/ -+#if (defined __STDC__ || defined __C99__FUNC__ \ -+ || defined __cplusplus || defined _MSC_VER) -+static void -+yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep) -+#else -+static void -+yydestruct (yymsg, yytype, yyvaluep) -+ const char *yymsg; -+ int yytype; -+ YYSTYPE *yyvaluep; -+#endif -+{ -+ YYUSE (yyvaluep); -+ -+ if (!yymsg) -+ yymsg = "Deleting"; -+ YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp); -+ -+ YYUSE (yytype); -+} -+ -+ -+ -+ -+/*----------. -+| yyparse. | -+`----------*/ -+ -+#ifdef YYPARSE_PARAM -+#if (defined __STDC__ || defined __C99__FUNC__ \ -+ || defined __cplusplus || defined _MSC_VER) -+int -+yyparse (void *YYPARSE_PARAM) -+#else -+int -+yyparse (YYPARSE_PARAM) -+ void *YYPARSE_PARAM; -+#endif -+#else /* ! YYPARSE_PARAM */ -+#if (defined __STDC__ || defined __C99__FUNC__ \ -+ || defined __cplusplus || defined _MSC_VER) -+int -+yyparse (void) -+#else -+int -+yyparse () -+ -+#endif -+#endif -+{ -+/* The lookahead symbol. */ -+int yychar; -+ -+ -+#if defined __GNUC__ && 407 <= __GNUC__ * 100 + __GNUC_MINOR__ -+/* Suppress an incorrect diagnostic about yylval being uninitialized. */ -+# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \ -+ _Pragma ("GCC diagnostic push") \ -+ _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")\ -+ _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"") -+# define YY_IGNORE_MAYBE_UNINITIALIZED_END \ -+ _Pragma ("GCC diagnostic pop") -+#else -+/* Default value used for initialization, for pacifying older GCCs -+ or non-GCC compilers. */ -+static YYSTYPE yyval_default; -+# define YY_INITIAL_VALUE(Value) = Value -+#endif -+#ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN -+# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN -+# define YY_IGNORE_MAYBE_UNINITIALIZED_END -+#endif -+#ifndef YY_INITIAL_VALUE -+# define YY_INITIAL_VALUE(Value) /* Nothing. */ -+#endif -+ -+/* The semantic value of the lookahead symbol. */ -+YYSTYPE yylval YY_INITIAL_VALUE(yyval_default); -+ -+ /* Number of syntax errors so far. */ -+ int yynerrs; -+ -+ int yystate; -+ /* Number of tokens to shift before error messages enabled. */ -+ int yyerrstatus; -+ -+ /* The stacks and their tools: -+ `yyss': related to states. -+ `yyvs': related to semantic values. -+ -+ Refer to the stacks through separate pointers, to allow yyoverflow -+ to reallocate them elsewhere. */ -+ -+ /* The state stack. */ -+ yytype_int16 yyssa[YYINITDEPTH]; -+ yytype_int16 *yyss; -+ yytype_int16 *yyssp; -+ -+ /* The semantic value stack. */ -+ YYSTYPE yyvsa[YYINITDEPTH]; -+ YYSTYPE *yyvs; -+ YYSTYPE *yyvsp; -+ -+ YYSIZE_T yystacksize; -+ -+ int yyn; -+ int yyresult; -+ /* Lookahead token as an internal (translated) token number. */ -+ int yytoken = 0; -+ /* The variables used to return semantic value and location from the -+ action routines. */ -+ YYSTYPE yyval; -+ -+#if YYERROR_VERBOSE -+ /* Buffer for error messages, and its allocated size. */ -+ char yymsgbuf[128]; -+ char *yymsg = yymsgbuf; -+ YYSIZE_T yymsg_alloc = sizeof yymsgbuf; -+#endif -+ -+#define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N)) -+ -+ /* The number of symbols on the RHS of the reduced rule. -+ Keep to zero when no symbol should be popped. */ -+ int yylen = 0; -+ -+ yyssp = yyss = yyssa; -+ yyvsp = yyvs = yyvsa; -+ yystacksize = YYINITDEPTH; -+ -+ YYDPRINTF ((stderr, "Starting parse\n")); -+ -+ yystate = 0; -+ yyerrstatus = 0; -+ yynerrs = 0; -+ yychar = YYEMPTY; /* Cause a token to be read. */ -+ goto yysetstate; -+ -+/*------------------------------------------------------------. -+| yynewstate -- Push a new state, which is found in yystate. | -+`------------------------------------------------------------*/ -+ yynewstate: -+ /* In all cases, when you get here, the value and location stacks -+ have just been pushed. So pushing a state here evens the stacks. */ -+ yyssp++; -+ -+ yysetstate: -+ *yyssp = yystate; -+ -+ if (yyss + yystacksize - 1 <= yyssp) -+ { -+ /* Get the current used size of the three stacks, in elements. */ -+ YYSIZE_T yysize = yyssp - yyss + 1; -+ -+#ifdef yyoverflow -+ { -+ /* Give user a chance to reallocate the stack. Use copies of -+ these so that the &'s don't force the real ones into -+ memory. */ -+ YYSTYPE *yyvs1 = yyvs; -+ yytype_int16 *yyss1 = yyss; -+ -+ /* Each stack pointer address is followed by the size of the -+ data in use in that stack, in bytes. This used to be a -+ conditional around just the two extra args, but that might -+ be undefined if yyoverflow is a macro. */ -+ yyoverflow (YY_("memory exhausted"), -+ &yyss1, yysize * sizeof (*yyssp), -+ &yyvs1, yysize * sizeof (*yyvsp), -+ &yystacksize); -+ -+ yyss = yyss1; -+ yyvs = yyvs1; -+ } -+#else /* no yyoverflow */ -+# ifndef YYSTACK_RELOCATE -+ goto yyexhaustedlab; -+# else -+ /* Extend the stack our own way. */ -+ if (YYMAXDEPTH <= yystacksize) -+ goto yyexhaustedlab; -+ yystacksize *= 2; -+ if (YYMAXDEPTH < yystacksize) -+ yystacksize = YYMAXDEPTH; -+ -+ { -+ yytype_int16 *yyss1 = yyss; -+ union yyalloc *yyptr = -+ (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize)); -+ if (! yyptr) -+ goto yyexhaustedlab; -+ YYSTACK_RELOCATE (yyss_alloc, yyss); -+ YYSTACK_RELOCATE (yyvs_alloc, yyvs); -+# undef YYSTACK_RELOCATE -+ if (yyss1 != yyssa) -+ YYSTACK_FREE (yyss1); -+ } -+# endif -+#endif /* no yyoverflow */ -+ -+ yyssp = yyss + yysize - 1; -+ yyvsp = yyvs + yysize - 1; -+ -+ YYDPRINTF ((stderr, "Stack size increased to %lu\n", -+ (unsigned long int) yystacksize)); -+ -+ if (yyss + yystacksize - 1 <= yyssp) -+ YYABORT; -+ } -+ -+ YYDPRINTF ((stderr, "Entering state %d\n", yystate)); -+ -+ if (yystate == YYFINAL) -+ YYACCEPT; -+ -+ goto yybackup; -+ -+/*-----------. -+| yybackup. | -+`-----------*/ -+yybackup: -+ -+ /* Do appropriate processing given the current state. Read a -+ lookahead token if we need one and don't already have one. */ -+ -+ /* First try to decide what to do without reference to lookahead token. */ -+ yyn = yypact[yystate]; -+ if (yypact_value_is_default (yyn)) -+ goto yydefault; -+ -+ /* Not known => get a lookahead token if don't already have one. */ -+ -+ /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol. */ -+ if (yychar == YYEMPTY) -+ { -+ YYDPRINTF ((stderr, "Reading a token: ")); -+ yychar = YYLEX; -+ } -+ -+ if (yychar <= YYEOF) -+ { -+ yychar = yytoken = YYEOF; -+ YYDPRINTF ((stderr, "Now at end of input.\n")); -+ } -+ else -+ { -+ yytoken = YYTRANSLATE (yychar); -+ YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc); -+ } -+ -+ /* If the proper action on seeing token YYTOKEN is to reduce or to -+ detect an error, take that action. */ -+ yyn += yytoken; -+ if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yytoken) -+ goto yydefault; -+ yyn = yytable[yyn]; -+ if (yyn <= 0) -+ { -+ if (yytable_value_is_error (yyn)) -+ goto yyerrlab; -+ yyn = -yyn; -+ goto yyreduce; -+ } -+ -+ /* Count tokens shifted since error; after three, turn off error -+ status. */ -+ if (yyerrstatus) -+ yyerrstatus--; -+ -+ /* Shift the lookahead token. */ -+ YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc); -+ -+ /* Discard the shifted token. */ -+ yychar = YYEMPTY; -+ -+ yystate = yyn; -+ YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN -+ *++yyvsp = yylval; -+ YY_IGNORE_MAYBE_UNINITIALIZED_END -+ -+ goto yynewstate; -+ -+ -+/*-----------------------------------------------------------. -+| yydefault -- do the default action for the current state. | -+`-----------------------------------------------------------*/ -+yydefault: -+ yyn = yydefact[yystate]; -+ if (yyn == 0) -+ goto yyerrlab; -+ goto yyreduce; -+ -+ -+/*-----------------------------. -+| yyreduce -- Do a reduction. | -+`-----------------------------*/ -+yyreduce: -+ /* yyn is the number of a rule to reduce with. */ -+ yylen = yyr2[yyn]; -+ -+ /* If YYLEN is nonzero, implement the default value of the action: -+ `$$ = $1'. -+ -+ Otherwise, the following line sets YYVAL to garbage. -+ This behavior is undocumented and Bison -+ users should not rely upon it. Assigning to YYVAL -+ unconditionally makes the parser a bit smaller, and it avoids a -+ GCC warning that YYVAL may be used uninitialized. */ -+ yyval = yyvsp[1-yylen]; -+ -+ -+ YY_REDUCE_PRINT (yyn); -+ switch (yyn) -+ { -+ case 4: -+/* Line 1787 of yacc.c */ -+#line 157 "ptlib/common/getdate.y" -+ { -+ VARIABLE->yyHaveTime++; -+ } -+ break; -+ -+ case 5: -+/* Line 1787 of yacc.c */ -+#line 160 "ptlib/common/getdate.y" -+ { -+ VARIABLE->yyHaveZone++; -+ } -+ break; -+ -+ case 6: -+/* Line 1787 of yacc.c */ -+#line 163 "ptlib/common/getdate.y" -+ { -+ VARIABLE->yyHaveDate++; -+ } -+ break; -+ -+ case 7: -+/* Line 1787 of yacc.c */ -+#line 166 "ptlib/common/getdate.y" -+ { -+ VARIABLE->yyHaveDay++; -+ } -+ break; -+ -+ case 8: -+/* Line 1787 of yacc.c */ -+#line 169 "ptlib/common/getdate.y" -+ { -+ VARIABLE->yyHaveRel++; -+ } -+ break; -+ -+ case 10: -+/* Line 1787 of yacc.c */ -+#line 175 "ptlib/common/getdate.y" -+ { -+ VARIABLE->yyHour = (yyvsp[(1) - (2)].Number); -+ VARIABLE->yyMinutes = 0; -+ VARIABLE->yySeconds = 0; -+ VARIABLE->yyMeridian = (yyvsp[(2) - (2)].Meridian); -+ } -+ break; -+ -+ case 11: -+/* Line 1787 of yacc.c */ -+#line 181 "ptlib/common/getdate.y" -+ { -+ VARIABLE->yyHour = (yyvsp[(1) - (2)].Number)/100; -+ VARIABLE->yyMinutes = (yyvsp[(1) - (2)].Number)%100; -+ VARIABLE->yySeconds = 0; -+ VARIABLE->yyMeridian = MER24; -+ VARIABLE->yyDSTmode = DSToff; -+ VARIABLE->yyTimezone = - ((yyvsp[(2) - (2)].Number) % 100 + ((yyvsp[(2) - (2)].Number) / 100) * 60); -+ } -+ break; -+ -+ case 12: -+/* Line 1787 of yacc.c */ -+#line 189 "ptlib/common/getdate.y" -+ { -+ VARIABLE->yyHour = (yyvsp[(1) - (2)].Number)/10000; -+ VARIABLE->yyMinutes = ((yyvsp[(1) - (2)].Number)/100)%100; -+ VARIABLE->yySeconds = (yyvsp[(1) - (2)].Number) % 100; -+ VARIABLE->yyMeridian = MER24; -+ VARIABLE->yyDSTmode = DSToff; -+ VARIABLE->yyTimezone = - ((yyvsp[(2) - (2)].Number) % 100 + ((yyvsp[(2) - (2)].Number) / 100) * 60); -+ } -+ break; -+ -+ case 13: -+/* Line 1787 of yacc.c */ -+#line 197 "ptlib/common/getdate.y" -+ { -+ VARIABLE->yyHour = (yyvsp[(1) - (4)].Number); -+ VARIABLE->yyMinutes = (yyvsp[(3) - (4)].Number); -+ VARIABLE->yySeconds = 0; -+ VARIABLE->yyMeridian = (yyvsp[(4) - (4)].Meridian); -+ } -+ break; -+ -+ case 14: -+/* Line 1787 of yacc.c */ -+#line 203 "ptlib/common/getdate.y" -+ { -+ VARIABLE->yyHour = (yyvsp[(1) - (4)].Number); -+ VARIABLE->yyMinutes = (yyvsp[(3) - (4)].Number); -+ VARIABLE->yyMeridian = MER24; -+ VARIABLE->yyDSTmode = DSToff; -+ VARIABLE->yyTimezone = - ((yyvsp[(4) - (4)].Number) % 100 + ((yyvsp[(4) - (4)].Number) / 100) * 60); -+ } -+ break; -+ -+ case 15: -+/* Line 1787 of yacc.c */ -+#line 210 "ptlib/common/getdate.y" -+ { -+ VARIABLE->yyHour = (yyvsp[(1) - (6)].Number); -+ VARIABLE->yyMinutes = (yyvsp[(3) - (6)].Number); -+ VARIABLE->yySeconds = (yyvsp[(5) - (6)].Number); -+ VARIABLE->yyMeridian = (yyvsp[(6) - (6)].Meridian); -+ } -+ break; -+ -+ case 16: -+/* Line 1787 of yacc.c */ -+#line 216 "ptlib/common/getdate.y" -+ { -+ VARIABLE->yyHour = (yyvsp[(1) - (6)].Number); -+ VARIABLE->yyMinutes = (yyvsp[(3) - (6)].Number); -+ VARIABLE->yySeconds = (yyvsp[(5) - (6)].Number); -+ VARIABLE->yyMeridian = MER24; -+ VARIABLE->yyDSTmode = DSToff; -+ VARIABLE->yyTimezone = - ((yyvsp[(6) - (6)].Number) % 100 + ((yyvsp[(6) - (6)].Number) / 100) * 60); -+ } -+ break; -+ -+ case 17: -+/* Line 1787 of yacc.c */ -+#line 226 "ptlib/common/getdate.y" -+ { -+ VARIABLE->yyTimezone = (yyvsp[(1) - (1)].Number); -+ VARIABLE->yyDSTmode = DSToff; -+ } -+ break; -+ -+ case 18: -+/* Line 1787 of yacc.c */ -+#line 230 "ptlib/common/getdate.y" -+ { -+ VARIABLE->yyTimezone = (yyvsp[(1) - (1)].Number); -+ VARIABLE->yyDSTmode = DSTon; -+ } -+ break; -+ -+ case 19: -+/* Line 1787 of yacc.c */ -+#line 235 "ptlib/common/getdate.y" -+ { -+ VARIABLE->yyTimezone = (yyvsp[(1) - (2)].Number); -+ VARIABLE->yyDSTmode = DSTon; -+ } -+ break; -+ -+ case 20: -+/* Line 1787 of yacc.c */ -+#line 239 "ptlib/common/getdate.y" -+ { -+ if (VARIABLE->yyHaveTime > 0) { -+ VARIABLE->yyTimezone = (yyvsp[(1) - (1)].Number); -+ VARIABLE->yyDSTmode = DSToff; -+ } -+ else -+ VARIABLE->yyHaveZone--; -+ } -+ break; -+ -+ case 21: -+/* Line 1787 of yacc.c */ -+#line 249 "ptlib/common/getdate.y" -+ { -+ VARIABLE->yyDayOrdinal = 1; -+ VARIABLE->yyDayNumber = (yyvsp[(1) - (1)].Number); -+ } -+ break; -+ -+ case 22: -+/* Line 1787 of yacc.c */ -+#line 253 "ptlib/common/getdate.y" -+ { -+ VARIABLE->yyDayOrdinal = 1; -+ VARIABLE->yyDayNumber = (yyvsp[(1) - (2)].Number); -+ } -+ break; -+ -+ case 23: -+/* Line 1787 of yacc.c */ -+#line 257 "ptlib/common/getdate.y" -+ { -+ VARIABLE->yyDayOrdinal = (yyvsp[(1) - (2)].Number); -+ VARIABLE->yyDayNumber = (yyvsp[(2) - (2)].Number); -+ } -+ break; -+ -+ case 24: -+/* Line 1787 of yacc.c */ -+#line 263 "ptlib/common/getdate.y" -+ { -+ SetPossibleDate(VARIABLE, (yyvsp[(1) - (3)].Number), (yyvsp[(3) - (3)].Number), VARIABLE->yyYear); -+ } -+ break; -+ -+ case 25: -+/* Line 1787 of yacc.c */ -+#line 266 "ptlib/common/getdate.y" -+ { -+ SetPossibleDate(VARIABLE, (yyvsp[(1) - (5)].Number), (yyvsp[(3) - (5)].Number), (yyvsp[(5) - (5)].Number)); -+ } -+ break; -+ -+ case 26: -+/* Line 1787 of yacc.c */ -+#line 269 "ptlib/common/getdate.y" -+ { -+ /* ISO 8601 format. yyyy-mm-dd. */ -+ SetPossibleDate(VARIABLE, (yyvsp[(1) - (4)].Number), -(yyvsp[(2) - (4)].Number), -(yyvsp[(3) - (4)].Number)); -+ } -+ break; -+ -+ case 27: -+/* Line 1787 of yacc.c */ -+#line 273 "ptlib/common/getdate.y" -+ { -+ VARIABLE->yyDay= ((yyvsp[(1) - (1)].Number))%100; -+ VARIABLE->yyMonth= ((yyvsp[(1) - (1)].Number)/100)%100; -+ VARIABLE->yyYear = (yyvsp[(1) - (1)].Number)/10000; -+ } -+ break; -+ -+ case 28: -+/* Line 1787 of yacc.c */ -+#line 278 "ptlib/common/getdate.y" -+ { -+ /* e.g. 17-JUN-1992. */ -+ SetPossibleDate(VARIABLE, (yyvsp[(1) - (3)].Number), (yyvsp[(2) - (3)].Number), -(yyvsp[(3) - (3)].Number)); -+ } -+ break; -+ -+ case 29: -+/* Line 1787 of yacc.c */ -+#line 282 "ptlib/common/getdate.y" -+ { -+ VARIABLE->yyMonth = (yyvsp[(1) - (2)].Number); -+ if ((yyvsp[(2) - (2)].Number) > 31) -+ VARIABLE->yyYear = (yyvsp[(2) - (2)].Number); -+ else -+ VARIABLE->yyDay = (yyvsp[(2) - (2)].Number); -+ } -+ break; -+ -+ case 30: -+/* Line 1787 of yacc.c */ -+#line 289 "ptlib/common/getdate.y" -+ { -+ VARIABLE->yyMonth = (yyvsp[(1) - (4)].Number); -+ VARIABLE->yyDay = (yyvsp[(2) - (4)].Number); -+ VARIABLE->yyYear = (yyvsp[(4) - (4)].Number); -+ } -+ break; -+ -+ case 31: -+/* Line 1787 of yacc.c */ -+#line 294 "ptlib/common/getdate.y" -+ { -+ if ((yyvsp[(1) - (2)].Number) > 31) -+ VARIABLE->yyYear = (yyvsp[(1) - (2)].Number); -+ else -+ VARIABLE->yyDay = (yyvsp[(1) - (2)].Number); -+ VARIABLE->yyMonth = (yyvsp[(2) - (2)].Number); -+ } -+ break; -+ -+ case 32: -+/* Line 1787 of yacc.c */ -+#line 301 "ptlib/common/getdate.y" -+ { -+ SetPossibleDate(VARIABLE, (yyvsp[(1) - (3)].Number), (yyvsp[(2) - (3)].Number), (yyvsp[(3) - (3)].Number)); -+ } -+ break; -+ -+ case 33: -+/* Line 1787 of yacc.c */ -+#line 306 "ptlib/common/getdate.y" -+ { -+ VARIABLE->yyRelSeconds = -VARIABLE->yyRelSeconds; -+ VARIABLE->yyRelMonth = -VARIABLE->yyRelMonth; -+ } -+ break; -+ -+ case 35: -+/* Line 1787 of yacc.c */ -+#line 313 "ptlib/common/getdate.y" -+ { -+ VARIABLE->yyRelSeconds += (yyvsp[(1) - (2)].Number) * (yyvsp[(2) - (2)].Number) * 60L; -+ } -+ break; -+ -+ case 36: -+/* Line 1787 of yacc.c */ -+#line 316 "ptlib/common/getdate.y" -+ { -+ VARIABLE->yyRelSeconds += (yyvsp[(1) - (2)].Number) * (yyvsp[(2) - (2)].Number) * 60L; -+ } -+ break; -+ -+ case 37: -+/* Line 1787 of yacc.c */ -+#line 319 "ptlib/common/getdate.y" -+ { -+ VARIABLE->yyRelSeconds += (yyvsp[(1) - (1)].Number) * 60L; -+ } -+ break; -+ -+ case 38: -+/* Line 1787 of yacc.c */ -+#line 322 "ptlib/common/getdate.y" -+ { -+ VARIABLE->yyRelSeconds += (yyvsp[(1) - (2)].Number); -+ } -+ break; -+ -+ case 39: -+/* Line 1787 of yacc.c */ -+#line 325 "ptlib/common/getdate.y" -+ { -+ VARIABLE->yyRelSeconds += (yyvsp[(1) - (2)].Number); -+ } -+ break; -+ -+ case 40: -+/* Line 1787 of yacc.c */ -+#line 328 "ptlib/common/getdate.y" -+ { -+ VARIABLE->yyRelSeconds++; -+ } -+ break; -+ -+ case 41: -+/* Line 1787 of yacc.c */ -+#line 331 "ptlib/common/getdate.y" -+ { -+ VARIABLE->yyRelMonth += (yyvsp[(1) - (2)].Number) * (yyvsp[(2) - (2)].Number); -+ } -+ break; -+ -+ case 42: -+/* Line 1787 of yacc.c */ -+#line 334 "ptlib/common/getdate.y" -+ { -+ VARIABLE->yyRelMonth += (yyvsp[(1) - (2)].Number) * (yyvsp[(2) - (2)].Number); -+ } -+ break; -+ -+ case 43: -+/* Line 1787 of yacc.c */ -+#line 337 "ptlib/common/getdate.y" -+ { -+ VARIABLE->yyRelMonth += (yyvsp[(1) - (1)].Number); -+ } -+ break; -+ -+ case 44: -+/* Line 1787 of yacc.c */ -+#line 342 "ptlib/common/getdate.y" -+ { -+ (yyval.Number) = (yyvsp[(1) - (1)].Number); -+ } -+ break; -+ -+ case 45: -+/* Line 1787 of yacc.c */ -+#line 345 "ptlib/common/getdate.y" -+ { -+ (yyval.Number) = (yyvsp[(1) - (1)].Number); -+ } -+ break; -+ -+ case 46: -+/* Line 1787 of yacc.c */ -+#line 348 "ptlib/common/getdate.y" -+ { -+ (yyval.Number) = (yyvsp[(1) - (1)].Number); -+ } -+ break; -+ -+ case 47: -+/* Line 1787 of yacc.c */ -+#line 353 "ptlib/common/getdate.y" -+ { -+ if (VARIABLE->yyHaveTime && VARIABLE->yyHaveDate && !VARIABLE->yyHaveRel) -+ VARIABLE->yyYear = (yyvsp[(1) - (1)].Number); -+ else { -+ if((yyvsp[(1) - (1)].Number)>240000) { -+ VARIABLE->yyHaveDate++; -+ VARIABLE->yyDay= ((yyvsp[(1) - (1)].Number))%100; -+ VARIABLE->yyMonth= ((yyvsp[(1) - (1)].Number)/100)%100; -+ VARIABLE->yyYear = (yyvsp[(1) - (1)].Number)/10000; -+ } -+ else { -+ VARIABLE->yyHaveTime++; -+ if ((yyvsp[(1) - (1)].Number) < 10000) { -+ VARIABLE->yyHour = (yyvsp[(1) - (1)].Number) / 100; -+ VARIABLE->yyMinutes = (yyvsp[(1) - (1)].Number) % 100; -+ VARIABLE->yySeconds = 0; -+ } -+ else { -+ VARIABLE->yyHour = (yyvsp[(1) - (1)].Number)/10000; -+ VARIABLE->yyMinutes = ((yyvsp[(1) - (1)].Number)/100)%100; -+ VARIABLE->yySeconds = (yyvsp[(1) - (1)].Number) % 100; -+ } -+ VARIABLE->yyMeridian = MER24; -+ } -+ } -+ } -+ break; -+ -+ case 48: -+/* Line 1787 of yacc.c */ -+#line 379 "ptlib/common/getdate.y" -+ { -+ if (VARIABLE->yyHaveTime && VARIABLE->yyHaveDate && !VARIABLE->yyHaveRel) -+ VARIABLE->yyYear = (yyvsp[(1) - (1)].Number); -+ else { -+ VARIABLE->yyHaveTime++; -+ VARIABLE->yyHour = (yyvsp[(1) - (1)].Number)/100; -+ VARIABLE->yyMinutes = (yyvsp[(1) - (1)].Number)%100; -+ VARIABLE->yySeconds = 0; -+ VARIABLE->yyMeridian = MER24; -+ } -+ } -+ break; -+ -+ case 49: -+/* Line 1787 of yacc.c */ -+#line 390 "ptlib/common/getdate.y" -+ { -+ if (!VARIABLE->yyHaveDate && (yyvsp[(1) - (1)].Number)>240000) { -+ VARIABLE->yyHaveDate++; -+ VARIABLE->yyDay= ((yyvsp[(1) - (1)].Number))%100; -+ VARIABLE->yyMonth= ((yyvsp[(1) - (1)].Number)/100)%100; -+ VARIABLE->yyYear = (yyvsp[(1) - (1)].Number)/10000; -+ } -+ else if (!VARIABLE->yyHaveTime) { -+ VARIABLE->yyHaveTime++; -+ VARIABLE->yyHour = (yyvsp[(1) - (1)].Number)/10000; -+ VARIABLE->yyMinutes = ((yyvsp[(1) - (1)].Number)/100)%100; -+ VARIABLE->yySeconds = (yyvsp[(1) - (1)].Number) % 100; -+ VARIABLE->yyMeridian = MER24; -+ } -+ } -+ break; -+ -+ case 50: -+/* Line 1787 of yacc.c */ -+#line 407 "ptlib/common/getdate.y" -+ { -+ (yyval.Meridian) = MER24; -+ } -+ break; -+ -+ case 51: -+/* Line 1787 of yacc.c */ -+#line 410 "ptlib/common/getdate.y" -+ { -+ (yyval.Meridian) = (yyvsp[(1) - (1)].Meridian); -+ } -+ break; -+ -+ -+/* Line 1787 of yacc.c */ -+#line 2031 "ptlib/common/getdate.tab.c" -+ default: break; -+ } -+ /* User semantic actions sometimes alter yychar, and that requires -+ that yytoken be updated with the new translation. We take the -+ approach of translating immediately before every use of yytoken. -+ One alternative is translating here after every semantic action, -+ but that translation would be missed if the semantic action invokes -+ YYABORT, YYACCEPT, or YYERROR immediately after altering yychar or -+ if it invokes YYBACKUP. In the case of YYABORT or YYACCEPT, an -+ incorrect destructor might then be invoked immediately. In the -+ case of YYERROR or YYBACKUP, subsequent parser actions might lead -+ to an incorrect destructor call or verbose syntax error message -+ before the lookahead is translated. */ -+ YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); -+ -+ YYPOPSTACK (yylen); -+ yylen = 0; -+ YY_STACK_PRINT (yyss, yyssp); -+ -+ *++yyvsp = yyval; -+ -+ /* Now `shift' the result of the reduction. Determine what state -+ that goes to, based on the state we popped back to and the rule -+ number reduced by. */ -+ -+ yyn = yyr1[yyn]; -+ -+ yystate = yypgoto[yyn - YYNTOKENS] + *yyssp; -+ if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp) -+ yystate = yytable[yystate]; -+ else -+ yystate = yydefgoto[yyn - YYNTOKENS]; -+ -+ goto yynewstate; -+ -+ -+/*------------------------------------. -+| yyerrlab -- here on detecting error | -+`------------------------------------*/ -+yyerrlab: -+ /* Make sure we have latest lookahead translation. See comments at -+ user semantic actions for why this is necessary. */ -+ yytoken = yychar == YYEMPTY ? YYEMPTY : YYTRANSLATE (yychar); -+ -+ /* If not already recovering from an error, report this error. */ -+ if (!yyerrstatus) -+ { -+ ++yynerrs; -+#if ! YYERROR_VERBOSE -+ yyerror (YY_("syntax error")); -+#else -+# define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, \ -+ yyssp, yytoken) -+ { -+ char const *yymsgp = YY_("syntax error"); -+ int yysyntax_error_status; -+ yysyntax_error_status = YYSYNTAX_ERROR; -+ if (yysyntax_error_status == 0) -+ yymsgp = yymsg; -+ else if (yysyntax_error_status == 1) -+ { -+ if (yymsg != yymsgbuf) -+ YYSTACK_FREE (yymsg); -+ yymsg = (char *) YYSTACK_ALLOC (yymsg_alloc); -+ if (!yymsg) -+ { -+ yymsg = yymsgbuf; -+ yymsg_alloc = sizeof yymsgbuf; -+ yysyntax_error_status = 2; -+ } -+ else -+ { -+ yysyntax_error_status = YYSYNTAX_ERROR; -+ yymsgp = yymsg; -+ } -+ } -+ yyerror (yymsgp); -+ if (yysyntax_error_status == 2) -+ goto yyexhaustedlab; -+ } -+# undef YYSYNTAX_ERROR -+#endif -+ } -+ -+ -+ -+ if (yyerrstatus == 3) -+ { -+ /* If just tried and failed to reuse lookahead token after an -+ error, discard it. */ -+ -+ if (yychar <= YYEOF) -+ { -+ /* Return failure if at end of input. */ -+ if (yychar == YYEOF) -+ YYABORT; -+ } -+ else -+ { -+ yydestruct ("Error: discarding", -+ yytoken, &yylval); -+ yychar = YYEMPTY; -+ } -+ } -+ -+ /* Else will try to reuse lookahead token after shifting the error -+ token. */ -+ goto yyerrlab1; -+ -+ -+/*---------------------------------------------------. -+| yyerrorlab -- error raised explicitly by YYERROR. | -+`---------------------------------------------------*/ -+yyerrorlab: -+ -+ /* Pacify compilers like GCC when the user code never invokes -+ YYERROR and the label yyerrorlab therefore never appears in user -+ code. */ -+ if (/*CONSTCOND*/ 0) -+ goto yyerrorlab; -+ -+ /* Do not reclaim the symbols of the rule which action triggered -+ this YYERROR. */ -+ YYPOPSTACK (yylen); -+ yylen = 0; -+ YY_STACK_PRINT (yyss, yyssp); -+ yystate = *yyssp; -+ goto yyerrlab1; -+ -+ -+/*-------------------------------------------------------------. -+| yyerrlab1 -- common code for both syntax error and YYERROR. | -+`-------------------------------------------------------------*/ -+yyerrlab1: -+ yyerrstatus = 3; /* Each real token shifted decrements this. */ -+ -+ for (;;) -+ { -+ yyn = yypact[yystate]; -+ if (!yypact_value_is_default (yyn)) -+ { -+ yyn += YYTERROR; -+ if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR) -+ { -+ yyn = yytable[yyn]; -+ if (0 < yyn) -+ break; -+ } -+ } -+ -+ /* Pop the current state because it cannot handle the error token. */ -+ if (yyssp == yyss) -+ YYABORT; -+ -+ -+ yydestruct ("Error: popping", -+ yystos[yystate], yyvsp); -+ YYPOPSTACK (1); -+ yystate = *yyssp; -+ YY_STACK_PRINT (yyss, yyssp); -+ } -+ -+ YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN -+ *++yyvsp = yylval; -+ YY_IGNORE_MAYBE_UNINITIALIZED_END -+ -+ -+ /* Shift the error token. */ -+ YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp); -+ -+ yystate = yyn; -+ goto yynewstate; -+ -+ -+/*-------------------------------------. -+| yyacceptlab -- YYACCEPT comes here. | -+`-------------------------------------*/ -+yyacceptlab: -+ yyresult = 0; -+ goto yyreturn; -+ -+/*-----------------------------------. -+| yyabortlab -- YYABORT comes here. | -+`-----------------------------------*/ -+yyabortlab: -+ yyresult = 1; -+ goto yyreturn; -+ -+#if !defined yyoverflow || YYERROR_VERBOSE -+/*-------------------------------------------------. -+| yyexhaustedlab -- memory exhaustion comes here. | -+`-------------------------------------------------*/ -+yyexhaustedlab: -+ yyerror (YY_("memory exhausted")); -+ yyresult = 2; -+ /* Fall through. */ -+#endif -+ -+yyreturn: -+ if (yychar != YYEMPTY) -+ { -+ /* Make sure we have latest lookahead translation. See comments at -+ user semantic actions for why this is necessary. */ -+ yytoken = YYTRANSLATE (yychar); -+ yydestruct ("Cleanup: discarding lookahead", -+ yytoken, &yylval); -+ } -+ /* Do not reclaim the symbols of the rule which action triggered -+ this YYABORT or YYACCEPT. */ -+ YYPOPSTACK (yylen); -+ YY_STACK_PRINT (yyss, yyssp); -+ while (yyssp != yyss) -+ { -+ yydestruct ("Cleanup: popping", -+ yystos[*yyssp], yyvsp); -+ YYPOPSTACK (1); -+ } -+#ifndef yyoverflow -+ if (yyss != yyssa) -+ YYSTACK_FREE (yyss); -+#endif -+#if YYERROR_VERBOSE -+ if (yymsg != yymsgbuf) -+ YYSTACK_FREE (yymsg); -+#endif -+ /* Make sure YYID is used. */ -+ return YYID (yyresult); -+} -+ -+ -+/* Line 2050 of yacc.c */ -+#line 415 "ptlib/common/getdate.y" -+ -+ -+/* Month and day table. */ -+static TABLE const MonthDayTable[] = { -+ { "january", tMONTH, 1 }, -+ { "february", tMONTH, 2 }, -+ { "march", tMONTH, 3 }, -+ { "april", tMONTH, 4 }, -+ { "may", tMONTH, 5 }, -+ { "june", tMONTH, 6 }, -+ { "july", tMONTH, 7 }, -+ { "august", tMONTH, 8 }, -+ { "september", tMONTH, 9 }, -+ { "sept", tMONTH, 9 }, -+ { "october", tMONTH, 10 }, -+ { "november", tMONTH, 11 }, -+ { "december", tMONTH, 12 }, -+ { "sunday", tDAY, 0 }, -+ { "monday", tDAY, 1 }, -+ { "tuesday", tDAY, 2 }, -+ { "tues", tDAY, 2 }, -+ { "wednesday", tDAY, 3 }, -+ { "wednes", tDAY, 3 }, -+ { "thursday", tDAY, 4 }, -+ { "thur", tDAY, 4 }, -+ { "thurs", tDAY, 4 }, -+ { "friday", tDAY, 5 }, -+ { "saturday", tDAY, 6 }, -+ { NULL } -+}; -+ -+/* Time units table. */ -+static TABLE const UnitsTable[] = { -+ { "year", tMONTH_UNIT, 12 }, -+ { "month", tMONTH_UNIT, 1 }, -+ { "fortnight", tMINUTE_UNIT, 14 * 24 * 60 }, -+ { "week", tMINUTE_UNIT, 7 * 24 * 60 }, -+ { "day", tMINUTE_UNIT, 1 * 24 * 60 }, -+ { "hour", tMINUTE_UNIT, 60 }, -+ { "minute", tMINUTE_UNIT, 1 }, -+ { "min", tMINUTE_UNIT, 1 }, -+ { "second", tSEC_UNIT, 1 }, -+ { "sec", tSEC_UNIT, 1 }, -+ { NULL } -+}; -+ -+/* Assorted relative-time words. */ -+static TABLE const OtherTable[] = { -+ { "tomorrow", tMINUTE_UNIT, 1 * 24 * 60 }, -+ { "yesterday", tMINUTE_UNIT, -1 * 24 * 60 }, -+ { "today", tMINUTE_UNIT, 0 }, -+ { "now", tMINUTE_UNIT, 0 }, -+ { "last", tUNUMBER, -1 }, -+ { "this", tMINUTE_UNIT, 0 }, -+ { "next", tUNUMBER, 2 }, -+ { "first", tUNUMBER, 1 }, -+/* { "second", tUNUMBER, 2 }, */ -+ { "third", tUNUMBER, 3 }, -+ { "fourth", tUNUMBER, 4 }, -+ { "fifth", tUNUMBER, 5 }, -+ { "sixth", tUNUMBER, 6 }, -+ { "seventh", tUNUMBER, 7 }, -+ { "eighth", tUNUMBER, 8 }, -+ { "ninth", tUNUMBER, 9 }, -+ { "tenth", tUNUMBER, 10 }, -+ { "eleventh", tUNUMBER, 11 }, -+ { "twelfth", tUNUMBER, 12 }, -+ { "ago", tAGO, 1 }, -+ { NULL } -+}; -+ -+/* The timezone table. */ -+/* Some of these are commented out because a time_t can't store a float. */ -+static TABLE const TimezoneTable[] = { -+ { "gmt", tZONE, HOUR( 0) }, /* Greenwich Mean */ -+ { "ut", tZONE, HOUR( 0) }, /* Universal (Coordinated) */ -+ { "utc", tZONE, HOUR( 0) }, -+ { "wet", tZONE, HOUR( 0) }, /* Western European */ -+ { "bst", tDAYZONE, HOUR( 0) }, /* British Summer */ -+ { "wat", tZONE, HOUR( 1) }, /* West Africa */ -+ { "at", tZONE, HOUR( 2) }, /* Azores */ -+#if 0 -+ /* For completeness. BST is also British Summer, and GST is -+ * also Guam Standard. */ -+ { "bst", tZONE, HOUR( 3) }, /* Brazil Standard */ -+ { "gst", tZONE, HOUR( 3) }, /* Greenland Standard */ -+#endif -+#if 0 -+ { "nft", tZONE, HOUR(3.5) }, /* Newfoundland */ -+ { "nst", tZONE, HOUR(3.5) }, /* Newfoundland Standard */ -+ { "ndt", tDAYZONE, HOUR(3.5) }, /* Newfoundland Daylight */ -+#endif -+ { "ast", tZONE, HOUR( 4) }, /* Atlantic Standard */ -+ { "adt", tDAYZONE, HOUR( 4) }, /* Atlantic Daylight */ -+ { "est", tZONE, HOUR( 5) }, /* Eastern Standard */ -+ { "edt", tDAYZONE, HOUR( 5) }, /* Eastern Daylight */ -+ { "cst", tZONE, HOUR( 6) }, /* Central Standard */ -+ { "cdt", tDAYZONE, HOUR( 6) }, /* Central Daylight */ -+ { "mst", tZONE, HOUR( 7) }, /* Mountain Standard */ -+ { "mdt", tDAYZONE, HOUR( 7) }, /* Mountain Daylight */ -+ { "pst", tZONE, HOUR( 8) }, /* Pacific Standard */ -+ { "pdt", tDAYZONE, HOUR( 8) }, /* Pacific Daylight */ -+ { "yst", tZONE, HOUR( 9) }, /* Yukon Standard */ -+ { "ydt", tDAYZONE, HOUR( 9) }, /* Yukon Daylight */ -+ { "hst", tZONE, HOUR(10) }, /* Hawaii Standard */ -+ { "hdt", tDAYZONE, HOUR(10) }, /* Hawaii Daylight */ -+ { "cat", tZONE, HOUR(10) }, /* Central Alaska */ -+ { "ahst", tZONE, HOUR(10) }, /* Alaska-Hawaii Standard */ -+ { "nt", tZONE, HOUR(11) }, /* Nome */ -+ { "idlw", tZONE, HOUR(12) }, /* International Date Line West */ -+ { "cet", tZONE, -HOUR(1) }, /* Central European */ -+ { "met", tZONE, -HOUR(1) }, /* Middle European */ -+ { "mewt", tZONE, -HOUR(1) }, /* Middle European Winter */ -+ { "mest", tDAYZONE, -HOUR(1) }, /* Middle European Summer */ -+ { "swt", tZONE, -HOUR(1) }, /* Swedish Winter */ -+ { "sst", tDAYZONE, -HOUR(1) }, /* Swedish Summer */ -+ { "fwt", tZONE, -HOUR(1) }, /* French Winter */ -+ { "fst", tDAYZONE, -HOUR(1) }, /* French Summer */ -+ { "eet", tZONE, -HOUR(2) }, /* Eastern Europe, USSR Zone 1 */ -+ { "bt", tZONE, -HOUR(3) }, /* Baghdad, USSR Zone 2 */ -+#if 0 -+ { "it", tZONE, -HOUR(3.5) },/* Iran */ -+#endif -+ { "zp4", tZONE, -HOUR(4) }, /* USSR Zone 3 */ -+ { "zp5", tZONE, -HOUR(5) }, /* USSR Zone 4 */ -+#if 0 -+ { "ist", tZONE, -HOUR(5.5) },/* Indian Standard */ -+#endif -+ { "zp6", tZONE, -HOUR(6) }, /* USSR Zone 5 */ -+#if 0 -+ /* For completeness. NST is also Newfoundland Stanard, and SST is -+ * also Swedish Summer. */ -+ { "nst", tZONE, -HOUR(6.5) },/* North Sumatra */ -+ { "sst", tZONE, -HOUR(7) }, /* South Sumatra, USSR Zone 6 */ -+#endif /* 0 */ -+ { "wast", tZONE, -HOUR(7) }, /* West Australian Standard */ -+ { "wadt", tDAYZONE, -HOUR(7) }, /* West Australian Daylight */ -+#if 0 -+ { "jt", tZONE, -HOUR(7.5) },/* Java (3pm in Cronusland!) */ -+#endif -+ { "cct", tZONE, -HOUR(8) }, /* China Coast, USSR Zone 7 */ -+ { "jst", tZONE, -HOUR(9) }, /* Japan Standard, USSR Zone 8 */ -+#if 0 -+ { "cast", tZONE, -HOUR(9.5) },/* Central Australian Standard */ -+ { "cadt", tDAYZONE, -HOUR(9.5) },/* Central Australian Daylight */ -+#endif -+ { "east", tZONE, -HOUR(10) }, /* Eastern Australian Standard */ -+ { "eadt", tDAYZONE, -HOUR(10) }, /* Eastern Australian Daylight */ -+ { "gst", tZONE, -HOUR(10) }, /* Guam Standard, USSR Zone 9 */ -+ { "nzt", tZONE, -HOUR(12) }, /* New Zealand */ -+ { "nzst", tZONE, -HOUR(12) }, /* New Zealand Standard */ -+ { "nzdt", tDAYZONE, -HOUR(12) }, /* New Zealand Daylight */ -+ { "idle", tZONE, -HOUR(12) }, /* International Date Line East */ -+ { NULL } -+}; -+ -+/* Military timezone table. */ -+static TABLE const MilitaryTable[] = { -+ { "a", tMILZONE, HOUR( 1) }, -+ { "b", tMILZONE, HOUR( 2) }, -+ { "c", tMILZONE, HOUR( 3) }, -+ { "d", tMILZONE, HOUR( 4) }, -+ { "e", tMILZONE, HOUR( 5) }, -+ { "f", tMILZONE, HOUR( 6) }, -+ { "g", tMILZONE, HOUR( 7) }, -+ { "h", tMILZONE, HOUR( 8) }, -+ { "i", tMILZONE, HOUR( 9) }, -+ { "k", tMILZONE, HOUR( 10) }, -+ { "l", tMILZONE, HOUR( 11) }, -+ { "m", tMILZONE, HOUR( 12) }, -+ { "n", tMILZONE, HOUR(- 1) }, -+ { "o", tMILZONE, HOUR(- 2) }, -+ { "p", tMILZONE, HOUR(- 3) }, -+ { "q", tMILZONE, HOUR(- 4) }, -+ { "r", tMILZONE, HOUR(- 5) }, -+ { "s", tMILZONE, HOUR(- 6) }, -+ { "t", tMILZONE, HOUR(- 7) }, -+ { "u", tMILZONE, HOUR(- 8) }, -+ { "v", tMILZONE, HOUR(- 9) }, -+ { "w", tMILZONE, HOUR(-10) }, -+ { "x", tMILZONE, HOUR(-11) }, -+ { "y", tMILZONE, HOUR(-12) }, -+ { "z", tZONE, HOUR( 0) }, /* Deliberately tZONE */ -+ { NULL } -+}; -+ -+static int LookupWord(char * buff, YYSTYPE * yylval, struct Variables * vars) -+{ -+ register char *p; -+ register char *q; -+ register const TABLE *tp; -+ int i; -+ int abbrev; -+ -+ /* Make it lowercase. */ -+ for (p = buff; *p != '\0'; p++) -+ *p = (char)tolower(*p); -+ -+ if (strcmp(buff, "am") == 0 || strcmp(buff, "a.m.") == 0) { -+ yylval->Meridian = MERam; -+ return tMERIDIAN; -+ } -+ if (strcmp(buff, "pm") == 0 || strcmp(buff, "p.m.") == 0) { -+ yylval->Meridian = MERpm; -+ return tMERIDIAN; -+ } -+ -+ /* See if we have an abbreviation for a month. */ -+ if (strlen(buff) == 3) -+ abbrev = 1; -+ else if (strlen(buff) == 4 && buff[3] == '.') { -+ abbrev = 1; -+ buff[3] = '\0'; -+ } -+ else -+ abbrev = 0; -+ -+ for (tp = MonthDayTable; tp->name; tp++) { -+ if (abbrev) { -+ if (strncmp(buff, tp->name, 3) == 0) { -+ yylval->Number = tp->value; -+ return tp->type; -+ } -+ } -+ else if (strcmp(buff, tp->name) == 0) { -+ yylval->Number = tp->value; -+ return tp->type; -+ } -+ } -+ -+ for (tp = TimezoneTable; tp->name; tp++) -+ if (strcmp(buff, tp->name) == 0) { -+ yylval->Number = tp->value; -+ return tp->type; -+ } -+ -+ if (strcmp(buff, "dst") == 0) -+ return tDST; -+ -+ for (tp = UnitsTable; tp->name; tp++) -+ if (strcmp(buff, tp->name) == 0) { -+ yylval->Number = tp->value; -+ return tp->type; -+ } -+ -+ /* Strip off any plural and try the units table again. */ -+ i = strlen(buff) - 1; -+ if (buff[i] == 's') { -+ buff[i] = '\0'; -+ for (tp = UnitsTable; tp->name; tp++) -+ if (strcmp(buff, tp->name) == 0) { -+ yylval->Number = tp->value; -+ return tp->type; -+ } -+ buff[i] = 's'; /* Put back for "this" in OtherTable. */ -+ } -+ -+ for (tp = OtherTable; tp->name; tp++) -+ if (strcmp(buff, tp->name) == 0) { -+ yylval->Number = tp->value; -+ return tp->type; -+ } -+ -+ /* Avoid confusion with 'T' in RFC3339 and 't' in Military timezones */ -+ if (!vars->yyHaveTime && strcmp(buff, "t") == 0) -+ return tRFC3339; -+ -+ /* Military timezones. */ -+ if (buff[1] == '\0' && isalpha(*buff)) { -+ for (tp = MilitaryTable; tp->name; tp++) -+ if (strcmp(buff, tp->name) == 0) { -+ yylval->Number = tp->value; -+ return tp->type; -+ } -+ } -+ -+ /* Drop out any periods and try the timezone table again. */ -+ for (i = 0, p = q = buff; *q; q++) -+ if (*q != '.') -+ *p++ = *q; -+ else -+ i++; -+ *p = '\0'; -+ if (i) -+ for (tp = TimezoneTable; tp->name; tp++) -+ if (strcmp(buff, tp->name) == 0) { -+ yylval->Number = tp->value; -+ return tp->type; -+ } -+ -+ for (i = 1; i <= 12; i++) -+ for (abbrev = 0; abbrev < 2; abbrev++) -+ if (PTimeIsMonthName(buff, i, abbrev)) { -+ yylval->Number = i; -+ return tMONTH; -+ } -+ -+ for (i = 1; i <= 7; i++) -+ for (abbrev = 0; abbrev < 2; abbrev++) -+ if (PTimeIsDayName(buff, i, abbrev)) { -+ yylval->Number = i; -+ return tDAY; -+ } -+ -+ return tID; -+} -+ -+ -+#ifdef _MSC_VER -+#pragma warning(disable:4211) -+#endif -+ -+#ifndef __GNUC__ -+static -+#endif -+int yylex(YYSTYPE * yylval, struct Variables * vars) -+{ -+ register char *p; -+ char buff[20]; -+ int Count; -+ int sign; -+ register int c = PTimeGetChar(vars->yyInput); -+ -+ while (c != EOF && c != '\0' && c != '\n') { -+ while (isspace(c)) -+ c = PTimeGetChar(vars->yyInput); -+ -+ if (isdigit(c) || c == '-' || c == '+') { -+ if (c == '-' || c == '+') { -+ sign = c == '-' ? -1 : 1; -+ if (!isdigit(c = PTimeGetChar(vars->yyInput))) -+ /* skip the '-' sign */ -+ continue; -+ } -+ else -+ sign = 0; -+ yylval->Number = 0; -+ Count = 0; /* Count number of digits */ -+ while (isdigit(c)) { -+ yylval->Number = 10 * yylval->Number + c - '0'; -+ c = PTimeGetChar(vars->yyInput); -+ Count++; -+ } -+ PTimeUngetChar(vars->yyInput, c); -+ if (sign < 0) -+ yylval->Number = -yylval->Number; -+ if (Count == 4) -+ return sign ? tS4DIGITNUMBER : t4DIGITNUMBER; -+ if (sign) -+ return tSNUMBER; -+ if (Count == 6) -+ return t6DIGITNUMBER; -+ if (Count == 8) -+ return t8DIGITNUMBER; -+ return tUNUMBER; -+ } -+ -+ if (isalpha(c)) { -+ for (p = buff; isalpha(c) || c == '.'; c = PTimeGetChar(vars->yyInput)) { -+ if (p < &buff[sizeof(buff)-1]) -+ *p++ = (char)c; -+ } -+ *p = '\0'; -+ PTimeUngetChar(vars->yyInput, c); -+ return LookupWord(buff, yylval, vars); -+ } -+ -+ if (c != '(') -+ return c; -+ -+ Count = 0; -+ do { -+ c = PTimeGetChar(vars->yyInput); -+ if (c == '\0' || c == EOF) -+ return c; -+ if (c == '(') -+ Count++; -+ else if (c == ')') -+ Count--; -+ } while (Count > 0); -+ } -+ -+ if (c == '\n') -+ PTimeUngetChar(vars->yyInput, c); -+ -+ return EOF; -+} -+ -+#ifdef _MSC_VER -+#pragma warning(default:4211) -+#endif -+ -+ -+static time_t ToSeconds(time_t Hours, time_t Minutes, time_t Seconds, -+ MERIDIAN Meridian) -+{ -+ if (Minutes < 0 || Minutes > 59 || Seconds < 0 || Seconds > 59) -+ return -1; -+ switch (Meridian) { -+ case MER24: -+ if (Hours < 0 || Hours > 23) -+ return -1; -+ return (Hours * 60L + Minutes) * 60L + Seconds; -+ case MERam: -+ if (Hours < 1 || Hours > 12) -+ return -1; -+ if (Hours == 12) -+ Hours = 0; -+ return (Hours * 60L + Minutes) * 60L + Seconds; -+ case MERpm: -+ if (Hours < 1 || Hours > 12) -+ return -1; -+ if (Hours == 12) -+ Hours = 0; -+ return ((Hours + 12) * 60L + Minutes) * 60L + Seconds; -+ } -+ -+ return -1; -+} -+ -+ -+static time_t Convert(time_t Month, time_t Day, time_t Year, -+ time_t Hours, time_t Minutes, time_t Seconds, -+ MERIDIAN Meridian, DSTMODE DSTmode, time_t yyTimezone) -+{ -+ static int DaysInMonth[12] = { -+ 31, 0, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 -+ }; -+ time_t tod; -+ time_t Julian; -+ int i; -+ -+ if (Year < 0) -+ Year = -Year; -+ if (Year < 70) -+ Year += 2000; -+ else if (Year < 100) -+ Year += 1900; -+ DaysInMonth[1] = Year % 4 == 0 && (Year % 100 != 0 || Year % 400 == 0) -+ ? 29 : 28; -+ /* Checking for 2038 bogusly assumes that time_t is 32 bits. But -+ I'm too lazy to try to check for time_t overflow in another way. */ -+ if (Year < EPOCH || Year > 2038 -+ || Month < 1 || Month > 12 -+ /* Lint fluff: "conversion from long may lose accuracy" */ -+ || Day < 1 || Day > DaysInMonth[(int)--Month]) -+ return -1; -+ -+ for (Julian = Day - 1, i = 0; i < Month; i++) -+ Julian += DaysInMonth[i]; -+ for (i = EPOCH; i < Year; i++) -+ Julian += 365 + (i % 4 == 0); -+ Julian *= SECSPERDAY; -+ Julian += yyTimezone * 60L; -+ if ((tod = ToSeconds(Hours, Minutes, Seconds, Meridian)) < 0) -+ return -1; -+ Julian += tod; -+ if (DSTmode == DSTon -+ || (DSTmode == DSTmaybe && localtime(&Julian)->tm_isdst)) -+ Julian -= 60 * 60; -+ return Julian; -+} -+ -+ -+static time_t DSTcorrect(time_t Start, time_t Future) -+{ -+ time_t StartDay; -+ time_t FutureDay; -+ -+ StartDay = (localtime(&Start)->tm_hour + 1) % 24; -+ FutureDay = (localtime(&Future)->tm_hour + 1) % 24; -+ return (Future - Start) + (StartDay - FutureDay) * 60L * 60L; -+} -+ -+ -+static time_t RelativeDate(time_t Start, time_t DayOrdinal, time_t DayNumber) -+{ -+ struct tm *tm; -+ time_t now; -+ -+ now = Start; -+ tm = localtime(&now); -+ now += SECSPERDAY * ((DayNumber - tm->tm_wday + 7) % 7); -+ now += 7 * SECSPERDAY * (DayOrdinal <= 0 ? DayOrdinal : DayOrdinal - 1); -+ return DSTcorrect(Start, now); -+} -+ -+ -+static time_t RelativeMonth(time_t Start, time_t RelMonth, time_t yyTimezone) -+{ -+ struct tm *tm; -+ time_t Month; -+ time_t Year; -+ -+ if (RelMonth == 0) -+ return 0; -+ tm = localtime(&Start); -+ Month = 12 * tm->tm_year + tm->tm_mon + RelMonth; -+ Year = Month / 12 + 1900; -+ Month = Month % 12 + 1; -+ return DSTcorrect(Start, -+ Convert(Month, (time_t)tm->tm_mday, Year, -+ (time_t)tm->tm_hour, (time_t)tm->tm_min, (time_t)tm->tm_sec, -+ MER24, DSTmaybe, yyTimezone)); -+} -+ -+ -+static void SetPossibleDate(struct Variables * var, -+ time_t possible_day, -+ time_t possible_month, -+ time_t possible_year) -+{ -+ int date_order; -+ -+ if (possible_day > 31) /* test for ymd */ -+ date_order = 2; -+ else if (possible_day > 12) /* test for dmy */ -+ date_order = 1; -+ else if (possible_month > 12) /* test for mdy */ -+ date_order = 0; -+ else -+ date_order = PTimeGetDateOrder(); -+ -+ switch (date_order) { -+ case 0 : -+ var->yyDay = possible_month; -+ var->yyMonth = possible_day; -+ var->yyYear = possible_year; -+ break; -+ case 1 : -+ var->yyDay = possible_day; -+ var->yyMonth = possible_month; -+ var->yyYear = possible_year; -+ break; -+ default : -+ var->yyDay = possible_year; -+ var->yyMonth = possible_month; -+ var->yyYear = possible_day; -+ } -+} -+ -+ -+time_t STDAPICALLTYPE PTimeParse(void * inputStream, struct tm * now, int timezone) -+{ -+ time_t Start; -+ struct Variables var; -+ -+ -+ var.yyInput = inputStream; -+ var.yyYear = now->tm_year + 1900; -+ var.yyMonth = now->tm_mon + 1; -+ var.yyDay = now->tm_mday; -+ var.yyTimezone = -timezone; -+ var.yyDSTmode = DSTmaybe; -+ var.yyHour = 0; -+ var.yyMinutes = 0; -+ var.yySeconds = 0; -+ var.yyMeridian = MER24; -+ var.yyRelSeconds = 0; -+ var.yyRelMonth = 0; -+ var.yyHaveDate = 0; -+ var.yyHaveDay = 0; -+ var.yyHaveRel = 0; -+ var.yyHaveTime = 0; -+ var.yyHaveZone = 0; -+ -+ yyparse(&var); -+ -+ if (var.yyHaveTime > 1 || var.yyHaveZone > 1 || -+ var.yyHaveDate > 1 || var.yyHaveDay > 1) -+ return -1; -+ -+ if (var.yyHaveTime == 0 && var.yyHaveZone == 0 && -+ var.yyHaveDate == 0 && var.yyHaveDay == 0 && var.yyHaveRel == 0) -+ return -1; -+ -+ if (var.yyHaveDate || var.yyHaveTime || var.yyHaveDay) { -+ Start = Convert(var.yyMonth, var.yyDay, var.yyYear, -+ var.yyHour, var.yyMinutes, var.yySeconds, -+ var.yyMeridian, var.yyDSTmode, var.yyTimezone); -+ if (Start < 0) -+ return -1; -+ } -+ else { -+ time(&Start); -+ if (!var.yyHaveRel) -+ Start -= ((now->tm_hour * 60L + now->tm_min) * 60L) + now->tm_sec; -+ } -+ -+ Start += var.yyRelSeconds; -+ Start += RelativeMonth(Start, var.yyRelMonth, var.yyTimezone); -+ -+ if (var.yyHaveDay && !var.yyHaveDate) -+ Start += RelativeDate(Start, var.yyDayOrdinal, var.yyDayNumber); -+ -+ /* Have to do *something* with a legitimate -1 so it's distinguishable -+ * from the error return value. (Alternately could set errno on error.) */ -+ return Start == -1 ? 0 : Start; -+} -+ -+ -+#ifdef _MSC_VER -+#pragma warning(disable:4028 4100 4211) -+#endif -+ -+#ifdef __GNUC__ -+int yyerror(const char * s) -+{ -+ return 0; -+} -+#else -+static void yyerror(const char * s) -+{ -+} -+#endif -+ -+#ifdef _MSC_VER -+#pragma warning(default:4028 4100 4211) -+#endif -+ -+ -+/* End of file ***************************************************************/ -diff -Naur ptlib-2.10.11.orig/src/ptlib/unix/svcproc.cxx ptlib-2.10.11/src/ptlib/unix/svcproc.cxx ---- ptlib-2.10.11.orig/src/ptlib/unix/svcproc.cxx 2013-08-14 18:20:26.000000000 -0500 -+++ ptlib-2.10.11/src/ptlib/unix/svcproc.cxx 2016-05-04 19:42:20.526529457 -0500 -@@ -217,7 +217,7 @@ - pid_t pid; - - { -- ifstream pidfile(pidfilename); -+ ifstream pidfile((std::string&)pidfilename); - if (!pidfile.is_open()) { - cout << "Could not open pid file: \"" << pidfilename << "\"" - " - " << strerror(errno) << endl; -@@ -384,7 +384,7 @@ - // Run as a daemon, ie fork - - if (!pidfilename) { -- ifstream pidfile(pidfilename); -+ ifstream pidfile((std::string&)pidfilename); - if (pidfile.is_open()) { - pid_t pid; - pidfile >> pid; -@@ -412,7 +412,7 @@ - cout << "Daemon started with pid " << pid << endl; - if (!pidfilename) { - // Write out the child pid to magic file in /var/run (at least for linux) -- ofstream pidfile(pidfilename); -+ ofstream pidfile((std::string&)pidfilename); - if (pidfile.is_open()) - pidfile << pid; - else diff --git a/libraries/ptlib/ptlib-2.10.11-openssl11.patch b/libraries/ptlib/ptlib-2.10.11-openssl11.patch deleted file mode 100644 index 38d296eb2da66..0000000000000 --- a/libraries/ptlib/ptlib-2.10.11-openssl11.patch +++ /dev/null @@ -1,212 +0,0 @@ -https://build.opensuse.org/package/view_file/network:telephony/libpt2/libpt2-openssl11.patch -by mgorse@suse.com, see also: - - - https://build.opensuse.org/request/show/518821 - - https://bugzilla.opensuse.org/show_bug.cgi?id=1055477 - ---- ptlib-2.10.11/src/ptclib/pssl.cxx 2013-08-14 18:20:27.000000000 -0500 -+++ ptlib-2.10.11/src/ptclib/pssl.cxx.openssl11 2017-08-25 17:25:44.824287596 -0500 -@@ -140,7 +140,11 @@ PFACTORY_CREATE_SINGLETON(PProcessStartu - class PSSL_BIO - { - public: -+#if OPENSSL_VERSION_NUMBER >= 0x10100000 -+ PSSL_BIO(const BIO_METHOD *method = BIO_s_file()) -+#else - PSSL_BIO(BIO_METHOD *method = BIO_s_file_internal()) -+#endif - { bio = BIO_new(method); } - - ~PSSL_BIO() -@@ -627,10 +631,18 @@ PSSLDiffieHellman::PSSLDiffieHellman(con - if (dh == NULL) - return; - -+#if OPENSSL_VERSION_NUMBER >= 0x10100000l -+ DH_set0_pqg (dh, BN_bin2bn(pData, pSize, NULL), NULL, BN_bin2bn(gData, gSize, NULL)); -+ const BIGNUM *p, *g; -+ DH_get0_pqg(dh, &p, NULL, &g); -+ if (p != NULL && g != NULL) -+ return; -+#else - dh->p = BN_bin2bn(pData, pSize, NULL); - dh->g = BN_bin2bn(gData, gSize, NULL); - if (dh->p != NULL && dh->g != NULL) - return; -+#endif - - DH_free(dh); - dh = NULL; -@@ -805,9 +817,11 @@ void PSSLContext::Construct(Method metho - SSL_METHOD * meth; - - switch (method) { -+#ifndef OPENSSL_NO_SSL3 - case SSLv3: - meth = SSLv3_method(); - break; -+#endif - case TLSv1: - meth = TLSv1_method(); - break; -@@ -1117,7 +1131,11 @@ PBoolean PSSLChannel::RawSSLRead(void * - // - - -+#if OPENSSL_VERSION_NUMBER >= 0x10100000l -+#define PSSLCHANNEL(bio) ((PSSLChannel *)(BIO_get_data (bio))) -+#else - #define PSSLCHANNEL(bio) ((PSSLChannel *)(bio->ptr)) -+#endif - - extern "C" { - -@@ -1130,10 +1148,16 @@ typedef long (*lfptr)(); - - static int Psock_new(BIO * bio) - { -+#if OPENSSL_VERSION_NUMBER >= 0x10100000l -+ BIO_set_init (bio, 0); -+ BIO_set_data (bio, NULL);; // this is really (PSSLChannel *) -+ BIO_set_flags (bio, 0); -+#else - bio->init = 0; - bio->num = 0; - bio->ptr = NULL; // this is really (PSSLChannel *) - bio->flags = 0; -+#endif - - return(1); - } -@@ -1144,13 +1168,23 @@ static int Psock_free(BIO * bio) - if (bio == NULL) - return 0; - -+#if OPENSSL_VERSION_NUMBER >= 0x10100000l -+ if (BIO_get_shutdown (bio)) { -+ if (BIO_get_init (bio)) { -+#else - if (bio->shutdown) { - if (bio->init) { -+#endif - PSSLCHANNEL(bio)->Shutdown(PSocket::ShutdownReadAndWrite); - PSSLCHANNEL(bio)->Close(); - } -+#if OPENSSL_VERSION_NUMBER >= 0x10100000l -+ BIO_set_init (bio, 0); -+ BIO_set_flags (bio, 0); -+#else - bio->init = 0; - bio->flags = 0; -+#endif - } - return 1; - } -@@ -1160,11 +1194,19 @@ static long Psock_ctrl(BIO * bio, int cm - { - switch (cmd) { - case BIO_CTRL_SET_CLOSE: -+#if OPENSSL_VERSION_NUMBER >= 0x10100000l -+ BIO_set_shutdown (bio, (int)num); -+#else - bio->shutdown = (int)num; -+#endif - return 1; - - case BIO_CTRL_GET_CLOSE: -+#if OPENSSL_VERSION_NUMBER >= 0x10100000l -+ return BIO_get_shutdown (bio); -+#else - return bio->shutdown; -+#endif - - case BIO_CTRL_FLUSH: - return 1; -@@ -1239,41 +1281,64 @@ static int Psock_puts(BIO * bio, const c - }; - - --static BIO_METHOD methods_Psock = --{ -- BIO_TYPE_SOCKET, -- "PTLib-PSSLChannel", --#if (OPENSSL_VERSION_NUMBER < 0x00906000) -- (ifptr)Psock_write, -- (ifptr)Psock_read, -- (ifptr)Psock_puts, -- NULL, -- (lfptr)Psock_ctrl, -- (ifptr)Psock_new, -- (ifptr)Psock_free --#else -- Psock_write, -- Psock_read, -- Psock_puts, -- NULL, -- Psock_ctrl, -- Psock_new, -- Psock_free --#endif --}; -- - - PBoolean PSSLChannel::OnOpen() - { -+#if OPENSSL_VERSION_NUMBER >= 0x10100000l -+ static BIO_METHOD *methods_pSock = NULL; -+ -+ if (methods_pSock == NULL) { -+ methods_pSock = BIO_meth_new (BIO_TYPE_SOCKET, "PTLib-PSSLChannel"); -+ if (!methods_pSock) -+ return FALSE; -+ BIO_meth_set_write (methods_pSock, Psock_write); -+ BIO_meth_set_read (methods_pSock, Psock_read); -+ BIO_meth_set_puts (methods_pSock, Psock_puts); -+ BIO_meth_set_ctrl (methods_pSock, Psock_ctrl); -+ BIO_meth_set_create (methods_pSock, Psock_new); -+ BIO_meth_set_destroy (methods_pSock, Psock_free); -+ } -+ -+ BIO * bio = BIO_new(methods_pSock); -+#else -+ static BIO_METHOD methods_Psock = -+ { -+ BIO_TYPE_SOCKET, -+ "PTLib-PSSLChannel", -+ #if (OPENSSL_VERSION_NUMBER < 0x00906000) -+ (ifptr)Psock_write, -+ (ifptr)Psock_read, -+ (ifptr)Psock_puts, -+ NULL, -+ (lfptr)Psock_ctrl, -+ (ifptr)Psock_new, -+ (ifptr)Psock_free -+ #else -+ Psock_write, -+ Psock_read, -+ Psock_puts, -+ NULL, -+ Psock_ctrl, -+ Psock_new, -+ Psock_free -+ #endif -+ }; -+ - BIO * bio = BIO_new(&methods_Psock); -+#endif - if (bio == NULL) { - SSLerr(SSL_F_SSL_SET_FD,ERR_R_BUF_LIB); - return PFalse; - } - - // "Open" then bio -+#if OPENSSL_VERSION_NUMBER >= 0x10100000l -+ BIO_set_data (bio, this); -+ BIO_set_init (bio, 1); -+#else - bio->ptr = this; - bio->init = 1; -+#endif - - SSL_set_bio(ssl, bio, bio); - return PTrue; diff --git a/libraries/ptlib/ptlib-gcc8.patch b/libraries/ptlib/ptlib-gcc8.patch deleted file mode 100644 index c44669653211c..0000000000000 --- a/libraries/ptlib/ptlib-gcc8.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- ptlib-2.10.11/src/ptlib/unix/channel.cxx.orig 2018-07-23 18:25:26.300381968 +0100 -+++ ptlib-2.10.11/src/ptlib/unix/channel.cxx 2018-07-23 18:26:07.244497346 +0100 -@@ -36,7 +36,8 @@ - - #include <ptlib.h> - #include <sys/ioctl.h> -- -+#include <sys/uio.h> -+#include <unistd.h> - - #include "../common/pchannel.cxx" - diff --git a/libraries/ptlib/ptlib.SlackBuild b/libraries/ptlib/ptlib.SlackBuild deleted file mode 100644 index 670b776b72450..0000000000000 --- a/libraries/ptlib/ptlib.SlackBuild +++ /dev/null @@ -1,128 +0,0 @@ -#!/bin/bash - -# Slackware build script for PTLib - -# Copyright 2008-2009 Mauro Giachero -# Copyright 2011 David Woodfall -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''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 AUTHOR 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. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=ptlib -VERSION=${VERSION:-2.10.11} -BUILD=${BUILD:-2} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.xz -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -# Fix building with bison-3.0.4 -patch -p1 < $CWD/ptlib-2.10.11-bison_fixes-2.patch - -patch -p1 < $CWD/ptlib-gcc8.patch - -patch -p1 < $CWD/ptlib-2.10.11-openssl11.patch - -patch -p1 < $CWD/make-4.3.patch - -# The "LIBS" variable is set to fix OpenLDAP support -# -# The --disable-avc is here to avoid build problems when both libdv and -# libavc1394 are installed. According to -# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=516826 -# the problem lies in the usage of deprecated (and now removed) functions. -# Quoting from message #15: -# | We are planning on releasing ptlib 2.6 without DC nor AVC support and -# | redirecting people to use V4L. -# which is advised in the README file. -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -LIBS="-lgthread-2.0" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --enable-v4l \ - --disable-avc \ - --build=$ARCH-slackware-linux - -make -make install DESTDIR=$PKG - -# Remove static library -rm $PKG/usr/lib${LIBDIRSUFFIX}/libpt_s.a - -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a [A-LN-Z]* mpl-1.0.htm $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/libraries/ptlib/ptlib.info b/libraries/ptlib/ptlib.info deleted file mode 100644 index 4fc170dff1bf9..0000000000000 --- a/libraries/ptlib/ptlib.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="ptlib" -VERSION="2.10.11" -HOMEPAGE="http://www.opalvoip.org/" -DOWNLOAD="http://ftp.gnome.org/pub/gnome/sources/ptlib/2.10/ptlib-2.10.11.tar.xz" -MD5SUM="3ffdf89170dbfa6d29a015ef8741a4e4" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="David Woodfall" -EMAIL="dave@slackbuilds.org" diff --git a/libraries/ptlib/slack-desc b/libraries/ptlib/slack-desc deleted file mode 100644 index e5c35d5d728f0..0000000000000 --- a/libraries/ptlib/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -ptlib: ptlib (Portable Tools Library) -ptlib: -ptlib: PTLib is a moderately large class library that has it's genesis many -ptlib: years ago as PWLib (Portable Windows Library), a method to product -ptlib: applications to run on both Microsoft Windows and Unix systems. It -ptlib: has also been ported to many other systems. -ptlib: Since then the system has grown to include many classes that assist -ptlib: in writing complete multi-platform applications. So it became a -ptlib: Portable Tools Library and was renamed to PTLib. -ptlib: -ptlib: Homepage: http://www.opalvoip.org/ diff --git a/libraries/ptlib/ssl3.patch b/libraries/ptlib/ssl3.patch deleted file mode 100644 index 6fdb7cabea849..0000000000000 --- a/libraries/ptlib/ssl3.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -u -r ptlib-2.10.11/src/ptclib/pssl.cxx ptlib-2.10.11-nossl3/src/ptclib/pssl.cxx ---- ptlib-2.10.11/src/ptclib/pssl.cxx 2013-08-15 01:20:27.000000000 +0200 -+++ ptlib-2.10.11-nossl3/src/ptclib/pssl.cxx 2016-03-03 11:39:02.224835510 +0100 -@@ -805,13 +805,11 @@ - SSL_METHOD * meth; - - switch (method) { -- case SSLv3: -- meth = SSLv3_method(); -- break; - case TLSv1: - meth = TLSv1_method(); - break; - case SSLv23: -+ case SSLv3: - default: - meth = SSLv23_method(); - break; - |