From: Michael Vogt Date: Tue, 19 Dec 2006 15:21:35 +0000 (+0100) Subject: * merged the apt--curl-https branch X-Git-Tag: 0.7.24ubuntu1~209 X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/860ff9593b6d706136518693b2a82db6b769e17e?ds=inline;hp=-c * merged the apt--curl-https branch --- 860ff9593b6d706136518693b2a82db6b769e17e diff --combined debian/control index dfcebf41e,405c0bf93..8a2df1c7b --- a/debian/control +++ b/debian/control @@@ -4,7 -4,7 +4,7 @@@ Priority: importan Maintainer: APT Development Team Uploaders: Jason Gunthorpe , Adam Heath , Matt Zimmerman , Michael Vogt Standards-Version: 3.6.2.2 - Build-Depends: debhelper (>= 5.0), libdb4.4-dev, gettext (>= 0.12) + Build-Depends: debhelper (>= 5.0), libdb4.4-dev, gettext (>= 0.12), libcurl3-gnutls-dev Build-Depends-Indep: debiandoc-sgml, docbook-utils (>= 0.6.12-1) Package: apt @@@ -13,7 -13,7 +13,7 @@@ Depends: ${shlibs:Depends Priority: important Replaces: libapt-pkg-doc (<< 0.3.7), libapt-pkg-dev (<< 0.3.7) Provides: ${libapt-pkg:provides} -Recommends: debian-archive-keyring +Recommends: ubuntu-keyring Suggests: aptitude | synaptic | gnome-apt | wajig, dpkg-dev, apt-doc, bzip2, gnupg Section: admin Description: Advanced front-end for dpkg @@@ -65,3 -65,12 +65,12 @@@ Description: APT utility program apt-extracttemplates is used by debconf to prompt for configuration questions before installation. apt-ftparchive is used to create Package and other index files. apt-sortpkgs is a Package/Source file normalizer. + + Package: apt-transport-https + Architecture: any + Depends: ${shlibs:Depends} + Priority: optional + Section: admin + Description: APT https transport + This package contains a APT https transport. It makes it possible to + use 'deb https://foo distro main' lines in the sources.list. diff --combined debian/rules index 1d405779a,0208d8ea3..b22b09fd1 --- a/debian/rules +++ b/debian/rules @@@ -185,7 -185,7 +185,7 @@@ apt-doc: build-do # Build architecture-dependent files here. - binary-arch: apt libapt-pkg-dev apt-utils + binary-arch: apt-transport-https apt libapt-pkg-dev apt-utils apt: build debian/shlibs.local dh_testdir -p$@ dh_testroot -p$@ @@@ -210,15 -210,10 +210,15 @@@ cp debian/bugscript debian/$@/usr/share/bug/apt/script - cp share/debian-archive.gpg debian/$@/usr/share/$@ - + cp share/ubuntu-archive.gpg debian/$@/usr/share/$@ + cp debian/apt.conf.ubuntu debian/$@/etc/apt/apt.conf.d/01ubuntu # head -n 500 ChangeLog > debian/ChangeLog + # make rosetta happy and remove pot files in po/ (but leave stuff + # in po/domains/* untouched) and cp *.po into each domain dir + rm -f build/po/*.pot + rm -f po/*.pot + dh_installexamples -p$@ $(BLD)/docs/examples/* dh_installman -p$@ dh_installcron -p$@ @@@ -291,6 -286,32 +291,32 @@@ apt-utils: build debian/shlibs.loca dh_md5sums -p$@ dh_builddeb -p$@ + apt-transport-https: build debian/shlibs.local + dh_testdir -p$@ + dh_testroot -p$@ + dh_clean -p$@ -k + dh_installdirs -p$@ + + # install the method + mkdir -p debian/$@/usr/lib/apt/methods + mv $(BLD)/bin/methods/https debian/$@/usr/lib/apt/methods + + dh_installdocs -p$@ + dh_installexamples -p$@ + + # Install the man pages.. + dh_installman -p$@ + + dh_installchangelogs -p$@ + dh_strip -p$@ + dh_compress -p$@ + dh_fixperms -p$@ + dh_installdeb -p$@ + dh_shlibdeps -p$@ -l`pwd`/debian/apt/usr/lib:`pwd`/debian/$@/usr/lib + dh_gencontrol -p$@ + dh_md5sums -p$@ + dh_builddeb -p$@ + source diff: @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false @@@ -343,4 -364,4 +369,4 @@@ arch-build mkdir -p debian/arch-build/apt-$(APT_DEBVER) tar -c --exclude=arch-build --no-recursion -f - `bzr inventory` | (cd debian/arch-build/$(PKG)-$(APT_DEBVER);tar xf -) $(MAKE) -C debian/arch-build/apt-$(APT_DEBVER) startup doc - (cd debian/arch-build/apt-$(APT_DEBVER); $(DEB_BUILD_PROG)) + (cd debian/arch-build/apt-$(APT_DEBVER); $(DEB_BUILD_PROG); dpkg-genchanges -S > ../apt_$(APT_DEBVER)_source.changes) diff --combined doc/examples/configure-index index 55edd77e5,dad8b691c..26d9354fe --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@@ -24,15 -24,11 +24,15 @@@ AP { Architecture "i386"; Build-Essential "build-essential"; - + + NeverAutoRemove { "linux-kernel.*"; }; // packages that should never + // considered for autoRemove + // Options for apt-get Get { Arch-Only "false"; + AutomaticRemove "false"; Download-Only "false"; Simulate "false"; Assume-Yes "false"; @@@ -94,10 -90,6 +94,10 @@@ Cache-Limit "4194304"; Default-Release ""; + // consider Recommends, Suggests as important dependencies that should + // be installed by default + APT::Install-Recommends "false"; + APT::Install-Suggests "false"; // Write progress messages on this fd (for stuff like base-config) Status-Fd "-1"; @@@ -128,6 -120,18 +128,18 @@@ Acquir Dl-Limit "7"; // 7Kb/sec maximum download rate }; + // HTTPS method configuration: + // - uses the http proxy config + // - uses the http cache-control values + // - uses the http Dl-Limit values + https + { + Verify-Peer "false"; + SslCert "/etc/apt/some.pem"; + CaPath "/etc/ssl/certs"; + Verify-Host" "2"; + }; + ftp { Proxy "ftp://127.0.0.1/"; @@@ -263,12 -267,13 +275,13 @@@ Debu pkgDPkgPM "false"; pkgDPkgProgressReporting "false"; pkgOrderList "false"; + pkgAutoRemove "false"; // show information about automatic removes BuildDeps "false"; - pkgInitialize "false"; // This one will dump the configuration space NoLocking "false"; Acquire::Ftp "false"; // Show ftp command traffic Acquire::Http "false"; // Show http command traffic + Acquire::Https "false"; // Show https debug Acquire::gpgv "false"; // Show the gpgv traffic aptcdrom "false"; // Show found package files IdentCdrom "false"; diff --combined methods/makefile index 2e3abe55c,e3db7210a..197ddf9ed --- a/methods/makefile +++ b/methods/makefile @@@ -7,7 -7,7 +7,7 @@@ include ../buildlib/defaults.ma BIN := $(BIN)/methods # FIXME.. -LIB_APT_PKG_MAJOR = 3.11 +LIB_APT_PKG_MAJOR = 3.51 APT_DOMAIN := libapt-pkg$(LIB_APT_PKG_MAJOR) # The file method @@@ -52,6 -52,13 +52,13 @@@ LIB_MAKES = apt-pkg/makefil SOURCE = http.cc rfc2553emu.cc connect.cc include $(PROGRAM_H) + # The https method + PROGRAM=https + SLIBS = -lapt-pkg -lcurl + LIB_MAKES = apt-pkg/makefile + SOURCE = https.cc + include $(PROGRAM_H) + # The ftp method PROGRAM=ftp SLIBS = -lapt-pkg $(SOCKETLIBS)