diff options
| author | Michael Vogt <mvo@ubuntu.com> | 2014-10-08 10:47:09 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@ubuntu.com> | 2014-10-08 10:47:09 +0200 |
| commit | 2e8e5aaca4e51737e5a3a56c140d6817251bf0f7 (patch) | |
| tree | 1b1224e9b55d4e7f0002feeba51711912d8fb314 /debian | |
| parent | d667daf3e6ba5bfc7feb8a5ed0a0bd2d1febde4d (diff) | |
| parent | 536fdb8823fdec24c26d984317b8162237c427c3 (diff) | |
Merge branch 'debian/sid' into ubuntu/master
Conflicts:
configure.ac
debian/changelog
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 34 | ||||
| -rwxr-xr-x | debian/rules | 9 |
2 files changed, 40 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index 7c4b4d31c..0a7da59c8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,37 @@ +apt (1.0.9.2ubuntu1) utopic; urgency=low + + * merge fixes from debian/sid, most importantly CVE-2014-7206 + + -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 08 Oct 2014 10:45:34 +0200 + +apt (1.0.9.2) unstable; urgency=medium + + [ Michael Vogt ] + * test/integration/test-apt-update-file: improve test + * Fix regression when copy: is used for a relative path (Closes: #762160) + * generalize Acquire::GzipIndex to support all compressions that + apt supports + * Fix regression for cdrom: sources from latest security update + * Ensure that iTFRewritePackageOrder is "MD5sum" to match + apt-ftparchive + * debian/rules: add hardening=+all. + Thanks to Simon Ruderich, Markus Waldeck + + [ Holger Wansing ] + * German program translation update (Closes: 762223) + + [ Jérémy Bobbio ] + * disable timestamps in the footer of docs by doxygen + + [ Trần Ngọc Quân ] + * Set STRIP_FROM_PATH for doxygen + + [ Guillem Jover ] + * apt-get: Create the temporary downloaded changelog inside tmpdir + (closes: #763780) + + -- Michael Vogt <mvo@debian.org> Thu, 02 Oct 2014 22:05:39 +0200 + apt (1.0.9.1ubuntu1) utopic; urgency=medium * merge fixes from debian/sid diff --git a/debian/rules b/debian/rules index 085224b15..b2583b1ee 100755 --- a/debian/rules +++ b/debian/rules @@ -21,9 +21,12 @@ endif -include build/environment.mak ifneq (,$(shell which dpkg-buildflags)) - export CXXFLAGS = $(shell dpkg-buildflags --get CXXFLAGS) - export LDFLAGS = $(shell dpkg-buildflags --get LDFLAGS) - export CPPFLAGS = $(shell dpkg-buildflags --get CPPFLAGS) + # make does not export to $(shell) so we need to workaround + # (http://savannah.gnu.org/bugs/?10593) + dpkg_buildflags = DEB_BUILD_MAINT_OPTIONS=hardening=+all dpkg-buildflags + export CXXFLAGS = $(shell $(dpkg_buildflags) --get CXXFLAGS) + export LDFLAGS = $(shell $(dpkg_buildflags) --get LDFLAGS) + export CPPFLAGS = $(shell $(dpkg_buildflags) --get CPPFLAGS) else ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) export CXXFLAGS = -O0 -g -Wall |