tags -1 - moreinfo
On Mon, 17 May 2021, Sebastian Ramacher wrote:
> On 2021-05-17 06:53:02 +0000, Peter Palfrader wrote:
> > Package: release.debian.org
> > Severity: normal
> > User: release.debian....@packages.debian.org
> > Usertags: unblock
> >
> > I would like to update Tor in bullseye from 0.4.5.7-1 to 0.4.5.8-1.
> > Tor 0.4.5.8 is an upstream stable release.
>
> ACK, please remove the moreinfo tag once the new version is available in
> unstable.
Thanks!
The package has been uploaded to unstable, accepted, built, and installed.
For reference, here is the interdiff between the .diff.gz files.
diffstat:
changelog | 6 +++++
micro-revision.i | 2 -
misc/build-tor-sources | 57 -------------------------------------------------
3 files changed, 7 insertions(+), 58 deletions(-)
Note that debian/misc/build-tor-sources is only used locally in
preparing the source package; it is not used when building the Debian
binary packages from the Debian source.
Cheers,
weasel
diff -u tor-0.4.5.7/debian/changelog tor-0.4.5.8/debian/changelog
--- tor-0.4.5.7/debian/changelog
+++ tor-0.4.5.8/debian/changelog
@@ -1,3 +1,9 @@
+tor (0.4.5.8-1) unstable; urgency=medium
+
+ * New upstream version.
+
+ -- Peter Palfrader <wea...@debian.org> Wed, 19 May 2021 08:51:43 +0200
+
tor (0.4.5.7-1) unstable; urgency=high
* New upstream version, fixes two security issues:
diff -u tor-0.4.5.7/debian/micro-revision.i tor-0.4.5.8/debian/micro-revision.i
--- tor-0.4.5.7/debian/micro-revision.i
+++ tor-0.4.5.8/debian/micro-revision.i
@@ -1 +1 @@
-"db2cbdb54bf4485d"
+"e0a924350405684c"
diff -u tor-0.4.5.7/debian/misc/build-tor-sources
tor-0.4.5.8/debian/misc/build-tor-sources
--- tor-0.4.5.7/debian/misc/build-tor-sources
+++ tor-0.4.5.8/debian/misc/build-tor-sources
@@ -101,13 +101,6 @@
fi
}
-remove_libzstd() {
- if grep -q libzstd-dev debian/control; then
- sed -i -e '/^Build-Depends/ s/, *libzstd-dev\(
*\[[^]]*\]\)\?//' debian/control
- dch --append "Remove libzstd-dev build dependency for backport."
- fi
-}
-
remove_runit() {
if grep -q dh-runit debian/control; then
sed -i -e '/^Build-Depends/ s/, *dh-runit\([^,]*\)\?//'
debian/control
@@ -121,47 +114,6 @@
sed -i -e '/^Build-Depends/ s/debhelper [^,]*, */debhelper (>=
9.20160114), dh-systemd [linux-any], /' debian/control
}
-old_debug_pkg() {
- # do not mess with debian/control for 0.2.x. packages that
already/still have a tor-dbg defined there.
- grep -x 'Package: tor-dbg' debian/control && return
-
- patch debian/rules << EOF
-diff --git a/debian/rules b/debian/rules
-index 6950e6d3c..af002ae52 100755
---- a/debian/rules
-+++ b/debian/rules
-@@ -70,7 +70,10 @@ override_dh_install-arch:
- cp debian/tor.apparmor-profile.abstraction
debian/tor/etc/apparmor.d/abstractions/tor
- dh_apparmor --profile-name=system_tor -ptor
-
-+override_dh_installdocs:
-+ dh_installdocs -ptor-dbg --link-doc=tor
-+ dh_installdocs
- override_dh_strip:
-- dh_strip --dbgsym-migration='tor-dbg (<< 0.3.1.5-alpha)'
-+ dh_strip --dbg-package=tor-dbg
- override_dh_installinit:
- dh_installinit --error-handler=tor_error_init
-EOF
- cat >> debian/control << 'EOF'
-
-Package: tor-dbg
-Architecture: any
-Depends: tor (= ${binary:Version}), ${misc:Depends}
-Suggests: gdb
-Priority: extra
-Section: debug
-Description: debugging symbols for Tor
- This package provides the debugging symbols for Tor, The Onion Router.
- Those symbols allow your debugger to assign names to your backtraces, which
- makes it somewhat easier to interpret core dumps.
-EOF
-
- dch --append "Restore building of tor-dbg."
- sed -i -e '/^Build-Depends/ s/debhelper [^,]*, */debhelper (>= 9), /'
debian/control
- dch --append "Downgrade debhelper build dependency to just >= 9."
-}
-
bp1() {
@@ -194,15 +146,6 @@
#################################################
# null
- # jessie
- #################################################
- bp1 $pkg $dir $sid_debian_version jessie
- (cd $dir; remove_libzstd)
- (cd $dir; old_dh_systemd)
- (cd $dir; old_debug_pkg)
- (cd $dir; remove_runit)
- bp2 $pkg $dir $origtar
-
# stretch
#################################################
bp1 $pkg $dir $sid_debian_version stretch
--
| .''`. ** Debian **
Peter Palfrader | : :' : The universal
https://www.palfrader.org/ | `. `' Operating System
| `- https://www.debian.org/
