Bug#827950: wget udeb https support inclusion in Jessie
Package: wget
Version: 1.16.1
Severity: normal
Tags: patch
X-Debbugs-CC: debian-release@lists.debian.org
X-Debbugs-CC: debian-boot@lists.debian.org
Hi,
Marga Manterola provided a patch to build a wget udeb which supports
https that was included in Sid (#802596). Could this patch be a
candidate for Jessie inclusion? If so, you can find a patch attached to
this mail.
Regards
Yann Soubeyrand
diff -Nru wget-1.16/debian/changelog wget-1.16/debian/changelog
--- wget-1.16/debian/changelog 2014-10-27 11:41:18.000000000 +0100
+++ wget-1.16/debian/changelog 2016-06-22 17:21:46.000000000 +0200
@@ -1,3 +1,13 @@
+wget (1.16-1scibian1) jessie; urgency=medium
+
+ [ Margarita Manterola ]
+ * Add udeb support, taken from the work done by Colin Watson for Ubuntu
+ in 1.10.2-2ubuntu2 and forward.
+ * Added dependency on libssl-dev for the udeb, as gnutls does not provide
+ a udeb package.
+
+ -- Yann Soubeyrand <yann-externe.soubeyrand@edf.fr> Wed, 22 Jun 2016 17:21:22 +0200
+
wget (1.16-1) unstable; urgency=medium
* new upstream release from 2014-10-27
diff -Nru wget-1.16/debian/control wget-1.16/debian/control
--- wget-1.16/debian/control 2014-10-27 11:36:31.000000000 +0100
+++ wget-1.16/debian/control 2016-06-22 17:20:41.000000000 +0200
@@ -2,7 +2,7 @@
Section: web
Priority: important
Maintainer: Noël Köthe <noel@debian.org>
-Build-Depends: debhelper (>> 9.0.0), gettext, texinfo, libgnutls28-dev, autotools-dev, libidn11-dev, uuid-dev, libpsl-dev
+Build-Depends: debhelper (>> 9.0.0), gettext, texinfo, libgnutls28-dev, autotools-dev, libidn11-dev, uuid-dev, libpsl-dev, libssl-dev (>= 0.9.8k)
Standards-Version: 3.9.6
Homepage: http://www.gnu.org/software/wget/
@@ -32,3 +32,12 @@
Wget supports proxy servers; this can lighten the network load,
speed up retrieval, and provide access behind firewalls.
+Package: wget-udeb
+XC-Package-Type: udeb
+Architecture: any
+Section: debian-installer
+Priority: extra
+Depends: ${shlibs:Depends}
+Description: retrieves files from the web
+ This package provides wget.gnu binary as alternative to the limited
+ implementation in busybox (see for example ssl support).
diff -Nru wget-1.16/debian/rules wget-1.16/debian/rules
--- wget-1.16/debian/rules 2013-11-08 12:58:33.000000000 +0100
+++ wget-1.16/debian/rules 2016-06-22 17:08:44.000000000 +0200
@@ -16,11 +16,12 @@
include /usr/share/dpkg/buildflags.mk
CFLAGS += -DNO_SSLv2 -D_FILE_OFFSET_BITS=64 -g -Wall
-config.status:
+configure-stamp: configure-udeb-stamp
dh_testdir
cp /usr/share/misc/config.guess /usr/share/misc/config.sub .
+ mkdir -p build
# Add here commands to configure the package.
- CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" ./configure \
+ cd build && CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" ../configure \
--prefix=/usr \
--mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info \
@@ -31,27 +32,48 @@
touch configure-stamp
+configure-udeb-stamp:
+ dh_autotools-dev_updateconfig
+ mkdir -p build-udeb
+ cd build-udeb && CFLAGS="$(CFLAGS) -Os" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" ../configure \
+ --prefix=/usr \
+ --mandir=\$${prefix}/share/man \
+ --infodir=\$${prefix}/share/info \
+ --sysconfdir=/etc \
+ --enable-ipv6 \
+ --with-ssl=openssl \
+ --without-libpsl \
+ --disable-debug \
+ --disable-nls \
+ --disable-iri $(confflags)
+
+ touch configure-udeb-stamp
+
build: build-arch build-indep
-build-arch: build-stamp
+build-arch: build-stamp build-udeb-stamp
build-indep: build-stamp
-build-stamp: config.status
+build-stamp: configure-stamp
dh_testdir
# Add here commands to compile the package.
- $(MAKE)
+ cd build && $(MAKE)
#/usr/bin/docbook-to-man debian/wget.sgml > wget.1
cd po; make wget.pot
touch build-stamp
+build-udeb-stamp: configure-udeb-stamp
+ cd build-udeb && $(MAKE)
+ touch build-udeb-stamp
+
clean:
dh_testdir
dh_testroot
- rm -f build-stamp configure-stamp
+ rm -f build-stamp configure-stamp build-udeb-stamp configure-udeb-stamp
# Add here commands to clean up after the build process.
[ ! -f Makefile ] || $(MAKE) distclean
@@ -59,7 +81,7 @@
rm -f po/*.gmo po/wget.pot po/en@boldquot.po po/en@quot.po \
doc/wget.inf* doc/stamp-vti doc/version.texi \
doc/sample.wgetrc.munged_for_texi_inclusion
- rm -f config.guess config.sub
+ rm -rf config.sub config.guess build-udeb build
dh_prep
@@ -70,9 +92,12 @@
dh_installdirs
# Add here commands to install the package into debian/wget.
- $(MAKE) install DESTDIR=$(CURDIR)/debian/wget
+ cd build && $(MAKE) install DESTDIR=$(CURDIR)/debian/wget
rm -f $(CURDIR)/debian/wget/usr/share/info/dir
+ # udeb
+ mkdir -p debian/wget-udeb/usr/bin/
+ cp build-udeb/src/wget debian/wget-udeb/usr/bin/wget
# Build architecture-independent files here.
binary-indep: build install
Reply to: