From: Dietmar Maurer <dietmar@proxmox.com>
Date: Wed, 11 Sep 2013 08:06:30 +0000 (+0200)
Subject: Initial import
X-Git-Url: https://git.proxmox.com/?p=apt.git;a=commitdiff_plain;h=f2ee3e5ef5706a4ec2378f69fd9643588d4f2553

Initial import
---

f2ee3e5ef5706a4ec2378f69fd9643588d4f2553
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..60baffd
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,51 @@
+RELEASE=3.1
+
+APTVER=0.9.7.9
+
+# also update changelog
+APTVERPVE=0.9.7.10
+
+APTSRC=apt_${APTVER}.tar.gz
+APTDIR=apt-${APTVER}
+
+ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
+GITVERSION:=$(shell cat .git/refs/heads/master)
+SOURCETXT="git clone git://git.proxmox.com/git/apt.git\\ngit checkout ${GITVERSION}"
+
+DEB=apt-transport-https_${APTVERPVE}_${ARCH}.deb
+
+all: deb
+
+.PHONY: dinstall
+dinstall: deb
+	dpkg -i ${DEBS}
+
+.PHONY: download
+download:
+	rm -f ${APTSRC}
+	wget http://ftp.debian.org/debian/pool/main/a/apt/${APTSRC}
+
+.PHONY: deb
+deb ${DEB}: ${APTSRC}
+	rm -rf ${APTDIR}
+	tar xf ${APTSRC}
+	echo "${SOURCETXT}" > ${APTDIR}/debian/SOURCE
+	echo "debian/SOURCE" >>${APTDIR}/debian/apt-transport-https.docs
+	mv ${APTDIR}/debian/changelog ${APTDIR}/debian/changelog.org
+	cat changelog ${APTDIR}/debian/changelog.org >${APTDIR}/debian/changelog
+	cd ${APTDIR}; patch -p1 <../fix-https-proxy-auth.patch
+	cd ${APTDIR}; dpkg-buildpackage -b -uc -us
+
+.PHONY: upload
+upload:
+	umount /pve/${RELEASE}; mount /pve/${RELEASE} -o rw 
+	mkdir -p /pve/${RELEASE}/extra
+	rm -rf /pve/${RELEASE}/extra/apt-transport-https_*.deb
+	rm -rf /pve/${RELEASE}/extra/Packages*
+	cp ${DEB} /pve/${RELEASE}/extra
+	cd /pve/${RELEASE}/extra; dpkg-scanpackages . /dev/null > Packages; gzip -9c Packages > Packages.gz
+	umount /pve/${RELEASE}; mount /pve/${RELEASE} -o ro
+
+.PHONY: clean
+clean:
+	rm -rf *~ *_${ARCH}.deb *_all.deb *_${ARCH}.udeb *.changes *.dsc ${APTDIR}
diff --git a/README b/README
new file mode 100644
index 0000000..ccc2c91
--- /dev/null
+++ b/README
@@ -0,0 +1,6 @@
+We recompile apt-transport-https ourselfs to fix bug:
+
+http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=669620
+
+This is already fixed upstream in version 0.9.8, but there is
+no backport of that fix to existing debian wheezy packages.
diff --git a/apt_0.9.7.9.tar.gz b/apt_0.9.7.9.tar.gz
new file mode 100644
index 0000000..cc82f47
Binary files /dev/null and b/apt_0.9.7.9.tar.gz differ
diff --git a/changelog b/changelog
new file mode 100644
index 0000000..6b41257
--- /dev/null
+++ b/changelog
@@ -0,0 +1,7 @@
+apt (0.9.7.10) stable; urgency=low
+
+  * fix Bug#669620: apt-transport-https: proxy authentication credentials 
+    are ignored
+
+ -- Proxmox Support Team <support@proxmox.com>  Wed, 11 Sep 2013 10:25:48 +0200
+
diff --git a/fix-https-proxy-auth.patch b/fix-https-proxy-auth.patch
new file mode 100644
index 0000000..81b359a
--- /dev/null
+++ b/fix-https-proxy-auth.patch
@@ -0,0 +1,16 @@
+--- apt-0.8.10.3+squeeze1/methods/https.cc	2011-04-15 09:30:33.000000000 +0200
++++ -	2012-04-20 14:41:07.907097097 +0200
+@@ -86,10 +86,7 @@
+    // Determine what host and port to use based on the proxy settings
+    if (UseProxy.empty() == false) 
+    {
+-      Proxy = UseProxy;
+-      if (Proxy.Port != 1)
+-	 curl_easy_setopt(curl, CURLOPT_PROXYPORT, Proxy.Port);
+-      curl_easy_setopt(curl, CURLOPT_PROXY, Proxy.Host.c_str());
++     curl_easy_setopt(curl, CURLOPT_PROXY, UseProxy.c_str());
+    }
+ }									/*}}}*/
+ // HttpsMethod::Fetch - Fetch an item					/*{{{*/
+
+