[Pkg-privacy-commits] [Git][pkg-privacy-team/torbrowser-launcher][debian/sid] 3 commits: Do not ship local apparmor profile as conffile

[Roger Shimizu]

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


Commits:
a0aead1b by Roger Shimizu at 2020-01-08T00:51:58+09:00
Do not ship local apparmor profile as conffile

* debian/rules:
  - Remove override_dh_auto_test, it seems fine without it.
  - Add override_dh_auto_install, to exclude local apparmor profile
    from shipping as conffile nor normal file.
* debian/preinst:
  - Create dummy local apparmor profile if it's nonexisting.

Closes: #934119

- - - - -
bb599c04 by Roger Shimizu at 2020-01-08T00:57:39+09:00
d/preinst: Update the commit SHA-1

- - - - -
9ca54226 by Roger Shimizu at 2020-01-20T01:06:01+09:00
Prepare to release 0.3.2-6

- - - - -


4 changed files:

- debian/changelog
- debian/control
- debian/preinst
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,18 @@
+torbrowser-launcher (0.3.2-6) unstable; urgency=medium
+
+  * debian/rules:
+    - Remove override_dh_auto_test, it seems fine without it.
+    - Add override_dh_auto_install, to exclude local apparmor profile
+      from shipping as conffile nor normal file.
+  * debian/preinst:
+    - Create dummy local apparmor profile if it's nonexisting.
+      (Closes: #934119).
+    - Update the commit SHA-1.
+  * debian/control:
+    - Add a few Depends to Build-Depends to pass dh_auto_test.
+
+ -- Roger Shimizu <rosh at debian.org>  Mon, 20 Jan 2020 01:06:01 +0900
+
 torbrowser-launcher (0.3.2-5) unstable; urgency=medium
 
   * debian/maintscript:


=====================================
debian/control
=====================================
@@ -10,7 +10,10 @@ Build-Depends:
  help2man,
  lsb-release,
  python3-all,
- python3-distro
+ python3-distro,
+ python3-gpg,
+ python3-pyqt5,
+ python3-requests
 Standards-Version: 3.9.8
 Rules-Requires-Root: no
 Homepage: https://micahflee.com/torbrowser-launcher/
@@ -24,8 +27,8 @@ Depends:
  ${python3:Depends},
  ca-certificates,
  libdbus-glib-1-2,
- python3-pyqt5,
  python3-gpg,
+ python3-pyqt5,
  python3-requests,
  python3-socks
 Recommends: tor


=====================================
debian/preinst
=====================================
@@ -4,21 +4,27 @@ 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
+[ "$1" = install -o "$1" = upgrade ] &&
+	for PROFILE in torbrowser.Browser.firefox torbrowser.Tor.tor ; do
 	profile=/etc/apparmor.d/local/$PROFILE
-	# commit [91652b6]:
+	# commit [064ad1f]:
 	#	db8bcb0d87df8a9727707615ac3651c4  torbrowser.Browser.firefox
 	#	6862d1564692f7e61a55e2888d671dff  torbrowser.Tor.tor
-	# commit [064ad1f]:
+	# commit [06eea27]:
 	#	f211f31857d84b30b7d2bf5b4106dde3  torbrowser.Browser.firefox
-	[ -f "$profile" ] &&
+	if [ -f "$profile" ]; then
 		case $(md5sum "$profile"| sed -e 's/ .*//') in
 			"db8bcb0d87df8a9727707615ac3651c4" |\
 			"6862d1564692f7e61a55e2888d671dff" |\
 			"f211f31857d84b30b7d2bf5b4106dde3" )
 				rm -f "$profile"
+				touch $profile
 				;;
 		esac
+	else
+		mkdir -p /etc/apparmor.d/local
+		touch $profile
+	fi
 done
 
 #DEBHELPER#


=====================================
debian/rules
=====================================
@@ -5,6 +5,10 @@ include /usr/share/dpkg/pkg-info.mk
 %:
 	dh $@ --with python3 --buildsystem=pybuild
 
+override_dh_auto_install:
+	dh_auto_install
+	rm -r debian/*/etc/apparmor.d/local
+
 override_dh_install:
 	for PROFILE in torbrowser.Tor.tor torbrowser.Browser.firefox ; do \
 		dh_apparmor --profile-name=$$PROFILE -ptorbrowser-launcher ; \
@@ -16,6 +20,3 @@ override_dh_install:
 override_dh_clean:
 	rm -rf build share/locale
 	dh_clean
-
-override_dh_auto_test:
-	@echo skip the test



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

-- 
View it on GitLab: https://salsa.debian.org/pkg-privacy-team/torbrowser-launcher/compare/240db263946977388bc4376b9e4765aba4655854...9ca542261884b4074af6907b5613f1a01e5112a5
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/20200124/2b619315/attachment-0001.html>