--- elinks-0.11.3.orig/debian/elinks-doc.docs +++ elinks-0.11.3/debian/elinks-doc.docs @@ -0,0 +1 @@ +doc/*.txt --- elinks-0.11.3.orig/debian/watch +++ elinks-0.11.3/debian/watch @@ -0,0 +1,3 @@ +version=3 + +http://elinks.or.cz/download/elinks-([\d]+.*)\.tar\.bz2 --- elinks-0.11.3.orig/debian/elinks.desktop +++ elinks-0.11.3/debian/elinks.desktop @@ -0,0 +1,20 @@ +[Desktop Entry] +Type=Application +Version=1.0 +Name=ELinks Web Browser +Name[ca]=Navegador web ELinks +Name[de]=ELinks Webbrowser +Name[es]=Navegador web ELinks +GenericName=Web Browser +GenericName[ca]=Navegador web +GenericName[de]=Webbrowser +genericName[es]=Navegador web +Comment=Browse the web in text mode +Comment[ca]=Navegeu per el web en mode text +Comment[es]=Navega por el web en modo texto +Exec=/usr/bin/elinks %u +Terminal=true +Icon=html +MimeType=text/html; +Categories=Utility;Network; +X-Ubuntu-Gettext-Domain=elinks --- elinks-0.11.3.orig/debian/rules +++ elinks-0.11.3/debian/rules @@ -0,0 +1,244 @@ +#!/usr/bin/make -f + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +# This has to be exported to make some magic below work. +export DH_OPTIONS + +export DH_ALWAYS_EXCLUDE=.gitignore + +PKG_NAME=elinks +PKG_VERS=0.11.3 +UPSTR_SITE=http://$(PKG_NAME).or.cz +UPSTR_DIR=$(PKG_NAME)-$(PKG_VERS) +UPSTR_FILE=$(UPSTR_DIR).tar.bz2 +ORIG_DIR=$(UPSTR_DIR).orig +ORIG_TAR=$(PKG_NAME)_$(PKG_VERS).orig.tar + +version=`dpkg-parsechangelog -ldebian/changelog | grep 'Version: ' | sed 's/Version: //g'` + +# These are used for cross-compiling and for saving the configure script +# from having to guess our platform (since we know it already) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + +CFLAGS_COMMON=-g + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS_COMMON += -O0 + CFLAGS_LITE= +else + CFLAGS_COMMON += -O2 + CFLAGS_LITE=-Os -fno-inline +endif + +confopts = --prefix=/usr \ + --mandir=\$${prefix}/share/man \ + --infodir=\$${prefix}/share/info \ + --sysconfdir=/etc/elinks \ + --without-openssl \ + --without-x \ + --with-gnutls=/usr + +confopts_main = $(confopts) \ + --enable-nntp \ + --enable-256-colors \ + --enable-leds \ + --enable-html-highlight \ + --disable-smb \ + --with-perl \ + --without-spidermonkey + +confopts_lite = $(confopts) \ + --disable-nntp \ + --disable-256-colors \ + --disable-leds \ + --disable-nls \ + --disable-formhist \ + --disable-xbel \ + --disable-data \ + --disable-uri-rewrite \ + --disable-smb \ + --disable-mouse \ + --disable-marks \ + --disable-css \ + --disable-backtrace \ + --enable-fastmem \ + --enable-small \ + --without-gpm \ + --without-perl \ + --without-spidermonkey \ + --without-zlib \ + --without-bzlib \ + --without-idn \ + --without-lua \ + +save-upstream: patch save-stamp +patch: patch-stamp +patch-stamp: + mkdir -p debian/patched + for pfile in debian/patches/*.diff; do \ + [ -f "$$pfile" ] || continue; \ + pname="$$(basename $$pfile .diff)"; \ + [ ! -f "debian/patched/$$pname.patched" ] || continue; \ + echo "### Applying patch $$pname"; \ + patch -p1 -N < $$pfile; \ + cp -f "$$pfile" "debian/patched/$$pname.patched"; \ + done + touch $@ + +save-stamp: + dh_testdir + rm -f debian/elinks.conf + cat debian/elinks.config | sed "s/%v/$(version)/g" > debian/elinks.conf + rm -f debian/elinks-lite.conf + cat debian/elinks.config | sed "s/%v/$(version)-lite/g" > debian/elinks-lite.conf + # Add here commands to configure the package. +ifneq "$(wildcard /usr/share/misc/config.sub)" "" + [ ! -f config/config.sub ] || mv -f config/config.sub config/config.sub.ups + cp -f /usr/share/misc/config.sub config/config.sub +endif +ifneq "$(wildcard /usr/share/misc/config.guess)" "" + [ ! -f config/config.guess ] || mv -f config/config.guess config/config.guess.ups + cp -f /usr/share/misc/config.guess config/config.guess +endif + [ ! -f config.h ] || mv -f config.h config.h.ups + [ ! -f Makefile.config ] || mv -f Makefile.config Makefile.config.ups + touch $@ + +#Architecture +build: build-arch build-indep + +build-arch: build-arch-stamp +build-arch-stamp: patch-stamp save-stamp + mkdir $(CURDIR)/build-main && cd $(CURDIR)/build-main && \ + $(CURDIR)/configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \ + $(confopts_main) CFLAGS="$(CFLAGS_COMMON)" LDFLAGS="-Wl,-z,defs" + $(MAKE) -C $(CURDIR)/build-main + mkdir $(CURDIR)/build-lite && cd $(CURDIR)/build-lite && \ + $(CURDIR)/configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \ + $(confopts_lite) CFLAGS="$(CFLAGS_COMMON) $(CFLAGS_LITE)" LDFLAGS="-Wl,-z,defs" + $(MAKE) -C $(CURDIR)/build-lite + touch $@ + +build-indep: build-indep-stamp +build-indep-stamp: patch-stamp save-stamp + $(MAKE) -C $(CURDIR)/build-main/doc all-docs + touch $@ + +clean: clean-patched unpatch +clean-patched: + dh_testdir + dh_testroot + rm -f stamp-h.in + rm -f build-arch-stamp build-indep-stamp save-stamp + rm -rf build-lite build-main + [ ! -f Makefile.config.ups ] || mv -f Makefile.config.ups Makefile.config + [ ! -f config.h.ups ] || mv -f config.h.ups config.h + [ ! -f config/config.guess.ups ] || mv -f config/config.guess.ups config/config.guess + [ ! -f config/config.sub.ups ] || mv -f config/config.sub.ups config/config.sub + rm -f debian/elinks-lite.conf + rm -f debian/elinks.conf + rm -rf debian/tmp.elinks-data + dh_clean + +unpatch: + for pfile in debian/patched/*.patched ; do \ + [ -f "$$pfile" ] || continue; \ + pname="$$(basename $$pfile .patched)"; \ + [ -f "debian/patches/$$pname.diff" ] || continue; \ + echo "### Reverting patch $$pname"; \ + patch -p1 -N -R < $$pfile; \ + rm -f "debian/patched/$$pname.patched"; \ + done + rm -rf debian/patched patch-stamp + +install: install-indep install-arch +install-indep: + dh_testdir + dh_testroot + dh_clean -k -i + dh_installdirs -i + # Move elinks arch-indep from temp location to elinks-data + mv -f $(CURDIR)/debian/tmp.elinks-data/usr $(CURDIR)/debian/elinks-data/ + # Install elinks documentation, remove manpages (already installed in + # elinks-data) + $(MAKE) -C build-main/doc DESTDIR=$(CURDIR)/debian/elinks-doc install-doc + mv -f $(CURDIR)/debian/elinks-doc/usr/share/doc/elinks $(CURDIR)/debian/elinks-doc/usr/share/doc/elinks-doc + rm -rf $(CURDIR)/debian/elinks-doc/usr/share/man + dh_install -i + +install-arch: + dh_testdir + dh_testroot + dh_clean -k -s + dh_installdirs -s + # Install elinks binaries and elinks.conf + $(MAKE) -C build-main DESTDIR=$(CURDIR)/debian/elinks install + install -o root -g root -p -D -m 0644 $(CURDIR)/debian/elinks.conf \ + $(CURDIR)/debian/elinks/etc/elinks/elinks.conf + # Install elinks-lite binaries and elinks.conf + $(MAKE) -C build-lite DESTDIR=$(CURDIR)/debian/elinks-lite install + install -o root -g root -p -D -m 0644 $(CURDIR)/debian/elinks-lite.conf \ + $(CURDIR)/debian/elinks-lite/etc/elinks/elinks.conf + # Move elinks arch-indep parts to temp location for elinks-data + mkdir -p $(CURDIR)/debian/tmp.elinks-data/usr/ + mv -f $(CURDIR)/debian/elinks/usr/share $(CURDIR)/debian/tmp.elinks-data/usr/ + rm -f $(CURDIR)/debian/tmp.elinks-data/usr/share/locale/locale.alias + # Install desktop files for elinks and elinks-lite + install -o root -g root -p -D -m 0644 $(CURDIR)/debian/elinks.desktop \ + $(CURDIR)/debian/elinks/usr/share/applications/elinks.desktop + install -o root -g root -p -D -m 0644 $(CURDIR)/debian/elinks.desktop \ + $(CURDIR)/debian/elinks-lite/usr/share/applications/elinks-lite.desktop + # Install lintian and linda over-rides for elinks.1 + install -o root -g root -p -D -m 0644 $(CURDIR)/debian/elinks.lintian \ + $(CURDIR)/debian/elinks/usr/share/lintian/overrides/elinks + install -o root -g root -p -D -m 0644 $(CURDIR)/debian/elinks.linda \ + $(CURDIR)/debian/elinks/usr/share/linda/overrides/elinks + dh_link -pelinks usr/share/doc/elinks-data usr/share/doc/elinks + dh_install -s + +# Must not depend on anything. This is to be called by +# binary-arch/binary-indep +# in another 'make' thread. +binary-common: + dh_testdir + dh_testroot + dh_installchangelogs -Nelinks NEWS + dh_installdocs + dh_installexamples + dh_installmenu + dh_desktop + dh_installmime + dh_strip + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +# Build architecture independant packages using the common target. +binary-indep: build-indep install-indep + $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common + +# Build architecture dependant packages using the common target. +binary-arch: build-arch install-arch + $(MAKE) -f debian/rules DH_OPTIONS=-s binary-common + +get-orig-source: + wget -q $(UPSTR_SITE)/download/$(UPSTR_FILE) + tar -jxf $(UPSTR_FILE) + mv $(UPSTR_DIR) $(ORIG_DIR) + rm -f $(ORIG_DIR)/{po/*.gmo,config.log,config.status,features.log} + rm -rf $(ORIG_DIR)/{debian,po/.deps} + tar -cf $(ORIG_TAR) $(ORIG_DIR) + gzip --best $(ORIG_TAR) + rm -rf $(UPSTR_FILE) $(ORIG_DIR) + @echo "Re-packaged source file: $(ORIG_TAR).gz" + @ls -l $(ORIG_TAR).gz + +binary: binary-arch binary-indep +.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch patch unpatch get-orig-source save-upstream get-orig-source --- elinks-0.11.3.orig/debian/elinks.menu +++ elinks-0.11.3/debian/elinks.menu @@ -0,0 +1,9 @@ +?package(elinks): \ + needs="text" \ + section="Applications/Network/Web Browsing" \ + title="ELinks WWW browser" \ + command="/usr/bin/elinks" \ + hints="Web browsers" \ + description="ELinks is a character mode browser with support for \ + rendering tables and frames, background downloads, color display, \ + IPV6 among other features." --- elinks-0.11.3.orig/debian/elinks-lite.prerm +++ elinks-0.11.3/debian/elinks-lite.prerm @@ -0,0 +1,19 @@ +#!/bin/sh + +set -e + +case "$1" in + remove) + update-alternatives --quiet --remove www-browser /usr/bin/elinks + ;; + upgrade|failed-upgrade|deconfigure) + ;; + *) + echo "prerm called with unknown argument \`$1'" >&2 + exit 0 + ;; +esac + +#DEBHELPER# + +exit 0 --- elinks-0.11.3.orig/debian/elinks.linda +++ elinks-0.11.3/debian/elinks.linda @@ -0,0 +1,3 @@ +# elinks(1) is installed by elinks-data +Tag: no-manual-for-binary +Data: elinks --- elinks-0.11.3.orig/debian/elinks-lite.docs +++ elinks-0.11.3/debian/elinks-lite.docs @@ -0,0 +1 @@ +AUTHORS --- elinks-0.11.3.orig/debian/elinks-data.examples +++ elinks-0.11.3/debian/elinks-data.examples @@ -0,0 +1,11 @@ +contrib/conv/conf-links2elinks.pl +contrib/conv/mailcap.pl +contrib/conv/old_to_new_bookmarks.sh +contrib/conv/w3m2links.awk +contrib/elinks.vim +contrib/keybind.conf +contrib/keybind-full.conf +contrib/lua/ +contrib/perl/ +contrib/TIPS-AND-TRICKS +contrib/user.css --- elinks-0.11.3.orig/debian/changelog +++ elinks-0.11.3/debian/changelog @@ -0,0 +1,587 @@ +elinks (0.11.3-3ubuntu1) hardy; urgency=low + + * Merge from Debian unstable (LP: #187936); remaining changes: + - Add X-Ubuntu-Gettext-Domain to .desktop files. + - debian/control: Maintainer field update. + * Improve the text in the .desktop file and add some translations. + + -- Siegfried-Angel Gevatter Pujals (RainCT) Fri, 01 Feb 2008 16:29:06 +0100 + +elinks (0.11.3-3) unstable; urgency=low + + * Remove 06_elinks.conf-parse-error.diff and use a minimal elinks.conf file + with only the user_agent setting. Thanks giggz for + the bug report and Kalle Olavi Niemitalo for suggestion (Closes: #460912) + * Rename patch 01_asciidoc-escape-FTBFS as 01_asciidoc7compatible to add a + "-a asciidoc7compatible" to ASCIIDOC_FLAGS. Thanks Kalle Olavi Niemitalo + for the suggestion. + * debian/copyright: Add 2008 to Debian packaging Copyright 'years'. + * debian/control: Remove superfluous ;a=summary suffix from gitweb URL in + Vcs-Browser: + * Really install elinks.desktop desktop file for elinks and elinks-lite + (remove elinks-lite.desktop, it is identical to elinks.desktop). + * Changed all patches from "diff -urNad" to "git diff". This will make it + easier to maintain the patches. Just modify the code in place and do a + "git diff > debian/patches/0X_foo.diff" + * Pass --enable-leds to configure. Set ui.leds.enable to 0 by default via + 06_459467_ui.leds.enable_0.diff, this solves #459467 better. Thanks to + أحمد المحمودي (Ahmed El-Mahmoudy) for the suggestion. + + -- Y Giridhar Appaji Nag Thu, 24 Jan 2008 17:38:29 +0530 + +elinks (0.11.3-2) unstable; urgency=low + + * Change Moritz's email ID in Uploaders to jmm@debian.org to be in sync with + his other packages + * Correction: Change Vcs-Svn in debian/control to Vcs-Git and VCS-Browser to + the gitweb URL + * Pass --disable-leds to configure, it causes a lot of wakeups on laptops. + Update 06_elinks.conf-parse-error.diff to comment ui.leds.enable option + (Closes: #459467) + * elinks-lite is Priority: extra (Policy Section 2.5: Priorities -- because + it conflicts with elinks, elinks-data and elinks-doc) + * elinks and elinks-lite Don't Provides: links and don't install a links + alternative (Closes: #154859) + * Patch debian/patches/08_436817_nostrip.diff to prevent the binaries from + being stipped unless dh_strip would want to (Closes: #436817) + + -- Y Giridhar Appaji Nag Mon, 14 Jan 2008 17:06:19 +0530 + +elinks (0.11.3-1) unstable; urgency=low + + * Adopted by Y Giridhar Appaji Nag (Closes: #451088) + + Add Co-maintainer Moritz Muehlenhoff to Uploaders + * Documentation is now built using sources, depends on the features + configured while building elinks. + * Remove superfluous m4 and bison Build-Depends. + * Arch indep part of elinks is large, moved it to elinks-data package + + Add lintian/linda overrides for elinks.1 man-page (installed by the + elinks-data package). + * New upstream release 0.11.3 (Closes: #429311) + + Don't crash while sorting thru bookmarks (Closes: #315886) + + German PO file corrections (Closes: #313696) + + Use off_t for file size in FTP listing (Closes: #403139) + * Add get-orig-source target that gets orig source and removes debian + directory, translation files and config.{log,status} etc. + * Change from DH_COMPAT 4 to debian/compat (5) + * Move debian/watch file to version 3 + * Bump up Standards-Version to 3.7.3 + + Updated menu files for the latest menu policy. + + debian/copyright: include all the major authors and copyright holders + listed in source files. ELinks is GPL2 only (Closes: #431211) + * Add Homepage: and Vcs-*: fields to debian/control + * maint-scripts: Remove debconf dependency and moving of elinks.conf. Old + transition code, not necessary anymore. + * DH_ALWAYS_EXCLUDE=.gitignore in debian/rules (Closes: #413911) + * Add debian/patches, but not using dpatch + + Patch 01_asciidoc-escape-FTBFS.diff: Escape characters for asciidoc + conversion (prevents FTBFS in make all-docs) + + Patch 02_setup-bugs-FSSTND.diff: Point bugs URL to debian.org and + remove FSSTND dir in setup.h etc. + + Patch 03_417789-CVE-2007-2027.diff: Patch for #417789 from Julien + Cristau made a diff. + + Patch 04_380347-entity_cache-overflow.diff: Prevent a buffer overflow + in entity_cache. Thanks Kalle Olavi Niemitalo for the fix + (Closes: #380347) + + Patch 05_257762-transparency-off.diff: Turn terminal transparency off + by default. Thanks Petr Baudis for the fix and Kalle Olavi Niemitalo + for a pointer to the fix (Closes: #257762) + + Patch 06_elinks.conf-parse-error.diff: create elinks-lite.conf, set + config.saving_style=3 and comment options that are not valid. + + Patch 07_local-CGI-query-fix.diff: Fix broken query parsing of file: + URIs for local CGI. + + -- Y Giridhar Appaji Nag Mon, 07 Jan 2008 00:10:17 +0530 +elinks (0.11.1-1.5ubuntu1) gutsy; urgency=low + + * Merge to Debian unstable: remaining Ubuntu changes: + - debian/rules: Add X-Ubuntu-Gettext-Domain to .desktop files. + - debian/control: Maintainer field updates. + + -- Michael Bienia Tue, 25 Sep 2007 19:35:04 +0200 + +elinks (0.11.1-1.5) unstable; urgency=high + + * Non-maintainer upload by testing security team. + * Fixed bug in http.c which could lead to secret information disclosure + via POST requests for https URLs (CVE-2007-5034) (Closes: #443914, #443891). + + -- Nico Golde Tue, 25 Sep 2007 13:31:18 +0200 + +elinks (0.11.1-1.4ubuntu1) gutsy; urgency=low + + * Merge to Debian unstable: remaining Ubuntu changes: + - debian/rules: Add X-Ubuntu-Gettext-Domain to .desktop files. + - debian/control: Maintainer field updates. + + -- Kees Cook Thu, 03 May 2007 10:55:52 -0700 + +elinks (0.11.1-1.4) unstable; urgency=high + + * Non-maintainer security upload. + * Don't look for gettext message catalogs in ../po/ (closes: #417789). + Thanks, Arnaud Giersch! Reference: CVE-2007-2027. + + -- Julien Cristau Sun, 29 Apr 2007 00:18:54 +0200 + +elinks (0.11.1-1.3) unstable; urgency=low + + * Non-maintainer upload. + * Fix FTBFS on GNU/kFreeBSD, patch by Petr Salinger (closes: #400872). + * Don't regenerate control at build-time, this is now forbidden by the + policy. + + -- Aurelien Jarno Sun, 4 Mar 2007 12:36:59 +0100 + +elinks (0.11.1-1.2ubuntu2) feisty; urgency=low + + * Rebuild for changes in the amd64 toolchain. + * Set Ubuntu maintainer address. + + -- Matthias Klose Mon, 5 Mar 2007 01:15:26 +0000 + +elinks (0.11.1-1.2ubuntu1) feisty; urgency=low + + * Merge to Debian unstable: remaining Ubuntu changes: + - debian/control, debian/rules: Killed type-handling. + - debian/rules: Add X-Ubuntu-Gettext-Domain to .desktop files. + + -- Martin Pitt Tue, 28 Nov 2006 18:52:30 +0100 + +elinks (0.11.1-1.2) unstable; urgency=high + + * Non-maintainer upload. + * High-urgency upload for security bug fix. + * Configure with --disable-smb to fix security issue (CVE-2006-5925), + closes: #399188. + + -- Julien Cristau Mon, 27 Nov 2006 02:32:47 +0100 + +elinks (0.11.1-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Clean up properly in the clean target; patch from Bart Martens. + (Closes: #397859) + + -- Steinar H. Gunderson Fri, 17 Nov 2006 02:18:38 +0100 + +elinks (0.11.1-1) unstable; urgency=low + + * New upstream version + + -- Peter Gervai Wed, 24 May 2006 18:50:52 +0200 + +elinks (0.10.6-2) unstable; urgency=low + + * Depends on debconf | debconf-2.0 + + -- Peter Gervai Wed, 28 Sep 2005 20:41:49 +0200 + +elinks (0.10.6-1) unstable; urgency=low + + * New upstream release + * Really fix endless refreshing of documents (closes: #293298) + + -- Peter Gervai Sat, 17 Sep 2005 17:49:52 +0200 + +elinks (0.10.4-7) unstable; urgency=low + + * Enabled gnutls in elinks-lite per 3rd party psychological + pressure (Closes: #326855) + + -- Peter Gervai Wed, 7 Sep 2005 10:41:32 +0200 + +elinks (0.10.4-6) unstable; urgency=high + + * Recompile w/libc6 in sid (closes: #308869) + * Added autotools-dev in build-deps and try to update + basic autoconf files to support other archs + + -- Peter Gervai Fri, 13 May 2005 01:12:46 +0200 + +elinks (0.10.4-5) unstable; urgency=low + + * Removed smb config option from sample config file, not + necessary anyway (Closes: #307455) + * Added build-dep on smbclient, suggests smbclient + * Normal and lite both conflicts each other + * Enable html-highlighting + * Drop lite's big config (not strictly required) + * More elinks-lite optimalisation - less size + * Change user-agent string to debian specific + * Mess up debian/rules (almost called it "cleaning up") + (Closes: #308179) + + -- Peter Gervai Thu, 12 May 2005 00:46:26 +0200 + +elinks (0.10.4-4) unstable; urgency=low + + * Added elinks-lite: no extra dependencies (Closes: #178038, #218453) + + -- Peter Gervai Thu, 28 Apr 2005 17:50:23 +0200 + +elinks (0.10.4-3) unstable; urgency=low + + * _Really_ add the missing build-dep (Closes: #304803, #306246) + + -- Peter Gervai Wed, 27 Apr 2005 02:38:31 +0200 + +elinks (0.10.4-2) unstable; urgency=low + + * Disabled check to refuse run when root on the request of + the upstream. (Closes: #305739, #304876) + * Added missing build-dep (Closes: #304803, #306246) + * Fixed default config (Closes: #305017, #305628, #305004) + + -- Peter Gervai Sun, 24 Apr 2005 19:14:16 +0200 + +elinks (0.10.4-1) unstable; urgency=low + + * New Upstream release + * Disable SpiderMonkey because it is not useful right now (closes: #302505) + * Only read from /dev/stdin if no URL was given on the command line and + automatically allow special files to be read (closes: #296976, #297510) + * Fix repeatedly and endless refreshing of documents that triggers a + download (like sourceforge's download pages) (closes: #293298) + * Add watch file, thanks Hugo Haas + * Scrolling was heavily reworked during the 0.10 development phase and now + uses the correct width / height when scrolling (closes: #256533) + * Fix warning on 64-bit architectures (closes: #285684) + * Change verbose level to show warnings (closes: #303083) + * Include FAQ from http://elinks.or.cz/ (closes: #301861) + * Change FTP directory listing parser to Wget-based one due to licensing + issues (closes: #300889) + * Be more tolerant when handling values from the no_proxy environment + variable (closes: #218451) + * Explicitly define keyboard accelerators for buttons so that they + do not clash (closes: #270205) + + -- Peter Gervai Tue, 12 Apr 2005 23:46:12 +0200 + +elinks (0.10.2-3) unstable; urgency=low + + * Enable ECMAScript/JS engine SpiderMonkey + * Enable experimental Perl scripting + * Enable experimental NNTP handling + * Enable 256 color terminal handling + * Enable status blinkenlights ("leds") + * Refuse to run under root uid + + -- Peter Gervai Fri, 25 Feb 2005 12:47:10 +0100 + +elinks (0.10.2-2) unstable; urgency=low + + * Fixed bookmark problem (Closes: #296679) + + -- Peter Gervai Fri, 25 Feb 2005 11:48:03 +0100 + +elinks (0.10.2-1) unstable; urgency=low + + * New upstream version v0.10.2 + * Cleanups by Jonas Fonseca , debian dir + installed into upstream CVS: + * Only remove CVS files from packaging directory so the package can + be built from checked out sources + * Install elinks.conf from contrib/ + * Install documentation files about using ELinks from doc/ + * Remove more unrelevant files from contrib/ + * List docs in elinks.docs file + * Support for DEB_BUILD_OPTIONS + * Update and cleanup debian/rules + * Pass -force-html in the debian/mime mailcap entries so problems with + viewing files without an extension are fixed + * Enhance desktop file and install it in /usr/share/applications/ which + seems to be the new standard + * Many problems related to mangleme tools fixed (closes: #277283) + * Documentation updates (closes: #215619) + * Fix IPv6 URI parsing (closes: #173378) + * Send the previous URL as referer by default (closes: #198684) + * Bump up the dependency on dephelper (closes: #247280) + * Force dumping to stdout when ELinks connects to a pipe instead of a + terminal, even if the boolean argument to -dump is zero (closes: #231663) + * Suggest filename based on Content-Disposition (closes: #171571) + * Update the manpage and add -stdin command line option for compatibility + even though reads from stdin are autodetected (closes: #281010) + * Add support for recognizing mixed-case URI schemes (closes: #242140) + * Fix xterm detection code, thanks Adam Borowski (closes: #228977) + * Fix handling of id names in preformatted content (closes: #219331) + * Fix assertion failure when searching in empty documents (closes: #238281) + * Remove www-browser alternative, thanks Andreas Metzler (closes: #247495) + * Fix uncompressing of .gz files on download (closes: #221207) + + -- Peter Gervai Mon, 21 Feb 2005 15:21:55 +0100 + +elinks (0.9.3-1) unstable; urgency=low + + * New upstream release + + -- Peter Gervai Sun, 21 Nov 2004 14:08:25 +0100 + +elinks (0.9.1+0.9.2rc4-2) unstable; urgency=low + + * Fix naming (it's rc [release candidate] and not pre[release]) + * Fix rules to use /etc/elinks for configure (closes: #267962) + + -- Peter Gervai Wed, 11 Aug 2004 15:57:53 +0200 + +elinks (0.9.1+0.9.2pre4-1) unstable; urgency=low + + * New upstream version 0.9.2pre4 + * Remove kderemove from menu (closes: #264402) + * Recompiled with gnutls11 (closes: #263633) + * FTBFS on GNU/Hurd (and GNU/k*BSD) (closes: #262350) + + -- Peter Gervai Sun, 8 Aug 2004 23:48:47 +0200 + +elinks (0.9.1+0.9.2pre3-1) unstable; urgency=low + + * New upstream pre-release 0.9.2pre3. (closes: #262306) + * Don't read nonexistant hooks.lua (closes: #231760) + * README.Debian updated by "I forgot to read the docs" + questions (closes: #209046, #234589) + * Fix accept-charset problem (closes: #242524) + * Updated build-deps based on buildd's hints, removed xlib-dev + (closes: #231646) + * Changed 'make prefix=' to 'make DESTDIR=' in rules (closes: #234991) + * Removed outdated example dir (now included upstream) + * Removed debconf warning about cookies (closes: #235816) + + -- Peter Gervai Fri, 30 Jul 2004 23:38:42 +0200 + +elinks (0.9.1-1) unstable; urgency=low + + * New upstream release. (Closes: #226941) + * Features: Standard, IPv6, gzip, bzip2, SSL (GnuTLS), MIME (Option + system, Mailcap, Mimetypes files), Bookmarks, Cookies, Forms History, + Global History, URI rewrite, Scripting (Lua) + * Droppend dep on xlibs (no xterm title restore) (Partially fixing + #218453) + * Depends on newer gnutls10 and liblua50 + + -- Peter Gervai Wed, 21 Jan 2004 22:13:45 +0100 + +elinks (0.4.2.99-1) unstable; urgency=low + + * New upstream release 0.4.3rc2 + * Manpage fixed (Closes: #210305, #212491) + * No segfault when deleting bookmarks (Closes: #193119) + * Install www-browser alternative (Closes: #184981) + * ~user handled better (Closes: #181731) + * Overwrite truncates file first (Closes: #186052) + * Links/elinks selection now handled automagically (Closes: #168692) + * Elinks starts with the "goto URL" dialog, not a blank + screen (Closes: #206932) + * Remove CVS entries from package + * Numerous upstream bugfixes. + + -- Peter Gervai Thu, 9 Oct 2003 00:24:41 +0200 + +elinks (0.4.2-1) unstable; urgency=low + + * New upstream release 0.4.2. + * New style config UI (Closes: #167928, #169908) + * Includes spanish debconf template (Closes: #158576) + * Fixes linking problem with some renegade lib (Closes: #176401) + * Fixes 'bad url syntax' problem (Closes: #177335) + * Defines as /usr/bin/links alternative (Closes: #164058, #168692) + + -- Peter Gervai Thu, 30 Jan 2003 01:09:34 +0100 + +elinks (0.3.20021004-1) unstable; urgency=low + + * New upstream release 0.4pre17 + * Config moved into /etc/elinks/ (closes: #158666) + + -- Peter Gervai Fri, 4 Oct 2002 15:58:19 +0200 + +elinks (0.3.20020825-2) unstable; urgency=low + + * Spanish debconf translation (closes: #158576) + + -- Peter Gervai Wed, 28 Aug 2002 12:04:19 +0200 + +elinks (0.3.20020825-1) unstable; urgency=low + + * New upstream version 0.4pre14 + * Fixed a bug when elinks falls into infinite waiting loops + * Compiled against new gnutls package (patched upstream to + use gnutls/*.h... it used to work...) + + -- Peter Gervai Sun, 25 Aug 2002 12:07:21 +0200 + +elinks (0.3.20020808-1) unstable; urgency=low + + * New upstream version 0.4pre12 + * Fixed lots of bugs, including stopping in the middle of a long + transfer ("slashdot problem", closes: #154938), cookie expiration + (closes: #154664), self referer problem (closes: #154778). + * Removed duplicate contrib/ dirs (bug in upstream's cvs, Closes: #154860) + + -- Peter Gervai Thu, 8 Aug 2002 12:24:39 +0200 + +elinks (0.3.20020711-2) unstable; urgency=low + + * Disabled default cookie saving to disk due Bug#154664, because + ELinks does not expire cookies all the time, and it causes + problems with remembered logins which should have been forgotten. + You have to change ~/.elinks/elinks.conf though. + + -- Peter Gervai Mon, 29 Jul 2002 22:21:02 +0200 + +elinks (0.3.20020711-1) unstable; urgency=low + + * Version 0.4pre12 upstream. + * Package separated from links. This package is _preferred_ to + the package 'links', because this contains plenty of useful + features, including cookies (save too), referer handling, + advanced configuration, LUA script language, and so on. + * Before reporting bugs please check against the bugs of + 'links' and 'links-ssl'. Thank you. + + -- Peter Gervai Thu, 11 Jul 2002 17:38:09 +0200 + +links-ssl (0.96.20020711-1) unstable; urgency=low + + * New upstream release (v0.7pre12) + * Fixes DNS bug (closes: ...) + * Fix some crashes + + -- Peter Gervai Thu, 11 Jul 2002 12:28:17 +0200 + +links-ssl (0.96.20020607-1) unstable; urgency=low + + * New upstream release (v0.4pre7) + + -- Peter Gervai Fri, 7 Jun 2002 17:28:18 +0000 + +links-ssl (0.96.20020409-2) unstable; urgency=low + + * Using new lua libraries (liblua40 / liblualib40) (closes: #141327) + * Updated Readme (closes: #141542) + + -- Peter Gervai Mon, 15 Apr 2002 18:42:32 +0200 + +links-ssl (0.96.20020409-1) unstable; urgency=low + + * New upstream version (eLinks 04.pre5) + * Again, plenty of bugs fixed and some features added (including, + but not limited to history search and selection). + * Now handles spaces in filenames (closes: #92079) + * Fixes stacked FTP commands (closes: #100861), but please reopen + bug if it doesn't work correctly (I can't test it)! + + -- Peter Gervai Tue, 9 Apr 2002 20:17:02 +0200 + +links-ssl (0.96.20020319-2) unstable; urgency=low + + * I try to catch up with Lua packages, fixed build-deps (twice) + (Now Lua should work on non i386 too) + + -- Peter Gervai Wed, 20 Mar 2002 02:08:55 +0100 + +links-ssl (0.96.20020319-1) unstable; urgency=low + + * New upstream version (eLinks 0.4pre2) + * Plenty of patches included now in eLinks, most of them + provide new features, some fixes bugs (some creates them :-)) + (many features hidden unless you check the docs) + * HTTP authentication (password) support (closes: #107480) + * Nonexistant frame segfault fix (closes: #128877) + * Included Links-lua docs + * Fixed rules (closes: #127206), description (closes: #127203) + + -- Peter Gervai Tue, 19 Mar 2002 00:29:44 +0100 + +links-ssl (0.96.20011222-1.1) unstable; urgency=low + + * Non-maintainer upload + * Fixes Build-Dependancy for lua-dev -> liblua4-dev (closes: #126290) + + -- Joel Baker Sun, 17 Feb 2002 13:46:36 -0700 + +links-ssl (0.96.20011225-1) unstable; urgency=low + + * New upstream version (eLinks 0.2). + * Minor bugfixes, mostly cosmetics. + + -- Peter Gervai Tue, 25 Dec 2001 02:29:05 +0100 + +links-ssl (0.96.20011222-1) unstable; urgency=low + + * Changed to packaging the actively developed branch of Links, + which includes Lua patches and other goodies. Unless it breaks + or behaves unacceptable I try to keep this packaged, as the original + release does not get its bugs fixed no matter what.... + * Lots of bugfixes, see Changelog + * Fixed config file example of gif to use mime-type (closes: #125661) + + -- Peter Gervai Sat, 22 Dec 2001 01:22:51 +0100 + +links-ssl (0.96-1) unstable; urgency=low + + * New upstream release + + -- Peter Gervai Wed, 4 Jul 2001 00:49:37 +0200 + +links-ssl (0.95.1-3) unstable; urgency=low + + * Changed links.desktop to links-ssl.desktop + * links-ssl now provides links (closes: #102600) + + -- Peter Gervai Wed, 27 Jun 2001 21:10:41 +0200 + +links-ssl (0.95.1-2) unstable; urgency=high + + * Now everyone see I never tried KDE :) desktop file fixed + (closes: #101964) + + -- Peter Gervai Sat, 23 Jun 2001 12:17:50 +0200 + +links-ssl (0.95.1-1) unstable; urgency=low + + * New upstream version 0.96pre7 + * Build depends libgpmg1-dev [!hurd-i386] (closes: #99961, #95977) + * Install KDE menu (closes: #96494) + + -- Peter Gervai Fri, 8 Jun 2001 00:25:45 +0200 + +links-ssl (0.95-3) unstable; urgency=low + + * fixes SIGSEGV due ssl libs + + -- Peter Gervai Mon, 5 Mar 2001 14:28:17 +0100 + +links-ssl (0.95-2) unstable; urgency=low + + * Rebuilt using libssl096 (closes: #82079) + * Fixed build dependency on libssl096-dev and + libgpmg1-dev (closes: #82080) + * Hopefully not killing the Bugfree(tm) katie install + mechanism by using consistent maintaner address. ;-) + + -- Peter Gervai Tue, 16 Jan 2001 19:58:19 +0100 + +links-ssl (0.95-1) unstable; urgency=low + + * New upstream version. + * build depends on debhelper (closes: #81231) + + -- Peter Gervai Thu, 4 Jan 2001 03:15:52 +0100 + +links-ssl (0.94-0pre9) unstable; urgency=low + + * New upstream version. + * Changelog split from links (-plain) + * Removed "unofficial" patches to match upstream version, as + the author seems to be working again and including submitted + patches to mainstream. (closes: #80005, #79853) + * Enter key now submits again (closes: #75225) + * Pathless URL's aren't cut (closes: #75546) + * Different xterm detection (closes: #79687) + * Updated manpage + + -- Peter Gervai Wed, 3 Jan 2001 19:00:58 +0100 + +Local variables: +mode: debian-changelog +End: --- elinks-0.11.3.orig/debian/elinks-data.docs +++ elinks-0.11.3/debian/elinks-data.docs @@ -0,0 +1,4 @@ +AUTHORS +README +THANKS +TODO --- elinks-0.11.3.orig/debian/copyright +++ elinks-0.11.3/debian/copyright @@ -0,0 +1,59 @@ +This package was debianized by Peter Gervai on +Mon, 29 Nov 1999 12:16:46 +0100. + +It was downloaded from http://elinks.or.cz/ + +Upstream Authors: + + Jonas Fonseca + José Luis González González + Peter Wang + Petr Baudis + Mikulas Patocka + Miciah Dashiel Butler Masters + Witold Filipczyk + Sergei Borushevsky + Laurent Monin + Karsten Schölzel + Kalle Olavi Niemitalo + Fabio Bonelli + Cliff Cunnington + And may others (See AUTHORS file for complete list) + +Copyright: + + Copyright (C) 2003-2004, The ELinks Project + Copyright (C) 2002-2003, Laurent Monin + Copyright (C) 2001-2004, Petr Baudis + Copyright (C) 2000-2001, Kungliga Tekniska Högskolan + Copyright (C) 1999-2002, Mikulas Patocka + Copyright (C) 1996-2000, Michael R. Elkins + Copyright (C) 1995-2002, Jean-loup Gailly + Copyright (C) 1995-1997, 2000-2001, Free Software Foundation, Inc. + Copyright (C) 1995-1999, Cryptography Research, Inc. + Copyright (C) 1995, Patrick Powell + +License: + + 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; unless explicitly stated otherwise + elsewhere (in the AUTHORS file), only version 2 of the License (not + version 3.x etc.) is the valid version of the GNU General Public + License for ELinks. + + 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 + with the Debian GNU/Linux distribution in the file + /usr/share/common-licenses/GPL-2; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + +The Debian packaging is +Copyright (C) 1999-2007, Peter Gervai +Copyright (C) 2007-2008, Y Giridhar Appaji Nag and +is licensed under the GNU GPL, either version 2 of the License, or (at +your option) any later version; see `/usr/share/common-licenses/GPL-2'. --- elinks-0.11.3.orig/debian/elinks.prerm +++ elinks-0.11.3/debian/elinks.prerm @@ -0,0 +1,19 @@ +#!/bin/sh + +set -e + +case "$1" in + remove) + update-alternatives --quiet --remove www-browser /usr/bin/elinks + ;; + upgrade|failed-upgrade|deconfigure) + ;; + *) + echo "prerm called with unknown argument \`$1'" >&2 + exit 0 + ;; +esac + +#DEBHELPER# + +exit 0 --- elinks-0.11.3.orig/debian/compat +++ elinks-0.11.3/debian/compat @@ -0,0 +1 @@ +5 --- elinks-0.11.3.orig/debian/elinks-lite.mime +++ elinks-0.11.3/debian/elinks-lite.mime @@ -0,0 +1,2 @@ +text/html; /usr/bin/elinks -force-html %s; needsterminal; description=HTML Text; nametemplate=%s.html; priority=4 +text/html; /usr/bin/elinks -force-html -dump %s; copiousoutput; description=HTML Text; nametemplate=%s.html; priority=3 --- elinks-0.11.3.orig/debian/elinks-data.README.Debian +++ elinks-0.11.3/debian/elinks-data.README.Debian @@ -0,0 +1,44 @@ +elinks for Debian +----------------- +ELinks is a code fork of Links, the original character mode browser of +Mikulas Patocka. ELinks provides lots of new features over the original +Links codebase, and changes are more rapid. Some believes that Links is +more stable because of the few feature change. YMMW. + + * * * + + -- Y Giridhar Appaji Nag Thu, 03 Jan 2008 17:01:37 +0530 + +Do not forget to setup after the first install: press F9, go to the Setup +menu, and set Linux console, default display character set and others. (An +example default config is provided in /etc/elinks/elinks.conf) + +To be able to cut&paste with gpm, use SHIFT+MOUSE together and it'll +behave as without gpm. + +With the examples/mailcap.pl you can convert the /etc/mailcap file to +elinks.conf format, and append to your config, until it gets supported. + + -- Peter Gervai , Thu, 9 Oct 2003 01:17:26 +0200 + +Some questions from bugreports: +=============================== +Q: Where did the download manager/proxy settings/whatever disappear? +A: Please check the menus. Download manager is under Tools>Download, proxy + settings is at Setup>Options>Protocols>HTTP>Proxy>Host and port. + Familiarize yourself with the options manager. :-) + (with contribution by Jonas Fonseca) + +Q: The "move" doesn't work in the bookmark manager. +A: Install the elinks-doc package and read the bookmarks section of the + manual to learn how to use this unintuitive feature. + (contributed by Miciah Dashiel Butler Masters) + + -- Peter Gervai , Wed, 7 Apr 2004 13:40:56 +0200 + +Q: What happened to the links alternative? +A: Beginning 0.11.3-2, ELinks no longer installs the links alternative + and doesn't provide links. ELinks should be invoked as "elinks" and + the links package can be installed alongside elinks. + + -- Y Giridhar Appaji Nag Wed, 23 Jan 2008 17:23:08 +0530 --- elinks-0.11.3.orig/debian/elinks-lite.menu +++ elinks-0.11.3/debian/elinks-lite.menu @@ -0,0 +1,9 @@ +?package(elinks-lite): \ + needs="text" \ + section="Applications/Network/Web Browsing" \ + title="ELinks WWW browser (Lightweight)" \ + command="/usr/bin/elinks" \ + hints="Web browsers" \ + description="ELinks is a character mode browser with support for \ + rendering tables and frames, background downloads among other \ + features." --- elinks-0.11.3.orig/debian/elinks.mime +++ elinks-0.11.3/debian/elinks.mime @@ -0,0 +1,2 @@ +text/html; /usr/bin/elinks -force-html %s; needsterminal; description=HTML Text; nametemplate=%s.html; priority=4 +text/html; /usr/bin/elinks -force-html -dump %s; copiousoutput; description=HTML Text; nametemplate=%s.html; priority=3 --- elinks-0.11.3.orig/debian/elinks-lite.postinst +++ elinks-0.11.3/debian/elinks-lite.postinst @@ -0,0 +1,24 @@ +#!/bin/sh + +set -e + +case "$1" in + configure) + update-alternatives --quiet \ + --install /usr/bin/www-browser www-browser /usr/bin/elinks 35 \ + --slave /usr/share/man/man1/www-browser.1.gz www-browser.1.gz /usr/share/man/man1/elinks.1.gz + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 0 + ;; +esac + +#DEBHELPER# + +exit 0 --- elinks-0.11.3.orig/debian/control +++ elinks-0.11.3/debian/control @@ -0,0 +1,68 @@ +Source: elinks +Section: web +Priority: optional +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Y Giridhar Appaji Nag +Uploaders: Moritz Muehlenhoff +Build-Depends: debhelper (>= 5), libgnutls-dev, libgpmg1-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], liblua50-dev, liblualib50-dev, libbz2-dev, libexpat1-dev (>= 1.95.6), libperl-dev, autotools-dev, gettext, asciidoc, xmlto, docbook-utils, perl +Standards-Version: 3.7.3 +Homepage: http://elinks.or.cz/ +Vcs-Git: git://git.debian.org/git/collab-maint/elinks.git +Vcs-Browser: http://git.debian.org/?p=collab-maint/elinks.git + +Package: elinks +Architecture: any +Depends: ${shlibs:Depends}, elinks-data (= ${source:Version}) +Suggests: elinks-doc +Provides: www-browser +Conflicts: elinks-lite +Description: Advanced text-mode WWW browser + ELinks (Enhanced Links) is a lynx-like character mode browser, created + from the Links browser with many patches and enhancements. It includes + support for rendering tables and frames, features background downloads, + can display colors, supports the Lua scripting language, IPV6 and has + many other features. + +Package: elinks-data +Architecture: all +Recommends: elinks (= ${source:Version}) +Conflicts: elinks (<= 0.11.1-1.5), elinks-lite +Replaces: elinks (<= 0.11.1-1.5) +Description: Data files for ELinks - An advanced text-mode WWW browser + ELinks (Enhanced Links) is a lynx-like character mode browser, created + from the Links browser with many patches and enhancements. It includes + support for rendering tables and frames, features background downloads, + can display colors, supports the Lua scripting language, IPV6 and has + many other features. + . + This package contains the data files that are necessary to use elinks. + +Package: elinks-doc +Section: doc +Architecture: all +Suggests: elinks +Conflicts: elinks (<= 0.11.1-1.5), elinks-lite (<= 0.11.1-1.5) +Description: Documentation for ELinks - An advanced text-mode WWW browser + ELinks (Enhanced Links) is a lynx-like character mode browser, created + from the Links browser with many patches and enhancements. It includes + support for rendering tables and frames, features background downloads, + can display colors, supports the Lua scripting language, IPV6 and has + many other features. + . + This package contains the documentation and manuals for ELinks. + +Package: elinks-lite +Priority: extra +Architecture: any +Depends: ${shlibs:Depends} +Suggests: elinks-doc +Provides: www-browser +Conflicts: elinks +Description: Lightweight version of Elinks - An advanced text-mode WWW browser + ELinks (Enhanced Links) is a lynx-like character mode browser, created + from the Links browser with many patches and enhancements. It includes + support for rendering tables and frames, features background downloads + and can display colors. + . + This lite version contains no scripting or extra features but doesn't + depend on other libraries either, so it's useful for small systems. --- elinks-0.11.3.orig/debian/elinks.postinst +++ elinks-0.11.3/debian/elinks.postinst @@ -0,0 +1,24 @@ +#!/bin/sh + +set -e + +case "$1" in + configure) + update-alternatives --quiet \ + --install /usr/bin/www-browser www-browser /usr/bin/elinks 35 \ + --slave /usr/share/man/man1/www-browser.1.gz www-browser.1.gz /usr/share/man/man1/elinks.1.gz + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 0 + ;; +esac + +#DEBHELPER# + +exit 0 --- elinks-0.11.3.orig/debian/elinks.lintian +++ elinks-0.11.3/debian/elinks.lintian @@ -0,0 +1,2 @@ +# elinks(1) is installed by elinks-data +elinks: binary-without-manpage usr/bin/elinks --- elinks-0.11.3.orig/debian/patches/01_asciidoc7compatible.diff +++ elinks-0.11.3/debian/patches/01_asciidoc7compatible.diff @@ -0,0 +1,16 @@ +Add a "-a asciidoc7compatible" to ASCIIDOC_FLAGS. Based on upstream +commit 5210d97c3756b04f1cf5c27fde8ed342ac756a0d + +diff --git a/doc/Makefile b/doc/Makefile +index b66c37c..5d8e447 100644 +--- a/doc/Makefile ++++ b/doc/Makefile +@@ -13,7 +13,7 @@ HTML_DIR = $(DESTDIR)$(docdir)/$(PACKAGE)/html + PDF_DIR = $(DESTDIR)$(docdir)/$(PACKAGE)/pdf + + ASCIIDOC_CONF = $(srcdir)asciidoc.conf +-ASCIIDOC_FLAGS += -f $(ASCIIDOC_CONF) -a "builddir=$(CURDIR)/" ++ASCIIDOC_FLAGS += -f $(ASCIIDOC_CONF) -a "builddir=$(CURDIR)/" -a asciidoc7compatible + + ############################################################################# + # Build files --- elinks-0.11.3.orig/debian/patches/03_417789-CVE-2007-2027.diff +++ elinks-0.11.3/debian/patches/03_417789-CVE-2007-2027.diff @@ -0,0 +1,16 @@ +Don't look for gettext message catalogs in ../po/. Based on patch +from Julien Cristau for #417789 + +diff --git a/src/intl/gettext/loadmsgcat.c b/src/intl/gettext/loadmsgcat.c +index 2198d8a..163ac82 100644 +--- a/src/intl/gettext/loadmsgcat.c ++++ b/src/intl/gettext/loadmsgcat.c +@@ -247,7 +247,7 @@ _nl_load_domain(struct loaded_l10nfile *domain_file, + { + struct string filename; + +- if (init_string(&filename) ++ if (init_string(&filename) && 0 + && add_filename_to_string(&filename, domain_file)) { + fd = open(filename.source, O_RDONLY | O_BINARY); + } --- elinks-0.11.3.orig/debian/patches/04_380347-entity_cache-overflow.diff +++ elinks-0.11.3/debian/patches/04_380347-entity_cache-overflow.diff @@ -0,0 +1,57 @@ +Prevent a buffer overflow in entity_cache. Based on upstream commit +14588b9455583096ddeb54b0541bfc230a2a2451 for #380347 + +diff --git a/src/intl/charsets.c b/src/intl/charsets.c +index d25c558..94ba5a7 100644 +--- a/src/intl/charsets.c ++++ b/src/intl/charsets.c +@@ -543,7 +543,17 @@ get_entity_string(const unsigned char *str, const int strlen, int encoding) + end: + /* Take care of potential buffer overflow. */ + if (strlen < sizeof(entity_cache[slen][0].str)) { +- struct entity_cache *ece = &entity_cache[slen][nb_entity_cache[slen]]; ++ struct entity_cache *ece; ++ ++ /* Sort entries by hit order. */ ++ if (nb_entity_cache[slen] > 1) ++ qsort(&entity_cache[slen][0], nb_entity_cache[slen], ++ sizeof(entity_cache[slen][0]), (void *) hits_cmp); ++ ++ /* Increment number of cache entries if possible. ++ * Else, just replace the least used entry. */ ++ if (nb_entity_cache[slen] < ENTITY_CACHE_SIZE) nb_entity_cache[slen]++; ++ ece = &entity_cache[slen][nb_entity_cache[slen] - 1]; + + /* Copy new entry to cache. */ + ece->hits = 1; +@@ -553,21 +563,11 @@ end: + memcpy(ece->str, str, strlen); + ece->str[strlen] = '\0'; + +- /* Increment number of cache entries if possible. */ +- if (nb_entity_cache[slen] < ENTITY_CACHE_SIZE) nb_entity_cache[slen]++; + + #ifdef DEBUG_ENTITY_CACHE + fprintf(stderr, "Added in [%u]: l=%d st='%s'\n", slen, + entity_cache[slen][0].strlen, entity_cache[slen][0].str); + +-#endif +- +- /* Sort entries by hit order. */ +- if (nb_entity_cache[slen] > 1) +- qsort(&entity_cache[slen][0], nb_entity_cache[slen], +- sizeof(entity_cache[slen][0]), (void *) hits_cmp); +- +-#ifdef DEBUG_ENTITY_CACHE + { + unsigned int i; + +@@ -578,7 +578,7 @@ end: + entity_cache[slen][i].str); + fprintf(stderr, "-----------------\n"); + } +-#endif ++#endif /* DEBUG_ENTITY_CACHE */ + } + return result; + } --- elinks-0.11.3.orig/debian/patches/08_436817_nostrip.diff +++ elinks-0.11.3/debian/patches/08_436817_nostrip.diff @@ -0,0 +1,16 @@ +Remove CFLAGS from the linker command for dh_strip - comply with Debian +policy (section 10.1 "Binaries") for #436817 + +diff --git a/Makefile.lib b/Makefile.lib +index b095376..df9e994 100644 +--- a/Makefile.lib ++++ b/Makefile.lib +@@ -48,7 +48,7 @@ quiet_cmd_ld_objs = " [$(LD_COLOR)LD$(END_COLOR)] $(RELPATH)$@" + `test -e $(subdir)/$(LIB_O_NAME) && echo $(subdir)/$(LIB_O_NAME)`) + + quiet_cmd_link = ' [$(LINK_COLOR)LINK$(END_COLOR)] $(RELPATH)$@' +- cmd_link = $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS) ++ cmd_link = $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) + + quiet_cmd_sparse = ' [SPARSE] $(RELPATH)$(2)' + cmd_sparse = $(SPARSE) $(DEFS) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS) $(SPARSE_FLAGS) $(2) --- elinks-0.11.3.orig/debian/patches/06_459467_ui.leds.enable_0.diff +++ elinks-0.11.3/debian/patches/06_459467_ui.leds.enable_0.diff @@ -0,0 +1,30 @@ +Set ui.leds.enable to 0 by default for #459467. No frequent wakeups on +laptops and desktop folks can enable this if they like it. Patch based +on suggestion from أحمد المحمودي (Ahmed El-Mahmoudy). + +diff --git a/doc/html/elinks.conf.5.html b/doc/html/elinks.conf.5.html +index c7d9ffe..9b7ac3a 100644 +--- a/doc/html/elinks.conf.5.html ++++ b/doc/html/elinks.conf.5.html +@@ -5239,7 +5239,7 @@ ui.leds +

+ +
+-ui.leds.enable [0|1] (default: 1) ++ui.leds.enable [0|1] (default: 0) +
+
+

+diff --git a/src/bfu/leds.c b/src/bfu/leds.c +index 3ec76ef..f59ce0a 100644 +--- a/src/bfu/leds.c ++++ b/src/bfu/leds.c +@@ -92,7 +92,7 @@ static struct option_info led_options[] = { + N_("LEDs (visual indicators) options.")), + + INIT_OPT_BOOL("ui.leds", N_("Enable"), +- "enable", 0, 1, ++ "enable", 0, 0, + N_("Enable LEDs.\n" + "These visual indicators will inform you about various states.")), + --- elinks-0.11.3.orig/debian/patches/02_setup-bugs-FSSTND.diff +++ elinks-0.11.3/debian/patches/02_setup-bugs-FSSTND.diff @@ -0,0 +1,116 @@ +Point bugs URL to debian.org and remove FSSTND dir in setup.h + +diff --git a/contrib/elinks.conf b/contrib/elinks.conf +index 6dc251c..d050c95 100644 +--- a/contrib/elinks.conf ++++ b/contrib/elinks.conf +@@ -865,7 +865,7 @@ + ## mime.mailcap.path + # Mailcap search path. Colon-separated list of files. + # Leave as "" to use MAILCAP environment variable instead. +- set mime.mailcap.path = "~/.mailcap:/etc/mailcap:/usr/etc/mailcap:/usr/local/etc/mailcap:/usr/share/mailcap:/usr/share/misc/mailcap" ++ set mime.mailcap.path = "~/.mailcap:/etc/mailcap:/usr/local/etc/mailcap:/usr/share/mailcap:/usr/share/misc/mailcap" + + ## mime.mailcap.ask [0|1] + # Ask before using the handlers defined by mailcap. +@@ -897,7 +897,7 @@ + + ## mime.mimetypes.path + # The search path for mime.types files. Colon-separated list of files. +- set mime.mimetypes.path = "~/.mime.types:/etc/mime.types:/usr/etc/mime.types:/usr/local/etc/mime.types:/usr/share/mime.types:/usr/share/misc/mime.types" ++ set mime.mimetypes.path = "~/.mime.types:/etc/mime.types:/usr/local/etc/mime.types:/usr/share/mime.types:/usr/share/misc/mime.types" + + + ## mime.type +diff --git a/doc/elinks.1.txt b/doc/elinks.1.txt +index 060336f..485e19b 100644 +--- a/doc/elinks.1.txt ++++ b/doc/elinks.1.txt +@@ -136,9 +136,10 @@ is in state of beta testing. + BUGS + ---- + +-Please report any other bugs you find to the either the ELinks mailing list at +-mailto:elinks-users@linuxfromscratch.org[] or if you prefer enter them into +-http://bugzilla.elinks.or.cz/[the bug tracking system]. More information about ++Please report any bugs you find to the ++http://bugs.debian.org/src:elinks[Debian bug tracking] system using the ++reportbug program, or if you prefer enter them into the upstream elinks ++http://bugzilla.elinks.or.cz/[bug tracking system]. More information about + how to get in contact with developers and getting help can be found on + http://elinks.or.cz/community.html[the community page]. + +diff --git a/doc/html/elinks.conf.5.html b/doc/html/elinks.conf.5.html +index c7d9ffe..fc819c5 100644 +--- a/doc/html/elinks.conf.5.html ++++ b/doc/html/elinks.conf.5.html +@@ -2194,7 +2194,7 @@ mime.mailcap.enable [0|1] (default: 1) +

+
+
+-mime.mailcap.path <str> (default: "~/.mailcap:/etc/mailcap:/usr/etc/mailcap:/usr/local/etc/mailcap:/usr/share/mailcap:/usr/share/misc/mailcap") ++mime.mailcap.path <str> (default: "~/.mailcap:/etc/mailcap:/usr/local/etc/mailcap:/usr/share/mailcap:/usr/share/misc/mailcap") +
+
+

+@@ -2265,7 +2265,7 @@ mime.mimetypes.enable [0|1] (default: 1) +

+
+
+-mime.mimetypes.path <str> (default: "~/.mime.types:/etc/mime.types:/usr/etc/mime.types:/usr/local/etc/mime.types:/usr/share/mime.types:/usr/share/misc/mime.types") ++mime.mimetypes.path <str> (default: "~/.mime.types:/etc/mime.types:/usr/local/etc/mime.types:/usr/share/mime.types:/usr/share/misc/mime.types") +
+
+

+diff --git a/doc/man/man5/elinks.conf.5 b/doc/man/man5/elinks.conf.5 +index 1c73edc..3a263c6 100644 +--- a/doc/man/man5/elinks.conf.5 ++++ b/doc/man/man5/elinks.conf.5 +@@ -991,7 +991,7 @@ mime\&.mailcap\&.enable [0|1] (default: 1) + Enable mailcap support\&. + + .TP +-mime\&.mailcap\&.path (default: "~/\&.mailcap:/etc/mailcap:/usr/etc/mailcap:/usr/local/etc/mailcap:/usr/share/mailcap:/usr/share/misc/mailcap") ++mime\&.mailcap\&.path (default: "~/\&.mailcap:/etc/mailcap:/usr/local/etc/mailcap:/usr/share/mailcap:/usr/share/misc/mailcap") + Mailcap search path\&. Colon\-separated list of files\&. Leave as "" to use MAILCAP environment variable instead\&. + + .TP +@@ -1029,7 +1029,7 @@ mime\&.mimetypes\&.enable [0|1] (default: 1) + Enable mime\&.types support\&. + + .TP +-mime\&.mimetypes\&.path (default: "~/\&.mime\&.types:/etc/mime\&.types:/usr/etc/mime\&.types:/usr/local/etc/mime\&.types:/usr/share/mime\&.types:/usr/share/misc/mime\&.types") ++mime\&.mimetypes\&.path (default: "~/\&.mime\&.types:/etc/mime\&.types:/usr/local/etc/mime\&.types:/usr/share/mime\&.types:/usr/share/misc/mime\&.types") + The search path for mime\&.types files\&. Colon\-separated list of files\&. + + .TP +diff --git a/src/setup.h b/src/setup.h +index 8b6e0c0..6489bc5 100644 +--- a/src/setup.h ++++ b/src/setup.h +@@ -12,7 +12,7 @@ + + #define ELINKS_HOMEPAGE "http://elinks.cz/" + #define ELINKS_DOC_URL "http://elinks.cz/documentation/" +-#define ELINKS_BUGS_URL "http://bugzilla.elinks.cz/" ++#define ELINKS_BUGS_URL "http://bugs.debian.org/src:elinks" + #define ELINKS_GITWEB_URL "http://pasky.or.cz/gitweb.cgi" + + #define ELINKS_SOCK_NAME "socket" +@@ -81,13 +81,13 @@ + #define DEFAULT_PAGER_PATH "/usr/bin/pager" + #define DEFAULT_LESS_PATH "/usr/bin/less" + #define DEFAULT_MORE_PATH "/usr/bin/more" +-#define DEFAULT_MAILCAP_PATH "~/.mailcap:/etc/mailcap:/usr/etc/mailcap:/usr/local/etc/mailcap:/usr/share/mailcap:/usr/share/misc/mailcap" +-#define DEFAULT_MIMETYPES_PATH "~/.mime.types:/etc/mime.types:/usr/etc/mime.types:/usr/local/etc/mime.types:/usr/share/mime.types:/usr/share/misc/mime.types" ++#define DEFAULT_MAILCAP_PATH "~/.mailcap:/etc/mailcap:/usr/local/etc/mailcap:/usr/share/mailcap:/usr/share/misc/mailcap" ++#define DEFAULT_MIMETYPES_PATH "~/.mime.types:/etc/mime.types:/usr/local/etc/mime.types:/usr/share/mime.types:/usr/share/misc/mime.types" + + /* Default external commands (see osdep/newwin.c and/or system-specific osdep/ + * files) */ + #define DEFAULT_TWTERM_CMD "twterm -e" +-#define DEFAULT_XTERM_CMD "xterm -e" ++#define DEFAULT_XTERM_CMD "x-terminal-emulator -e" + #define DEFAULT_SCREEN_CMD "screen" + #define DEFAULT_OS2_WINDOW_CMD "cmd /c start /c /f /win" + #define DEFAULT_OS2_FULLSCREEN_CMD "cmd /c start /c /f /fs" --- elinks-0.11.3.orig/debian/patches/07_local-CGI-query-fix.diff +++ elinks-0.11.3/debian/patches/07_local-CGI-query-fix.diff @@ -0,0 +1,16 @@ +Patch to fix regression: query parsing in local CGI URIs. Based on +upstream commit e96665134ae9b5106fe0d5c30d445212d970e91b + +diff --git a/src/protocol/uri.c b/src/protocol/uri.c +index fd22b4a..58f2df2 100644 +--- a/src/protocol/uri.c ++++ b/src/protocol/uri.c +@@ -149,7 +149,7 @@ static int + check_uri_file(unsigned char *name) + { + /* Check POST_CHAR etc ... */ +- static const unsigned char chars[] = POST_CHAR_S "#?"; ++ static const unsigned char chars[] = POST_CHAR_S "#"; + + return strcspn(name, chars); + } --- elinks-0.11.3.orig/debian/patches/05_257762-transparency-off.diff +++ elinks-0.11.3/debian/patches/05_257762-transparency-off.diff @@ -0,0 +1,23 @@ +Turn terminal transparency off by default. Based on upstream commit +6390c327aa61b83776a45512ca3db08f04fe4a5d for #257762 + +diff --git a/src/config/options.inc b/src/config/options.inc +index 481d623..eadd5f7 100644 +--- a/src/config/options.inc ++++ b/src/config/options.inc +@@ -826,11 +826,13 @@ static struct option_info config_options_info[] = { + "2 is 256 color mode, uses XTerm RGB codes")), + + INIT_OPT_BOOL("terminal._template_", N_("Transparency"), +- "transparency", 0, 1, ++ "transparency", 0, 0, + N_("If we should not set the background to black. This is particularly\n" + "useful when we have a terminal (typically in some windowing\n" + "environment) with a background image or a transparent background -\n" +- "it will be visible in ELinks as well. Note that this option makes\n" ++ "it will be visible in ELinks as well (but ELinks document color handling\n" ++ "will still assume the background is black so if you have a bright background\n" ++ "you might experience contrast problems. Note that this option makes\n" + "sense only when colors are enabled.")), + + INIT_OPT_BOOL("terminal._template_", N_("Underline"), --- elinks-0.11.3.orig/debian/elinks.config +++ elinks-0.11.3/debian/elinks.config @@ -0,0 +1,17 @@ +## ELinks configuration file +## See elinks.conf(5) and the output of "elinks -config-dump" for a list +## of all the supported options, their possible values and the defaults. + + ## protocol.http.user_agent + # Change the User Agent ID. That means identification string, which + # is sent to HTTP server when a document is requested. The 'textmode' + # token in the first field is our silent attempt to establish this as + # a standard for new textmode user agents, so that the webmasters can + # have just a single uniform test for these if they are ie. pushing + # some lite version to them automagically. + # %v in the string means ELinks version + # %s in the string means system identification + # %t in the string means size of the terminal + # %b in the string means number of bars displayed by ELinks + # Use " " if you don't want any User-Agent header to be sent at all. + set protocol.http.user_agent = "ELinks/%v (textmode; Debian; %s; %t-%b)"