[packages/lynx] - up to 2.8.9rel.1
arekm
arekm at pld-linux.org
Tue Sep 18 15:40:42 CEST 2018
commit 5dba916869e7cf033be67f6aadbbab2d4057414d
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Tue Sep 18 15:40:34 2018 +0200
- up to 2.8.9rel.1
format-security.patch | 20 --
lynx-acfix.patch | 556 --------------------------------------------------
lynx-autoconf.patch | 99 ---------
lynx-config.patch | 17 +-
lynx-pld.patch | 16 +-
lynx.cfg.patch | 50 ++---
lynx.spec | 24 +--
7 files changed, 42 insertions(+), 740 deletions(-)
---
diff --git a/lynx.spec b/lynx.spec
index 6b43709..786b049 100644
--- a/lynx.spec
+++ b/lynx.spec
@@ -10,12 +10,12 @@ Summary(pl.UTF-8): Przeglądarka WWW pracująca w trybie tekstowym
Summary(pt_BR.UTF-8): Navegador web modo texto
Summary(tr.UTF-8): Metin ekranda WWW tarayıcı
Name: lynx
-Version: 2.8.7rel.2
-Release: 5
+Version: 2.8.9rel.1
+Release: 1
License: GPL
Group: Applications/Networking
-Source0: http://lynx.isc.org/lynx2.8.7/%{name}%{version}.tar.bz2
-# Source0-md5: cb936aef812e4e463ab86cbbe14d4db9
+Source0: https://invisible-mirror.net/archives/lynx/tarballs/%{name}%{version}.tar.bz2
+# Source0-md5: 44316f1b8a857b59099927edc26bef79
Source1: %{name}.desktop
Source2: %{name}.png
Source3: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
@@ -24,14 +24,13 @@ Patch0: %{name}-pld.patch
Patch1: %{name}.cfg.patch
Patch2: %{name}-po_DESTDIR.patch
Patch3: %{name}-config.hin.patch
-Patch4: %{name}-autoconf.patch
+
Patch5: %{name}-config.patch
-Patch6: %{name}-acfix.patch
+
Patch7: %{name}-gzip_fallback.patch
Patch8: %{name}-etc_dir.patch
-Patch9: format-security.patch
URL: http://lynx.browser.org/
-BuildRequires: autoconf
+BuildRequires: autoconf-dickey
BuildRequires: automake
BuildRequires: bzip2-devel
BuildRequires: gettext-tools
@@ -90,21 +89,20 @@ Metin ekranda çalışan bir WWW tarayıcıdır. Şekil gösteremese de,
formlar ve tablolar için desteği vardır.
%prep
-%setup -q -n %{name}2-8-7
+%setup -q -n %{name}%{version}
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
-%patch4 -p1
+
%patch5 -p1
-%patch6 -p1
+
%patch7 -p1
%patch8 -p1
-%patch9 -p1
%build
cp /usr/share/automake/config.sub .
-%{__autoconf}
+autoconf-dickey
%configure \
--with-screen=ncursesw \
--without-included-gettext \
diff --git a/format-security.patch b/format-security.patch
deleted file mode 100644
index d9fe76c..0000000
--- a/format-security.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- lynx2-8-7/src/HTML.c~ 2009-06-23 23:53:58.000000000 +0000
-+++ lynx2-8-7/src/HTML.c 2015-01-01 18:21:04.617496824 +0000
-@@ -2716,13 +2716,13 @@
- }
- }
- if (seqtype == 'A') {
-- sprintf(number_string, LYUppercaseA_OL_String(seqnum));
-+ sprintf(number_string, "%s", LYUppercaseA_OL_String(seqnum));
- } else if (seqtype == 'a') {
-- sprintf(number_string, LYLowercaseA_OL_String(seqnum));
-+ sprintf(number_string, "%s", LYLowercaseA_OL_String(seqnum));
- } else if (seqtype == 'I') {
-- sprintf(number_string, LYUppercaseI_OL_String(seqnum));
-+ sprintf(number_string, "%s", LYUppercaseI_OL_String(seqnum));
- } else if (seqtype == 'i') {
-- sprintf(number_string, LYLowercaseI_OL_String(seqnum));
-+ sprintf(number_string, "%s", LYLowercaseI_OL_String(seqnum));
- } else {
- sprintf(number_string, "%2d.", seqnum);
- }
diff --git a/lynx-acfix.patch b/lynx-acfix.patch
deleted file mode 100644
index fac4a40..0000000
--- a/lynx-acfix.patch
+++ /dev/null
@@ -1,556 +0,0 @@
---- lynx2-8-7/config.hin~ 2009-07-06 14:12:59.000000000 +0200
-+++ lynx2-8-7/config.hin 2009-07-06 14:42:22.000000000 +0200
-@@ -7,314 +7,313 @@
- #ifndef LYNX_CFG_H
- #define LYNX_CFG_H 1
-
--#undef ALL_CHARSETS /* AC_ARG_WITH(charsets) */
--#undef ALT_CHAR_SET /* CF_ALT_CHAR_SET */
--#undef ARCHIVE_ONLY /* CF_ARG_DISABLE(dired-archive) */
--#undef BZIP2_PATH /* CF_PATH_PROG(bzip2) */
--#undef CAN_SET_ERRNO /* CF_SET_ERRNO */
--#undef CHMOD_PATH /* CF_PATH_PROG(chmod) */
--#undef CJK_EX /* CF_ARG_ENABLE(cjk) */
--#undef COLOR_CURSES /* CF_COLOR_CURSES */
--#undef COMPRESS_PATH /* CF_PATH_PROG(compress) */
--#undef COPY_PATH /* CF_PATH_PROG(cp) */
--#undef CURS_PERFORMANCE /* CF_CURS_PERFORMANCE */
--#undef DEBUG /* configure --enable-debug */
-+#undef ALL_CHARSETS
-+#undef ALT_CHAR_SET
-+#undef ANSI_VARARGS
-+#undef ARCHIVE_ONLY
-+#undef BZIP2_PATH
-+#undef CAN_SET_ERRNO
-+#undef CHMOD_PATH
-+#undef CJK_EX
-+#undef COLOR_CURSES
-+#undef COMPRESS_PATH
-+#undef COPY_PATH
-+#undef CURS_PERFORMANCE
-+#undef DEBUG
- #undef DECL_ERRNO
- #undef DECL_GETGRGID
- #undef DECL_GETGRNAM
- #undef DECL_STRSTR
- #undef DECL_SYS_ERRLIST
--#undef DIRED_SUPPORT /* AC_ARG_WITH(dired) */
--#undef DISABLE_BIBP /* CF_ARG_DISABLE(bibp-urls) */
--#undef DISABLE_FINGER /* CF_ARG_DISABLE(finger) */
--#undef DISABLE_FTP /* CF_ARG_DISABLE(ftp) */
--#undef DISABLE_GOPHER /* CF_ARG_DISABLE(gopher) */
--#undef DISABLE_NEWS /* CF_ARG_DISABLE(news) */
--#undef DISP_PARTIAL /* CF_ARG_ENABLE(partial) */
--#undef DONT_HAVE_TM_GMTOFF /* CF_TM_GMTOFF */
--#undef DONT_TRACK_INTERNAL_LINKS /* CF_ARG_DISABLE(internal-links) */
--#undef ENABLE_IPV6 /* CF_CHECK_IPV6 */
--#undef ENABLE_NLS /* defined if NLS is requested */
--#undef ENABLE_OPTS_CHANGE_EXEC /* CF_ARG_ENABLE(change-exec) */
--#undef EXEC_LINKS /* CF_ARG_ENABLE(exec-links) */
--#undef EXEC_SCRIPTS /* CF_ARG_ENABLE(exec-scripts) */
--#undef EXP_ADDRLIST_PAGE /* CF_ARG_ENABLE(addrlist-page) */
--#undef EXP_ALT_BINDINGS /* CF_ARG_ENABLE(alt-bindings) */
--#undef EXP_ASCII_CTYPES /* CF_ARG_ENABLE(ascii-ctypes) */
--#undef EXP_CHARSET_CHOICE /* CF_ARG_ENABLE(charset-choice) */
--#undef EXP_CHARTRANS_AUTOSWITCH /* CF_ARG_ENABLE(font-switch) */
--#undef EXP_JAPANESEUTF8_SUPPORT /* CF_ARG_ENABLE(japanese-utf8) */
--#undef EXP_JUSTIFY_ELTS /* CF_ARG_ENABLE(justify-elts) */
--#undef EXP_KEYBOARD_LAYOUT /* CF_ARG_ENABLE(kbd-layout) */
--#undef EXP_LIBJS /* CF_ARG_ENABLE(libjs) */
--#undef EXP_NESTED_TABLES /* CF_ARG_ENABLE(nested-tables) */
--#undef FANCY_CURSES /* CF_FANCY_CURSES */
--#undef GCC_NORETURN /* CF_GCC_ATTRIBUTES */
--#undef GCC_PRINTF /* CF_GCC_ATTRIBUTES */
--#undef GCC_UNUSED /* CF_GCC_ATTRIBUTES */
--#undef GETGROUPS_T /* AC_TYPE_GETGROUPS */
--#undef GZIP_PATH /* CF_PATH_PROG(gzip) */
--#undef HAVE_ALLOCA /* AM_GNU_GETTEXT/AC_FUNC_ALLOCA */
--#undef HAVE_ALLOCA_H /* AM_GNU_GETTEXT/AC_FUNC_ALLOCA */
--#undef HAVE_ARGZ_H /* AM_GNU_GETTEXT */
-+#undef DIRED_SUPPORT
-+#undef DISABLE_BIBP
-+#undef DISABLE_FINGER
-+#undef DISABLE_FTP
-+#undef DISABLE_GOPHER
-+#undef DISABLE_NEWS
-+#undef DISP_PARTIAL
-+#undef DONT_TRACK_INTERNAL_LINKS
-+#undef ENABLE_IPV6
-+#undef ENABLE_NLS
-+#undef ENABLE_OPTS_CHANGE_EXEC
-+#undef EXEC_LINKS
-+#undef EXEC_SCRIPTS
-+#undef EXP_ADDRLIST_PAGE
-+#undef EXP_ALT_BINDINGS
-+#undef EXP_CHARSET_CHOICE
-+#undef EXP_CHARTRANS_AUTOSWITCH
-+#undef EXP_JAPANESEUTF8_SUPPORT
-+#undef EXP_JUSTIFY_ELTS
-+#undef EXP_KEYBOARD_LAYOUT
-+#undef EXP_LOCALE_CHARSET
-+#undef EXP_LIBJS
-+#undef EXP_NESTED_TABLES
-+#undef FANCY_CURSES
-+#undef GCC_NORETURN
-+#undef GCC_PRINTF
-+#undef GCC_UNUSED
-+#undef GETGROUPS_T
-+#undef GZIP_PATH
-+#undef HAVE_ALLOCA
-+#undef HAVE_ALLOCA_H
-+#undef HAVE_ARGZ_H
- #undef HAVE_ARPA_INET_H
--#undef HAVE_ASSUME_DEFAULT_COLORS /* ncurses extension */
--#undef HAVE_BSD_TOUCHLINE /* CF_CURS_TOUCHLINE */
--#undef HAVE_CATGETS /* defined if you want to use non-GNU catgets */
-+#undef HAVE_ASSUME_DEFAULT_COLORS
-+#undef HAVE_BSD_TOUCHLINE
-+#undef HAVE_CATGETS
- #undef HAVE_CBREAK
- #undef HAVE_CTERMID
- #undef HAVE_CURSESX_H
--#undef HAVE_CURSES_VERSION /* CF_FUNC_CURSES_VERSION */
-+#undef HAVE_CURSES_VERSION
- #undef HAVE_CUSERID
--#undef HAVE_DCGETTEXT /* AM_GNU_GETTEXT */
-+#undef HAVE_DCGETTEXT
- #undef HAVE_DEFINE_KEY
--#undef HAVE_DELSCREEN /* CF_CURSES_FUNCS */
--#undef HAVE_DIRENT_H /* AC_HEADER_DIRENT */
--#undef HAVE_FCNTL_H /* have <fcntl.h> */
-+#undef HAVE_DELSCREEN
-+#undef HAVE_DIRENT_H
-+#undef HAVE_FCNTL_H
- #undef HAVE_FTIME
--#undef HAVE_GAI_STRERROR /* CF_CHECK_IPV6 */
--#undef HAVE_GETADDRINFO /* CF_CHECK_IPV6 */
-+#undef HAVE_GAI_STRERROR
-+#undef HAVE_GETADDRINFO
- #undef HAVE_GETATTRS
- #undef HAVE_GETBEGX
- #undef HAVE_GETBEGY
--#undef HAVE_GETBKGD /* CF_COLOR_CURSES */
-+#undef HAVE_GETBKGD
- #undef HAVE_GETCWD
- #undef HAVE_GETGROUPS
--#undef HAVE_GETTEXT /* defined if you want to use non-GNU gettext */
- #undef HAVE_GETTIMEOFDAY
- #undef HAVE_GETUID
- #undef HAVE_H_ERRNO
--#undef HAVE_ICONV /* AM_ICONV */
--#undef HAVE_INET_ATON /* CF_INET_ADDR */
-+#undef HAVE_ICONV
-+#undef HAVE_INET_ATON
- #undef HAVE_INTTYPES_H
- #undef HAVE_JCURSES_H
- #undef HAVE_KEYPAD
--#undef HAVE_LANGINFO_CODESET /* AM_LANGINFO_CODESET */
--#undef HAVE_LC_MESSAGES /* locale messages */
--#undef HAVE_LIBDBMALLOC /* --with-dbmalloc */
--#undef HAVE_LIBDMALLOC /* --with-dmalloc */
--#undef HAVE_LIBGETTEXT_H /* defined if you want to use bundled gettext */
--#undef HAVE_LIBINTL_H /* AM_GNU_GETTEXT, or cleanup from that */
--#undef HAVE_LIBUTF8_H /* may be needed for libncursesw */
-+#undef HAVE_LANGINFO_CODESET
-+#undef HAVE_LC_MESSAGES
-+#undef HAVE_LIBDBMALLOC
-+#undef HAVE_LIBDMALLOC
-+#undef HAVE_LIBGETTEXT_H
-+#undef HAVE_LIBINTL_H
-+#undef HAVE_LIBUTF8_H
- #undef HAVE_LIMITS_H
- #undef HAVE_LOCALE_H
--#undef HAVE_LSTAT /* CF_FUNC_LSTAT */
--#undef HAVE_MALLOC_H /* AM_GNU_GETTEXT */
--#undef HAVE_MBSTATE_T /* CF_WIDEC_CURSES */
-+#undef HAVE_LSTAT
-+#undef HAVE_MALLOC_H
-+#undef HAVE_MBSTATE_T
- #undef HAVE_MKDTEMP
- #undef HAVE_MKTEMP
--#undef HAVE_MMAP /* AM_GNU_GETTEXT */
--#undef HAVE_MUNMAP /* AM_GNU_GETTEXT */
-+#undef HAVE_MMAP
-+#undef HAVE_MUNMAP
- #undef HAVE_NAPMS
--#undef HAVE_NCURSESW_NCURSES_H /* defined if we include <ncursesw/ncurses.h> */
--#undef HAVE_NCURSESW_TERM_H /* have <ncursesw/term.h> */
--#undef HAVE_NCURSES_H /* defined if we include <ncurses.h> */
--#undef HAVE_NCURSES_NCURSES_H /* defined if we include <ncurses/ncurses.h> */
--#undef HAVE_NCURSES_TERM_H /* have <ncurses/term.h> */
-+#undef HAVE_NCURSESW_NCURSES_H
-+#undef HAVE_NCURSESW_TERM_H
-+#undef HAVE_NCURSES_H
-+#undef HAVE_NCURSES_NCURSES_H
-+#undef HAVE_NCURSES_TERM_H
- #undef HAVE_NEWPAD
- #undef HAVE_NEWTERM
--#undef HAVE_NL_TYPES_H /* AM_GNU_GETTEXT */
-+#undef HAVE_NL_TYPES_H
- #undef HAVE_PNOUTREFRESH
- #undef HAVE_POPEN
- #undef HAVE_PUTENV
- #undef HAVE_READDIR
- #undef HAVE_RESIZETERM
- #undef HAVE_RESOLV_H
--#undef HAVE_SETENV /* AM_GNU_GETTEXT */
-+#undef HAVE_SETENV
- #undef HAVE_SETLOCALE
- #undef HAVE_SETUID
--#undef HAVE_SIGACTION /* CF_FUNC_SIGACTION */
--#undef HAVE_SIZECHANGE /* CF_SIZECHANGE */
--#undef HAVE_STDARG_H /* CF_VARARGS */
-+#undef HAVE_SIGACTION
-+#undef HAVE_SIZECHANGE
-+#undef HAVE_STDARG_H
- #undef HAVE_STDLIB_H
--#undef HAVE_STPCPY /* AM_GNU_GETTEXT */
--#undef HAVE_STRCASECMP /* AM_GNU_GETTEXT */
--#undef HAVE_STRCHR /* AM_GNU_GETTEXT */
-+#undef HAVE_STPCPY
-+#undef HAVE_STRCASECMP
-+#undef HAVE_STRCHR
- #undef HAVE_STRERROR
- #undef HAVE_STRING_H
--#undef HAVE_STRUCT_DIRENT64 /* CF_LARGEFILE */
-+#undef HAVE_STRUCT_DIRENT64
- #undef HAVE_SYSLOG_H
--#undef HAVE_SYSV_TOUCHLINE /* CF_CURS_TOUCHLINE */
--#undef HAVE_SYS_DIR_H /* AC_HEADER_DIRENT */
--#undef HAVE_SYS_FCNTL_H /* have <sys/fcntl.h> */
--#undef HAVE_SYS_FILIO_H /* have <sys/filio.h> */
--#undef HAVE_SYS_IOCTL_H /* have <sys/ioctl.h> */
--#undef HAVE_SYS_NDIR_H /* AC_HEADER_DIRENT */
--#undef HAVE_SYS_PARAM_H /* AM_GNU_GETTEXT */
--#undef HAVE_SYS_TIME_H /* have <sys/time.h> */
--#undef HAVE_SYS_TIMEB_H /* have <sys/timeb.h> */
--#undef HAVE_SYS_WAIT_H /* have <sys/wait.h> */
--#undef HAVE_TERMIOS_H /* have <termios.h> */
--#undef HAVE_TERMIO_H /* have <termio.h> */
--#undef HAVE_TERM_H /* have <term.h> */
-+#undef HAVE_SYSV_TOUCHLINE
-+#undef HAVE_SYS_DIR_H
-+#undef HAVE_SYS_FCNTL_H
-+#undef HAVE_SYS_FILIO_H
-+#undef HAVE_SYS_IOCTL_H
-+#undef HAVE_SYS_NDIR_H
-+#undef HAVE_SYS_PARAM_H
-+#undef HAVE_SYS_TIME_H
-+#undef HAVE_SYS_TIMEB_H
-+#undef HAVE_SYS_WAIT_H
-+#undef HAVE_TERMIOS_H
-+#undef HAVE_TERMIO_H
-+#undef HAVE_TERM_H
- #undef HAVE_TOUCHLINE
- #undef HAVE_TOUCHWIN
- #undef HAVE_TRUNCATE
- #undef HAVE_TTYNAME
- #undef HAVE_TTYTYPE
--#undef HAVE_TYPE_CHTYPE /* CF_CURSES_CHTYPE */
--#undef HAVE_TYPE_UNIONWAIT /* CF_UNION_WAIT */
--#undef HAVE_UNISTD_H /* have <unistd.h> */
-+#undef HAVE_TYPE_CHTYPE
-+#undef HAVE_TYPE_UNIONWAIT
-+#undef HAVE_UNISTD_H
- #undef HAVE_UNSETENV
--#undef HAVE_USE_DEFAULT_COLORS /* ncurses extension */
--#undef HAVE_USE_LEGACY_CODING /* ncurses extension */
-+#undef HAVE_USE_DEFAULT_COLORS
-+#undef HAVE_USE_LEGACY_CODING
- #undef HAVE_USLEEP
--#undef HAVE_UTMP /* CF_UTMP */
--#undef HAVE_UTMP_UT_HOST /* CF_UTMP_UT_HOST */
--#undef HAVE_UTMP_UT_SESSION /* CF_UTMP_UT_SESSION */
--#undef HAVE_UTMP_UT_XSTATUS /* CF_UTMP_UT_XSTATUS */
--#undef HAVE_UTMP_UT_XTIME /* CF_UTMP_UT_XTIME */
--#undef HAVE_VALUES_H /* AM_GNU_GETTEXT */
--#undef HAVE_VARARGS_H /* CF_VARARGS */
-+#undef HAVE_UTMP
-+#undef HAVE_UTMP_UT_HOST
-+#undef HAVE_UTMP_UT_SESSION
-+#undef HAVE_UTMP_UT_XSTATUS
-+#undef HAVE_UTMP_UT_XTIME
-+#undef HAVE_VALUES_H
-+#undef HAVE_VARARGS_H
- #undef HAVE_VASPRINTF
--#undef HAVE_VFORK_H /* have <vfork.h> */
-+#undef HAVE_VFORK_H
- #undef HAVE_WAITPID
- #undef HAVE_WATTR_GET
- #undef HAVE_WBORDER
--#undef HAVE_WINDOWS_H /* CF_NETLIBS */
--#undef HAVE_WINSOCK2_H /* CF_NETLIBS */
--#undef HAVE_WINSOCK_H /* CF_NETLIBS */
-+#undef HAVE_WINDOWS_H
-+#undef HAVE_WINSOCK2_H
-+#undef HAVE_WINSOCK_H
- #undef HAVE_WREDRAWLN
- #undef HAVE_WRESIZE
--#undef HAVE_XCURSES /* CF_PDCURSES_X11 */
-+#undef HAVE_XCURSES
- #undef HAVE_ZERROR
--#undef HAVE__NC_FREEALL /* ncurses debugging extension */
--#undef HAVE__NC_FREE_AND_EXIT /* ncurses debugging extension */
--#undef HAVE___ARGZ_COUNT /* AM_GNU_GETTEXT */
--#undef HAVE___ARGZ_NEXT /* AM_GNU_GETTEXT */
--#undef HAVE___ARGZ_STRINGIFY /* AM_GNU_GETTEXT */
-+#undef HAVE__NC_FREEALL
-+#undef HAVE__NC_FREE_AND_EXIT
-+#undef HAVE___ARGZ_COUNT
-+#undef HAVE___ARGZ_NEXT
-+#undef HAVE___ARGZ_STRINGIFY
- #undef ICONV_CONST
--#undef IGNORE_CTRL_C /* FIXME: make tests? */
--#undef INCLUDE_PROTOTYPES /* CF_SOCKS5 */
--#undef INSTALL_ARGS /* CF_PATH_PROG(install) */
--#undef INSTALL_PATH /* CF_PATH_PROG(install) */
--#undef LINUX /* FIXME: make tests? */
--#undef LOCALE /* for locale support */
--#undef LONG_LIST /* CF_ARG_DISABLE(long-list) */
--#undef LYNXCGI_LINKS /* CF_ARG_ENABLE(cgi-links) */
--#undef LYNX_CFG_FILE /* $sysconfdir/lynx.cfg */
--#undef LYNX_LSS_FILE /* $sysconfdir/lynx.lss */
--#undef LYNX_RAND_MAX /* CF_SRAND */
--#undef LY_FIND_LEAKS /* CF_ARG_ENABLE(find-leaks) */
--#undef LY_TRACELINE /* CF_ARG_ENABLE(vertrace) */
--#undef MIME_LIBDIR /* CF_WITH_PATH(mime-libdir */
--#undef MKDIR_PATH /* CF_PATH_PROG(mkdir) */
--#undef MV_PATH /* CF_PATH_PROG(mv) */
--#undef NCURSES /* defined for ncurses support */
--#undef NCURSES_BROKEN /* defined for ncurses color support */
--#undef NEED_PTEM_H /* CF_SIZECHANGE */
--#undef NEED_REMOVE /* CF_REMOVE_BROKEN */
--#undef NEED_WCHAR_H /* CF_WIDEC_CURSES */
--#undef NGROUPS /* CF_NGROUPS */
--#undef NO_CHANGE_EXECUTE_PERMS /* CF_ARG_DISABLE(dired-xpermit) */
--#undef NO_CONFIG_INFO /* CF_ARG_DISABLE(config-info) */
--#undef NO_EXTENDED_HTMLDTD /* CF_ARG_DISABLE(extended-dtd) */
--#undef NO_LYNX_TRACE /* CF_ARG_DISABLE(trace) */
--#undef NO_OPTION_FORMS /* CF_ARG_DISABLE(forms-options) */
--#undef NO_OPTION_MENU /* CF_ARG_DISABLE(option-menu) */
--#undef NO_PARENT_DIR_REFERENCE /* CF_ARG_DISABLE(parent-dir-refs) */
--#undef NSL_FORK /* CF_ARG_ENABLE(nsl-fork) */
-+#undef IGNORE_CTRL_C
-+#undef INCLUDE_PROTOTYPES
-+#undef INSTALL_ARGS
-+#undef INSTALL_PATH
-+#undef LINUX
-+#undef LOCALE
-+#undef LONG_LIST
-+#undef LYNXCGI_LINKS
-+#undef LYNX_CFG_FILE
-+#undef LYNX_LSS_FILE
-+#undef LYNX_RAND_MAX
-+#undef LY_FIND_LEAKS
-+#undef LY_TRACELINE
-+#undef MIME_LIBDIR
-+#undef MKDIR_PATH
-+#undef MV_PATH
-+#undef NCURSES
-+#undef NCURSES_BROKEN
-+#undef NEED_PTEM_H
-+#undef NEED_REMOVE
-+#undef NEED_WCHAR_H
-+#undef NGROUPS
-+#undef NO_CHANGE_EXECUTE_PERMS
-+#undef NO_CONFIG_INFO
-+#undef NO_EXTENDED_HTMLDTD
-+#undef NO_LYNX_TRACE
-+#undef NO_OPTION_FORMS
-+#undef NO_OPTION_MENU
-+#undef NO_PARENT_DIR_REFERENCE
-+#undef NSL_FORK
- #undef OK_INSTALL
--#undef OK_OVERRIDE /* CF_ARG_DISABLE(dired-override) */
--#undef OK_PERMIT /* CF_ARG_DISABLE(dired-permit) */
--#undef REAL_UNIX_SYSTEM /* CF_SLANG_UNIX_DEFS */
--#undef RLOGIN_PATH /* CF_PATH_PROG(rlogin) */
--#undef RM_PATH /* CF_PATH_PROG(rm) */
--#undef SETFONT_PATH /* CF_PATH_PROG(setfont) */
--#undef SIZEOF_INT /* AC_CHECK_SIZEOF(int) */
--#undef SIZEOF_LONG /* AC_CHECK_SIZEOF(long) */
--#undef SIZEOF_OFF_T /* AC_CHECK_SIZEOF(off_t) */
--#undef SIZEOF_TIME_T /* AC_CHECK_SIZEOF(time_t) */
--#undef SOCKS /* CF_SOCKS, CF_SOCKS5 */
-+#undef OK_OVERRIDE
-+#undef OK_PERMIT
-+#undef REAL_UNIX_SYSTEM
-+#undef RLOGIN_PATH
-+#undef RM_PATH
-+#undef SETFONT_PATH
-+#undef SIZEOF_INT
-+#undef SIZEOF_LONG
-+#undef SIZEOF_OFF_T
-+#undef SIZEOF_TIME_T
-+#undef SOCKS
- #undef STDC_HEADERS
--#undef SYSTEM_MAIL /* CF_DEFINE_PROG */
--#undef SYSTEM_MAIL_FLAGS /* CF_SYSTEM_MAIL_FLAGS */
--#undef SYSTEM_NAME /* CF_CHECK_CACHE */
--#undef TAR_DOWN_OPTIONS /* CF_TAR_OPTIONS */
--#undef TAR_FILE_OPTIONS /* CF_TAR_OPTIONS */
--#undef TAR_PATH /* CF_PATH_PROG(tar) */
--#undef TAR_PIPE_OPTIONS /* CF_TAR_OPTIONS */
--#undef TAR_UP_OPTIONS /* CF_TAR_OPTIONS */
--#undef TELNET_PATH /* CF_PATH_PROG(telnet) */
--#undef TERMIO_AND_CURSES /* CF_TERMIO_AND_CURSES workaround */
--#undef TERMIO_AND_TERMIOS /* CF_TERMIO_AND_TERMIOS workaround */
--#undef TIME_WITH_SYS_TIME /* AC_HEADER_TIME */
--#undef TN3270_PATH /* CF_PATH_PROG(tn3270) */
--#undef TOUCH_PATH /* CF_PATH_PROG(touch) */
--#undef ULTRIX /* config.sub */
--#undef UNCOMPRESS_PATH /* CF_PATH_PROG(gunzip) */
--#undef UNDERLINE_LINKS /* CF_ARG_ENABLE(underlines) */
-+#undef SYSTEM_MAIL
-+#undef SYSTEM_MAIL_FLAGS
-+#undef SYSTEM_NAME
-+#undef TAR_DOWN_OPTIONS
-+#undef TAR_FILE_OPTIONS
-+#undef TAR_PATH
-+#undef TAR_PIPE_OPTIONS
-+#undef TAR_UP_OPTIONS
-+#undef TELNET_PATH
-+#undef TERMIO_AND_CURSES
-+#undef TERMIO_AND_TERMIOS
-+#undef TIME_WITH_SYS_TIME
-+#undef TN3270_PATH
-+#undef TOUCH_PATH
-+#undef ULTRIX
-+#undef UNCOMPRESS_PATH
-+#undef UNDERLINE_LINKS
- #undef UNIX
--#undef UNZIP_PATH /* CF_PATH_PROG(unzip) */
--#undef USE_BZLIB /* AC_ARG_WITH(bzlib) */
--#undef USE_CACHEJAR /* CF_ARG_ENABLE(session-cache) */
--#undef USE_COLOR_STYLE /* CF_ARG_ENABLE(color-style) */
--#undef USE_DEFAULT_COLORS /* CF_ARG_ENABLE(default-colors) */
--#undef USE_EXECVP /* CF_ARG_DISABLE(full-paths) */
--#undef USE_EXTERNALS /* CF_ARG_ENABLE(externs) */
--#undef USE_FCNTL /* CF_FIONBIO */
--#undef USE_FILE_UPLOAD /* CF_ARG_ENABLE(file-upload) */
--#undef USE_GNUTLS_FUNCS /* CF_GNUTLS */
--#undef USE_GNUTLS_INCL /* CF_GNUTLS */
--#undef USE_LOCALE_CHARSET /* CF_ARG_ENABLE(locale-charset) */
--#undef USE_OPENSSL_INCL /* CF_SSL */
--#undef USE_PERSISTENT_COOKIES /* CF_ARG_ENABLE(persistent-cookies) */
--#undef USE_PRETTYSRC /* CF_ARG_ENABLE(prettysrc) */
--#undef USE_PROGRESSBAR /* CF_ARG_ENABLE(progressbar) */
--#undef USE_READPROGRESS /* CF_ARG_ENABLE(read-eta) */
--#undef USE_SCROLLBAR /* CF_ARG_ENABLE(scrollbar) */
--#undef USE_SESSIONS /* CF_ARG_ENABLE(sessions) */
--#undef USE_SLANG /* AC_ARG_WITH(screen=slang) */
--#undef USE_SOCKS4_PREFIX /* CF_SOCKS5 */
--#undef USE_SOCKS5 /* CF_SOCKS5 */
--#undef USE_SOURCE_CACHE /* CF_ARG_ENABLE(source-cache) */
--#undef USE_SSL /* CF_SSL */
--#undef USE_SYSV_UTMP /* CF_UTMP */
--#undef USE_X509_SUPPORT /* CF_GNUTLS, CF_SSL */
--#undef USE_ZLIB /* AC_ARG_WITH(zlib) */
--#undef UTF8 /* CF_SLANG_CPPFLAGS */
--#undef UTMPX_FOR_UTMP /* use <utmpx.h> since <utmp.h> not found */
--#undef UUDECODE_PATH /* CF_PATH_PROG(uudecode) */
--#undef WAITPID_USES_UNION /* CF_FUNC_WAIT */
--#undef WAIT_USES_UNION /* CF_FUNC_WAIT */
--#undef WIDEC_CURSES /* CF_WIDEC_CURSES */
--#undef XCURSES /* CF_PDCURSES_X11 */
--#undef ZCAT_PATH /* CF_PATH_PROG(zcat) */
--#undef ZIP_PATH /* CF_PATH_PROG(zip) */
--#undef _WINDOWS_NSL /* CF_ARG_ENABLE(nsl-fork) */
--#undef inline /* AC_C_INLINE */
--#undef lynx_rand /* CF_SRAND */
--#undef lynx_srand /* CF_SRAND */
--#undef mode_t /* AC_TYPE_MODE_T */
--#undef off_t /* AC_TYPE_OFF_T */
--#undef pid_t /* AC_TYPE_PID_T */
--#undef socklen_t /* CF_CHECK_TYPE(socklen_t,...) */
--#undef uid_t /* AC_TYPE_UID_T */
--#undef ut_name /* CF_UTMP */
--#undef ut_xstatus /* CF_UTMP_UT_XSTATUS */
--#undef ut_xtime /* CF_UTMP_UT_XTIME */
-+#undef UNZIP_PATH
-+#undef USE_BZLIB
-+#undef USE_CACHEJAR
-+#undef USE_COLOR_STYLE
-+#undef USE_DEFAULT_COLORS
-+#undef USE_EXECVP
-+#undef USE_EXTERNALS
-+#undef USE_FCNTL
-+#undef USE_FILE_UPLOAD
-+#undef USE_GNUTLS_FUNCS
-+#undef USE_GNUTLS_INCL
-+#undef USE_LOCALE_CHARSET
-+#undef USE_OPENSSL_INCL
-+#undef USE_PERSISTENT_COOKIES
-+#undef USE_PRETTYSRC
-+#undef USE_PROGRESSBAR
-+#undef USE_READPROGRESS
-+#undef USE_SCROLLBAR
-+#undef USE_SESSIONS
-+#undef USE_SLANG
-+#undef USE_SOCKS4_PREFIX
-+#undef USE_SOCKS5
-+#undef USE_SOURCE_CACHE
-+#undef USE_SSL
-+#undef USE_SYSV_UTMP
-+#undef USE_X509_SUPPORT
-+#undef USE_ZLIB
-+#undef UTF8
-+#undef UTMPX_FOR_UTMP
-+#undef UUDECODE_PATH
-+#undef WAITPID_USES_UNION
-+#undef WAIT_USES_UNION
-+#undef WIDEC_CURSES
-+#undef XCURSES
-+#undef ZCAT_PATH
-+#undef ZIP_PATH
-+#undef _WINDOWS_NSL
-+#undef inline
-+#undef lynx_rand
-+#undef lynx_srand
-+#undef mode_t
-+#undef off_t
-+#undef pid_t
-+#undef socklen_t
-+#undef uid_t
-+#undef ut_name
-+#undef ut_xstatus
-+#undef ut_xtime
-
- #ifdef GZIP_PATH
--#undef OK_GZIP /* CF_ARG_DISABLE(dired-gzip) */
-+#undef OK_GZIP
- #endif
-
- #ifdef TAR_PATH
--#undef OK_TAR /* CF_ARG_DISABLE(dired-tar) */
-+#undef OK_TAR
- #endif
-
- #ifdef UUDECODE_PATH
--#undef OK_UUDECODE /* CF_ARG_DISABLE(dired-uudecode) */
-+#undef OK_UUDECODE
- #endif
-
- #ifdef ZIP_PATH
--#undef OK_ZIP /* CF_ARG_DISABLE(dired-zip) */
-+#undef OK_ZIP
- #endif
-
- /*
- * U/Win defines vfork() as a macro in vfork.h, which is included from unistd.h.
- */
- #ifndef HAVE_VFORK_H
--#undef vfork /* AC_FUNC_FORK */
-+#undef vfork
- #endif
-
- /* 'const' may be defined externally by the compiler-wrapper, as in 'unproto'
-@@ -351,7 +350,7 @@
- #endif
-
- #ifdef HAVE_SYSLOG_H
--#undef SYSLOG_REQUESTED_URLS /* CF_ARG_ENABLE(syslog) */
-+#undef SYSLOG_REQUESTED_URLS
- #endif
-
- #ifndef HAVE_LSTAT
diff --git a/lynx-autoconf.patch b/lynx-autoconf.patch
deleted file mode 100644
index 3cc9656..0000000
--- a/lynx-autoconf.patch
+++ /dev/null
@@ -1,99 +0,0 @@
---- lynx2-8-7/aclocal.m4~ 2009-02-02 02:41:02.000000000 +0100
-+++ lynx2-8-7/aclocal.m4 2009-07-06 13:56:14.000000000 +0200
-@@ -50,7 +50,6 @@
- AC_REQUIRE([AC_HEADER_STDC])dnl
- AC_REQUIRE([AC_C_CONST])dnl
- AC_REQUIRE([AC_C_INLINE])dnl
-- AC_REQUIRE([AC_TYPE_OFF_T])dnl
- AC_REQUIRE([AC_TYPE_SIZE_T])dnl
- AC_REQUIRE([AC_FUNC_ALLOCA])dnl
- AC_REQUIRE([AC_FUNC_MMAP])dnl
-@@ -2884,9 +2883,7 @@
- dnl CF_HELP_MESSAGE version: 3 updated: 1998/01/14 10:56:23
- dnl ---------------
- dnl Insert text into the help-message, for readability, from AC_ARG_WITH.
--AC_DEFUN([CF_HELP_MESSAGE],
--[AC_DIVERT_HELP([$1])dnl
--])dnl
-+AC_DEFUN([CF_HELP_MESSAGE],[])
- dnl ---------------------------------------------------------------------------
- dnl CF_INET_ADDR version: 4 updated: 1999/03/30 12:24:31
- dnl ------------
---- lynx2-8-7/configure.in~ 2009-04-26 18:24:31.000000000 +0200
-+++ lynx2-8-7/configure.in 2009-07-06 13:59:02.000000000 +0200
-@@ -40,7 +40,6 @@
- # run to the next, as well as with tests that are order-dependent.
- rm -f config.cache
-
--AC_PREREQ(2.13.20020210)
- AC_INIT(userdefs.h)
-
- # autoconf 2.5x defaults to no cache file; we need the cache file's information
-@@ -118,9 +117,6 @@
- dnl Debug/development/test
- dnl --------------------------------------------------------------------------
-
--CF_HELP_MESSAGE(
--Development Options:)
--
- CF_DISABLE_ECHO
-
- # special case for WWW/*
-@@ -357,9 +353,6 @@
- dnl --------------------------------------------------------------------------
- dnl --------------------------------------------------------------------------
-
--CF_HELP_MESSAGE(
--Basic Configuration Options:)
--
- CF_LARGEFILE
-
- dnl --------------------------------------------------------------------------
-@@ -822,9 +815,6 @@
- dnl Experimental options that don't need to test system features
- dnl --------------------------------------------------------------------------
-
--CF_HELP_MESSAGE(
--Experimental Options:)
--
- AC_MSG_CHECKING(if bibp: URLs should be supported)
- CF_ARG_DISABLE(bibp-urls,
- [ --disable-bibp-urls disable support for bibp: URLs],
-@@ -982,9 +972,6 @@
- dnl Miscellaneous options that don't need to test system features
- dnl --------------------------------------------------------------------------
-
--CF_HELP_MESSAGE(
--Miscellaneous Options:)
--
- dnl --------------------------------------------------------------------------
- AC_MSG_CHECKING(if alternative line-edit bindings should be used)
- CF_ARG_ENABLE(alt-bindings,
-@@ -1223,9 +1210,6 @@
- fi
-
- dnl --------------------------------------------------------------------------
--CF_HELP_MESSAGE(
--Other Network Services:)
--
- dnl --------------------------------------------------------------------------
- AC_MSG_CHECKING(if you want to exclude FINGER code)
- CF_ARG_DISABLE(finger,
-@@ -1266,9 +1250,6 @@
- dnl DirEd (directory-editor) options
- dnl --------------------------------------------------------------------------
-
--CF_HELP_MESSAGE(
--Directory Editor Options:)
--
- # All DirEd functions that were enabled on compilation can be disabled
- # or modified at run time via DIRED_MENU symbols in lynx.cfg.
- AC_MSG_CHECKING(if directory-editor code should be used)
-@@ -1392,7 +1373,6 @@
- AC_SUBST(COMPRESS_EXT)
-
- if test $cf_cv_screen = pdcurses ; then
-- CF_HELP_MESSAGE(Special Libraries for PDCurses X11:)
- CF_PDCURSES_X11
- else
- CF_TERMIO_AND_CURSES(LYCurses.h)
diff --git a/lynx-config.patch b/lynx-config.patch
index a038735..76d2b56 100644
--- a/lynx-config.patch
+++ b/lynx-config.patch
@@ -37,15 +37,6 @@
HELPDIR = $(DESTDIR)$(helpdir)
##set the relative location of the WWW library Implementation directory,
-@@ -358,7 +358,7 @@
- @-rm -f help_files.tmp
-
- install-help : help_files.sed $(HELPDIR)
-- - (cd $(HELPDIR) && WD=`pwd` && HEAD=`echo $$WD|sed -e 's!/lynx_help$$!!'` && test $$WD != $$HEAD && rm -fr *)
-+ - (cd $(HELPDIR) && WD=`pwd` && HEAD=`echo $$WD|sed -e 's!/lynx/help$$!!'` && test $$WD != $$HEAD && rm -fr *)
- test -d $(HELPDIR)/keystrokes || mkdir $(HELPDIR)/keystrokes
- @LYNXCFG_MAKE@ @echo 'Making htmlized lynx.cfg'
- @LYNXCFG_MAKE@ cd $(SRC_DIR) && $(MAKE_RECUR) LYReadCFG.i
--- lynx2-8-7/userdefs.h~ 2010-06-21 14:03:36.879822401 +0200
+++ lynx2-8-7/userdefs.h 2010-06-21 14:05:52.335642938 +0200
@@ -105,7 +105,7 @@
@@ -57,12 +48,14 @@
#endif /* LYNX_CFG_FILE */
/**************************
-@@ -491,7 +491,7 @@
+@@ -510,8 +510,9 @@
* The definition here can be overridden at run time by defining a
* "LYNX_HELPFILE" environment variable.
*/
--#define HELPFILE "http://lynx.isc.org/release/lynx2-8-7/lynx_help/lynx_help_main.html"
-+#define HELPFILE "file://localhost/usr/share/lynx/help/lynx_help_main.html.gz"
+-#define HELPFILE "https://lynx.invisible-island.net/lynx_help/lynx_help_main.html"
++/* ##define HELPFILE "https://lynx.invisible-island.net/lynx_help/lynx_help_main.html" */
/* #define HELPFILE "file://localhost/PATH_TO/lynx_help/lynx_help_main.html" */
++#define HELPFILE "file://localhost/usr/share/lynx/help/lynx_help_main.html.gz"
/*****************************
+ * DEFAULT_INDEX_FILE is the default file retrieved when the
diff --git a/lynx-pld.patch b/lynx-pld.patch
index 9d975c4..7b6a45f 100644
--- a/lynx-pld.patch
+++ b/lynx-pld.patch
@@ -29,11 +29,13 @@
#define PERSONAL_MAILCAP ".mailcap"
/**************************
-@@ -289,7 +289,7 @@
- #ifdef DOSPATH
+@@ -300,8 +300,8 @@
+ #define LYNX_CFG_PATH "."
#define LYNX_CFG_FILE "./lynx.cfg"
#else
+-#define LYNX_CFG_PATH "/usr/local/lib"
-#define LYNX_CFG_FILE "/usr/local/lib/lynx.cfg"
++#define LYNX_CFG_PATH "/usr/share/lynx"
+#define LYNX_CFG_FILE "/usr/share/lynx/lynx.cfg"
#endif /* DOSPATH */
#endif /* LYNX_CFG_FILE */
@@ -60,15 +62,15 @@
/**************************
* XLOADIMAGE_COMMAND will be used as a default in src/HTInit.c for
-@@ -445,7 +445,7 @@
- * -lss command line switch will override these definitions.
- */
- #ifndef LYNX_LSS_FILE
+@@ -460,7 +460,7 @@
+ #ifdef DOSPATH
+ #define LYNX_LSS_FILE "lynx.lss"
+ #else
-#define LYNX_LSS_FILE "/usr/local/lib/lynx.lss"
+#define LYNX_LSS_FILE "/usr/share/lynx/lynx.lss"
+ #endif
#endif /* LYNX_LSS_FILE */
- #endif /* VMS OR UNIX */
@@ -1156,7 +1156,7 @@
* OSU server distribution.
*/
diff --git a/lynx.cfg.patch b/lynx.cfg.patch
index 2afc4fc..6a24aca 100644
--- a/lynx.cfg.patch
+++ b/lynx.cfg.patch
@@ -1,27 +1,26 @@
--- lynx2-8-7/lynx.cfg~ 2010-06-21 11:27:35.000000000 +0200
+++ lynx2-8-7/lynx.cfg 2010-06-21 13:35:12.625827117 +0200
-@@ -93,7 +93,8 @@
+@@ -108,7 +108,7 @@
#
# Normally we expect you will connect to a remote site, e.g., the Lynx starting
# site:
--STARTFILE:http://lynx.isc.org/
-+#STARTFILE:http://lynx.isc.org/
-+STARTFILE:file://localhost/~/
+-STARTFILE:https://lynx.invisible-island.net/
++STARTFILE:https://localhost/~/
#
# As an alternative, you may want to use a local URL. A good choice for this is
# the user's home directory:
-@@ -118,9 +119,9 @@
+@@ -132,9 +132,10 @@
# This definition will be overridden if the "LYNX_HELPFILE" environment
# variable has been set.
#
--HELPFILE:http://lynx.isc.org/release/lynx2-8-7/lynx_help/lynx_help_main.html
-+#HELPFILE:http://lynx.isc.org/release/lynx2-8-7/lynx_help/lynx_help_main.html
+-HELPFILE:https://lynx.invisible-island.net/lynx_help/lynx_help_main.html
++#HELPFILE:https://lynx.invisible-island.net/lynx_help/lynx_help_main.html
.ex
--#HELPFILE:file://localhost/PATH_TO/lynx_help/lynx_help_main.html
+ #HELPFILE:file://localhost/PATH_TO/lynx_help/lynx_help_main.html
+HELPFILE:file://localhost/usr/share/lynx/help/lynx_help_main.html.gz
-
.h2 DEFAULT_INDEX_FILE
+ # DEFAULT_INDEX_FILE is the default file retrieved when the
@@ -553,7 +554,7 @@
# Older browser versions will fail so keep NCR_IN_BOOKMARKS:FALSE if you
# plan to use them.
@@ -31,30 +30,14 @@
.h2 FORCE_8BIT_TOUPPER
-@@ -2387,7 +2388,8 @@
- #VIEWER:image/tiff:xli %s&:XWINDOWS
- #VIEWER:image/jpeg:xli %s&:XWINDOWS
- #VIEWER:video/mpeg:mpeg_play %s &:XWINDOWS
--
-+VIEWER:image/gif:zgv %s:NON_XWINDOWS
-+VIEWER:image/jpeg:zgv %s:NON_XWINDOWS
-
- .h2 GLOBAL_MAILCAP
- .h2 PERSONAL_MAILCAP
-@@ -3018,16 +3020,14 @@
- #
- # Uncomment and change any of the compilation defaults.
- #
--#COLOR:0:black:white
--#COLOR:1:blue:white
--#COLOR:2:yellow:blue
--#COLOR:3:green:white
--#COLOR:4:magenta:white
--#COLOR:5:blue:white
--#COLOR:6:red:white
+@@ -2998,9 +2998,18 @@ MINIMAL_COMMENTS:TRUE
+ #COLOR:4:magenta:white
+ #COLOR:5:blue:white
+ #COLOR:6:red:white
-COLOR:6:brightred:black
--#COLOR:7:magenta:cyan
--
++#COLOR:6:brightred:black
+ #COLOR:7:magenta:cyan
+
+COLOR:0:black:lightgray
+COLOR:1:blue:lightgray
+COLOR:2:yellow:blue
@@ -63,6 +46,7 @@
+COLOR:5:blue:lightgray
+COLOR:6:white:blue
+COLOR:7:lightgray:black
-
++
.h2 COLOR_STYLE
# Also known as "lss" (lynx style-sheet), the color-style file assigns color
+ # combination to tags and combinations of tags. Normally a non-empty value
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/lynx.git/commitdiff/5dba916869e7cf033be67f6aadbbab2d4057414d
More information about the pld-cvs-commit
mailing list