Hello community, here is the log from the commit of package lynx for openSUSE:Factory checked in at 2017-06-17 10:17:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lynx (Old) and /work/SRC/openSUSE:Factory/.lynx.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lynx" Sat Jun 17 10:17:16 2017 rev:33 rq:503050 version:2.8.9~dev.14 Changes: -------- --- /work/SRC/openSUSE:Factory/lynx/lynx.changes 2017-04-11 09:29:23.250786616 +0200 +++ /work/SRC/openSUSE:Factory/.lynx.new/lynx.changes 2017-06-17 10:17:18.323858716 +0200 @@ -1,0 +2,16 @@ +Mon Jun 12 09:24:13 UTC 2017 - [email protected] + +- update to 2.8.9dev.14 to build with openssl 1.1 [bsc#1042661] +- dropped patches + . lynx-2.8.5.dif + . lynx-no-build-date.patch + . lynx-2.8.8-expired-cookie-crash.patch + . lynx-CVE-2016-9179.patch + . lynx-2.8.8-ncurses-6.0-20170318.patch +- renamed patches + . lynx-2.8.7-enable_xli.patch to lynx-enable_xli.patch + . lynx-2.8.5-charset.patch to lynx-charset.patch + . lynx-2.8.5.dif split to lynx-helpfile.patch and + lynx-proxy-empty-string.patch + +------------------------------------------------------------------- Old: ---- lynx-2.8.5-charset.patch lynx-2.8.5.dif lynx-2.8.7-enable_xli.patch lynx-2.8.8-expired-cookie-crash.patch lynx-2.8.8-ncurses-6.0-20170318.patch lynx-CVE-2016-9179.patch lynx-no-build-date.patch lynx2.8.8rel.2.tar.bz2 New: ---- lynx-charset.patch lynx-enable_xli.patch lynx-helpfile.patch lynx-proxy-empty-string.patch lynx2.8.9dev.14.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lynx.spec ++++++ --- /var/tmp/diff_new_pack.RzeQaC/_old 2017-06-17 10:17:20.059613869 +0200 +++ /var/tmp/diff_new_pack.RzeQaC/_new 2017-06-17 10:17:20.063613305 +0200 @@ -16,34 +16,29 @@ # +%define tarbase 2.8.9dev.14 Name: lynx -BuildRequires: ncurses-devel -BuildRequires: openssl-devel -BuildRequires: postfix -Provides: web_browser -PreReq: /bin/cp -Requires: xli -Version: 2.8.8rel.2 +Version: 2.8.9~dev.14 Release: 0 -%define tarbase 2-8-8 -%define dlbase 2.8.8 -Url: http://lynx.invisible-island.net/ Summary: A Text-Based WWW Browser License: GPL-2.0 Group: Productivity/Networking/Web/Browsers -Source: http://invisible-mirror.net/archives/%{name}/tarballs/%{name}%{version}.tar.bz2 -# Source1: po.tar.bz2 -Patch100: lynx-2.8.5.dif -Patch101: lynx-2.8.5-charset.patch -Patch102: lynx-2.8.7-enable_xli.patch -Patch103: lynx-no-build-date.patch -Patch104: lynx-2.8.8-expired-cookie-crash.patch -Patch105: lynx-CVE-2016-9179.patch -# Workaround for ncurses-6.0-20170318 -Patch106: lynx-2.8.8-ncurses-6.0-20170318.patch +Url: http://lynx.invisible-island.net/ +Source: http://invisible-mirror.net/archives/%{name}/tarballs/%{name}%{tarbase}.tar.bz2 +# changing default configuration +Patch0: lynx-charset.patch +Patch1: lynx-enable_xli.patch +Patch2: lynx-helpfile.patch +# bugs +Patch3: lynx-proxy-empty-string.patch +BuildRequires: ncurses-devel +BuildRequires: openssl-devel +BuildRequires: postfix +Requires: xli +# FIXME: use proper Requires(pre/post/preun/...) +PreReq: /bin/cp +Provides: web_browser BuildRoot: %{_tmppath}/%{name}-%{version}-build -Provides: lynxssl = %version -Obsoletes: lynxssl < %version %description Lynx is an easy-to-use browser for HTML documents and other Internet @@ -51,21 +46,15 @@ based and therefore makes it possible to use WWW resources on text terminals. - %prep -%setup -n %name%tarbase -q -%patch100 -p1 -%patch101 -p1 -%patch102 -p1 -%patch103 -%patch104 -%patch105 -p1 -%patch106 -p1 -b .106 -# containing a few test msg's only: -# rm -f po/{es,fr,it,ko,no,pl,pt}.po +%setup -q -n %{name}%{tarbase} +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 %build -%configure --enable-debug --with-build-cflags="%optflags" \ +%configure --enable-debug --with-build-cflags="%{optflags} -DNO_BUILDSTAMP" \ --with-ssl \ --enable-nls \ --disable-default-colors \ @@ -74,8 +63,8 @@ --enable-ipv6 make %{?_smp_mflags} mv lynx lynx-bw -make distclean -%configure --enable-debug --with-build-cflags="%optflags" \ +make %{?_smp_mflags} distclean +%configure --enable-debug --with-build-cflags="%{optflags}" \ --with-ssl \ --enable-nls \ --enable-default-colors \ @@ -84,24 +73,23 @@ make %{?_smp_mflags} %install -make DESTDIR=$RPM_BUILD_ROOT install +%make_install make clean -make EXTRAA="-DSHOW_COLOR=TRUE" %{?_smp_mflags} -mkdir -p $RPM_BUILD_ROOT -mv $RPM_BUILD_ROOT/usr/bin/lynx $RPM_BUILD_ROOT/usr/bin/lynx-color -install lynx-bw $RPM_BUILD_ROOT/usr/bin/lynx +mkdir -p %{buildroot} +mv %{buildroot}%{_bindir}/lynx %{buildroot}%{_bindir}/lynx-color +install lynx-bw %{buildroot}%{_bindir}/lynx chmod ogu-x scripts/conf.mingw.sh scripts/config.djgpp.sh -%find_lang %name +%find_lang %{name} -%files -f %name.lang +%files -f %{name}.lang %defattr(-,root,root) -/usr/bin/lynx -/usr/bin/lynx-color -%config /etc/lynx.cfg -%config /etc/lynx.lss -%doc %{_mandir}/man1/lynx.1.gz +%{_bindir}/lynx +%{_bindir}/lynx-color +%config %{_sysconfdir}/lynx.cfg +%config %{_sysconfdir}/lynx.lss +%{_mandir}/man1/lynx.1%{ext_man} %doc AUTHORS CHANGES README COPYING README PROBLEMS %doc lynx_help samples scripts ++++++ lynx-charset.patch ++++++ --- lynx.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: lynx2-8-8/lynx.cfg =================================================================== --- lynx2-8-8.orig/lynx.cfg 2014-02-22 20:30:46.000000000 +0000 +++ lynx2-8-8/lynx.cfg 2014-02-22 20:30:48.000000000 +0000 @@ -449,7 +449,7 @@ DEFAULT_INDEX_FILE:http://scout.wisc.edu # values and their relationship to the locale value is not. GNU libiconv # happens to give useful values, but other implementations are not guaranteed # to do this. -#LOCALE_CHARSET:FALSE +LOCALE_CHARSET:TRUE .h2 HTML5_CHARSETS # HTML5_CHARSETS is an alternative to ASSUME_CHARSET and ASSUME_LOCAL_CHARSET. ++++++ lynx-enable_xli.patch ++++++ Index: lynx2-8-7/lynx.cfg =================================================================== --- lynx2-8-7.orig/lynx.cfg +++ lynx2-8-7/lynx.cfg @@ -2335,7 +2335,7 @@ MINIMAL_COMMENTS:TRUE # XLOADIMAGE_COMMAND definition. # If you use xli, you may want to add the -quiet flag. # -#XLOADIMAGE_COMMAND:xli %s & +XLOADIMAGE_COMMAND:xli %s & .h2 VIEWER # MIME types may be assigned to external viewers using ++++++ lynx-helpfile.patch ++++++ Index: lynx2.8.9dev.14/lynx.cfg =================================================================== --- lynx2.8.9dev.14.orig/lynx.cfg 2017-06-12 11:49:39.676570581 +0200 +++ lynx2.8.9dev.14/lynx.cfg 2017-06-12 11:50:40.225677012 +0200 @@ -114,7 +114,7 @@ STARTFILE:http://lynx.invisible-island.n # This definition will be overridden if the "LYNX_HELPFILE" environment # variable has been set. # -HELPFILE:http://lynx.invisible-island.net/lynx_help/lynx_help_main.html +HELPFILE:file://localhost/usr/share/doc/packages/lynx/lynx_help/lynx_help_main.html .ex #HELPFILE:file://localhost/PATH_TO/lynx_help/lynx_help_main.html ++++++ lynx-proxy-empty-string.patch ++++++ Index: lynx2-8-8/WWW/Library/Implementation/HTAccess.c =================================================================== --- lynx2-8-8.orig/WWW/Library/Implementation/HTAccess.c 2014-02-22 20:28:32.000000000 +0000 +++ lynx2-8-8/WWW/Library/Implementation/HTAccess.c 2014-02-22 20:28:45.000000000 +0000 @@ -513,6 +513,9 @@ static int get_physical(const char *addr else sprintf(gateway_parameter, "%s_proxy", acc_method); proxy = LYGetEnv(gateway_parameter); + if (proxy) + if (*proxy == '\0') + proxy = NULL; FREE(gateway_parameter); if (gateway)
