On Fri, 20 Nov 2020, Adam D. Barratt wrote:

> Control: tags -1 + confirmed
> 
> Hi,
> 
> On Fri, 2020-11-20 at 07:43 +0000, Peter Palfrader wrote:
> > Stable currently has Tor 0.3.5.10.
> > 
> > Upstream released 0.3.5.11 and 0.3.5.12 since, which bring some
> > security fixes, update the list of fallback directory servers, and a
> > few things more.
> > 
> > See 
> > https://gitweb.torproject.org/tor.git/tree/ChangeLog?h=tor-0.3.5.12
> > for a full list.
> > 
> > I would like to build and upload packages for tor 3.5.12.
> 
> Based on previous updates, I'd be happy with that, but please attach a
> debdiff to this bug log once it's built / uploaded, for completeness.

} iweasel@orinoco:~/projects/debian/debian/tor/0.3.5.X/0.3.5.12-1$ debdiff 
../0.3.5.10-1/tor_0.3.5.10-1_source.changes tor_0.3.5.12-1_source.changes
} File lists identical (after any substitutions)


} weasel@orinoco:~/projects/debian/debian/tor/0.3.5.X/0.3.5.12-1$ debdiff 
../0.3.5.10-1/tor_0.3.5.10-1_amd64.changes tor_0.3.5.12-1_amd64.changes
} [The following lists of changes regard files as different if they have
} different names, permissions or owners.]
}
} Files in second .changes but not in first
} -----------------------------------------
} -rw-r--r--  root/root   
/usr/lib/debug/.build-id/18/bd700da967b9476719cb90673f0f4583c8a6a7.debug
} -rw-r--r--  root/root   
/usr/lib/debug/.build-id/45/2e6cbd2fb513558a8cd34c7c4f3976187558de.debug
} -rw-r--r--  root/root   
/usr/lib/debug/.build-id/e0/7c60e61bff7a6889d4ec421b7bed8cf26d0791.debug
} -rw-r--r--  root/root   
/usr/lib/debug/.build-id/ea/4bdaf3cfd226cd4d215276517548b9f34ba5b9.debug
}
} Files in first .changes but not in second
} -----------------------------------------
} -rw-r--r--  root/root   
/usr/lib/debug/.build-id/02/7122fe11c07cce9682d43c677dc1e072b35e5a.debug
} -rw-r--r--  root/root   
/usr/lib/debug/.build-id/0b/6fdffb0e845324489080a83d64f683c156d2ac.debug
} -rw-r--r--  root/root   
/usr/lib/debug/.build-id/a1/ece546e7fe6bd69b13ed10faaee7ab7067144d.debug
} -rw-r--r--  root/root   
/usr/lib/debug/.build-id/cb/fd02ab0ee4b42164806ad4c3176679cc7077d3.debug
}
} Control files of package tor: lines which differ (wdiff format)
} ---------------------------------------------------------------
} Installed-Size: [-5071-] {+5074+}
} Version: [-0.3.5.10-1-] {+0.3.5.12-1+}
}
} Control files of package tor-dbgsym: lines which differ (wdiff format)
} ----------------------------------------------------------------------
} Build-Ids: [-027122fe11c07cce9682d43c677dc1e072b35e5a 
0b6fdffb0e845324489080a83d64f683c156d2ac 
a1ece546e7fe6bd69b13ed10faaee7ab7067144d 
cbfd02ab0ee4b42164806ad4c3176679cc7077d3-] 
{+18bd700da967b9476719cb90673f0f4583c8a6a7 
452e6cbd2fb513558a8cd34c7c4f3976187558de 
e07c60e61bff7a6889d4ec421b7bed8cf26d0791 
ea4bdaf3cfd226cd4d215276517548b9f34ba5b9+}
} Depends: tor (= [-0.3.5.10-1)-] {+0.3.5.12-1)+}
} Installed-Size: [-5367-] {+5368+}
} Version: [-0.3.5.10-1-] {+0.3.5.12-1+}
}
} Control files of package tor-geoipdb: lines which differ (wdiff format)
} -----------------------------------------------------------------------
} Depends: tor (>= [-0.3.5.10-1)-] {+0.3.5.12-1)+}
} Installed-Size: [-8358-] {+8361+}
} Version: [-0.3.5.10-1-] {+0.3.5.12-1+}

(I'll only upload the source one)

Source diffs attached.

Cheers,
-- 
                            |  .''`.       ** Debian **
      Peter Palfrader       | : :' :      The  universal
 https://www.palfrader.org/ | `. `'      Operating System
                            |   `-    https://www.debian.org/
diff -u tor-0.3.5.10/debian/changelog tor-0.3.5.12/debian/changelog
--- tor-0.3.5.10/debian/changelog
+++ tor-0.3.5.12/debian/changelog
@@ -1,3 +1,9 @@
+tor (0.3.5.12-1) buster; urgency=medium
+
+  * New upstream version, updating Tor in stable (cf. #975297).
+
+ -- Peter Palfrader <wea...@debian.org>  Wed, 25 Nov 2020 08:44:12 +0100
+
 tor (0.3.5.10-1) buster-security; urgency=medium
 
   * New upstream version.
diff -u tor-0.3.5.10/debian/micro-revision.i tor-0.3.5.12/debian/micro-revision.i
--- tor-0.3.5.10/debian/micro-revision.i
+++ tor-0.3.5.12/debian/micro-revision.i
@@ -1 +1 @@
-"48bd3fbaa3edb9b0"
+"d02a75ee30269081"
diff -u tor-0.3.5.10/debian/misc/backport tor-0.3.5.12/debian/misc/backport
--- tor-0.3.5.10/debian/misc/backport
+++ tor-0.3.5.12/debian/misc/backport
@@ -77,6 +77,7 @@
 disco		disco		1
 eoan		eoan		1
 focal		focal		1
+groovy		groovy		1
 EOF
 )
 	if [ -z "$result" ] ; then
diff -u tor-0.3.5.10/debian/misc/build-tor-sources tor-0.3.5.12/debian/misc/build-tor-sources
--- tor-0.3.5.10/debian/misc/build-tor-sources
+++ tor-0.3.5.12/debian/misc/build-tor-sources
@@ -221,6 +221,11 @@
 	bp1 $pkg $dir $sid_debian_version focal
 	bp2 $pkg $dir $origtar
 
+	# groovy (EOL: 2021-07)
+	#################################################
+	bp1 $pkg $dir $sid_debian_version groovy
+	bp2 $pkg $dir $origtar
+
 	#################################################
 	## BPO
 	#################################################

Attachment: upstream.diff.xz
Description: application/xz

Reply via email to