[Pkg-privacy-commits] [Git][pkg-privacy-team/torbrowser-launcher][debian/sid] 5 commits: d/maintscript: Remove two rm_conffile lines

[Roger Shimizu]

Roger Shimizu pushed to branch debian/sid at Privacy Maintainers / torbrowser-launcher


Commits:
21b06ea8 by Roger Shimizu at 2020-01-05T22:10:48+09:00
d/maintscript: Remove two rm_conffile lines

- Move from torbrowser-launcher.maintscript to maintscript.
- The following files are still shipped by this package, so remove them
  from rm_conffile line:
    /etc/apparmor.d/local/torbrowser.Browser.firefox
    /etc/apparmor.d/local/torbrowser.Tor.tor

- - - - -
0b71b7d4 by Roger Shimizu at 2020-01-05T22:23:25+09:00
d/manpages: Move from torbrowser-launcher.manpages to manpages

- - - - -
1136ea4b by Roger Shimizu at 2020-01-05T22:51:19+09:00
d/rules: Remove copying apparmor profile

Apparmor profile copying is handled by setup.py

- - - - -
6b234fe6 by Roger Shimizu at 2020-01-05T22:59:29+09:00
d/preinst: Remove old apparmor profiles shipped not as conffile before

Below apparmor profiles is to be removed if the checksum matches, which
means without user modification:
  /etc/apparmor.d/local/torbrowser.Browser.firefox
  /etc/apparmor.d/local/torbrowser.Tor.tor

Closes: #934119

- - - - -
240db263 by Roger Shimizu at 2020-01-06T01:07:36+09:00
Prepare to release 0.3.2-5

- - - - -


5 changed files:

- debian/changelog
- debian/torbrowser-launcher.maintscript → debian/maintscript
- debian/torbrowser-launcher.manpages → debian/manpages
- + debian/preinst
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,24 @@
+torbrowser-launcher (0.3.2-5) unstable; urgency=medium
+
+  * debian/maintscript:
+    - Move from torbrowser-launcher.maintscript to maintscript.
+    - The following files are still shipped by this package, so removed them
+      from rm_conffile line:
+        /etc/apparmor.d/local/torbrowser.Browser.firefox
+        /etc/apparmor.d/local/torbrowser.Tor.tor
+  * debian/manpages:
+    - Move from torbrowser-launcher.manpages to manpages.
+  * debian/rules:
+    - Remove copying apparmor profile, since this is handled by setup.py.
+  * debian/preinst:
+    - Remove old apparmor profiles shipped not as conffile before, only
+      if the checksum matches, which means without user modification:
+        /etc/apparmor.d/local/torbrowser.Browser.firefox
+        /etc/apparmor.d/local/torbrowser.Tor.tor
+      (Closes: #934119)
+
+ -- Roger Shimizu <rosh at debian.org>  Mon, 06 Jan 2020 01:07:36 +0900
+
 torbrowser-launcher (0.3.2-4) unstable; urgency=medium
 
   * debian/tests:


=====================================
debian/torbrowser-launcher.maintscript → debian/maintscript
=====================================
@@ -1,6 +1,4 @@
 rm_conffile /etc/apparmor.d/torbrowser.start-tor-browser 0.2.8-5~ torbrowser-launcher
 rm_conffile /etc/apparmor.d/usr.bin.torbrowser-launcher 0.2.8-4~ torbrowser-launcher
-rm_conffile /etc/apparmor.d/local/torbrowser.Browser.firefox 0.2.9-5~ torbrowser-launcher
 rm_conffile /etc/apparmor.d/local/torbrowser.Browser.plugin-container 0.2.9-5~ torbrowser-launcher
-rm_conffile /etc/apparmor.d/local/torbrowser.Tor.tor 0.2.9-5~ torbrowser-launcher
 rm_conffile /etc/apparmor.d/torbrowser.Browser.plugin-container 0.3.2-1~ torbrowser-launcher


=====================================
debian/torbrowser-launcher.manpages → debian/manpages
=====================================


=====================================
debian/preinst
=====================================
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+set -e
+
+# Remove old apparmor profiles shipped not as conffile before, only
+# if the checksum matches, which means without user modification
+for PROFILE in torbrowser.Browser.firefox torbrowser.Tor.tor ; do
+	profile=/etc/apparmor.d/local/$PROFILE
+	# commit [91652b6]:
+	#	db8bcb0d87df8a9727707615ac3651c4  torbrowser.Browser.firefox
+	#	6862d1564692f7e61a55e2888d671dff  torbrowser.Tor.tor
+	# commit [064ad1f]:
+	#	f211f31857d84b30b7d2bf5b4106dde3  torbrowser.Browser.firefox
+	[ -f "$profile" ] &&
+		case $(md5sum "$profile"| sed -e 's/ .*//') in
+			"db8bcb0d87df8a9727707615ac3651c4" |\
+			"6862d1564692f7e61a55e2888d671dff" |\
+			"f211f31857d84b30b7d2bf5b4106dde3" )
+				rm -f "$profile"
+				;;
+		esac
+done
+
+#DEBHELPER#


=====================================
debian/rules
=====================================
@@ -7,7 +7,6 @@ include /usr/share/dpkg/pkg-info.mk
 
 override_dh_install:
 	for PROFILE in torbrowser.Tor.tor torbrowser.Browser.firefox ; do \
-		cp apparmor/$$PROFILE debian/torbrowser-launcher/etc/apparmor.d/ ; \
 		dh_apparmor --profile-name=$$PROFILE -ptorbrowser-launcher ; \
 	done
 	help2man -N -n "helps download and run the Tor Browser Bundle" \



View it on GitLab: https://salsa.debian.org/pkg-privacy-team/torbrowser-launcher/compare/04bd7e37498e6145c3f7e30c618d7b228ad9c182...240db263946977388bc4376b9e4765aba4655854

-- 
View it on GitLab: https://salsa.debian.org/pkg-privacy-team/torbrowser-launcher/compare/04bd7e37498e6145c3f7e30c618d7b228ad9c182...240db263946977388bc4376b9e4765aba4655854
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-privacy-commits/attachments/20200105/3237afe0/attachment-0001.html>