Ubuntu Pastebin

Paste from adconrad at Tue, 4 Apr 2017 09:08:15 +0000

Download as text
 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
diff -Nru newpid-7/debian/changelog newpid-7ubuntu1/debian/changelog
--- newpid-7/debian/changelog	2015-12-23 03:33:14.000000000 -0700
+++ newpid-7ubuntu1/debian/changelog	2017-04-04 03:05:19.000000000 -0600
@@ -1,3 +1,10 @@
+newpid (7ubuntu1) zesty; urgency=medium
+
+  * If setcap fails (because the filesystem or namespace lacks support for
+    capabilities), fall back to setuid, so the installation doesn't fail.
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Tue, 04 Apr 2017 03:05:19 -0600
+
 newpid (7) unstable; urgency=medium
 
   * Add support for joining network namespaces (newpid -N).
diff -Nru newpid-7/debian/control newpid-7ubuntu1/debian/control
--- newpid-7/debian/control	2015-09-30 08:20:10.000000000 -0600
+++ newpid-7ubuntu1/debian/control	2017-04-04 03:05:19.000000000 -0600
@@ -1,7 +1,8 @@
 Source: newpid
 Section: utils
 Priority: optional
-Maintainer: Christoph Berg <myon@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Christoph Berg <myon@debian.org>
 Standards-Version: 3.9.6
 Build-Depends: debhelper (>= 9~)
 Vcs-Browser: https://github.com/ChristophBerg/newpid
diff -Nru newpid-7/debian/newpid.postinst newpid-7ubuntu1/debian/newpid.postinst
--- newpid-7/debian/newpid.postinst	2015-09-30 08:29:52.000000000 -0600
+++ newpid-7ubuntu1/debian/newpid.postinst	2017-04-04 03:05:16.000000000 -0600
@@ -4,7 +4,13 @@
 
 case $1 in
 	configure)
-		setcap "CAP_SYS_ADMIN,CAP_NET_ADMIN=pe" /usr/bin/newpid
+		# Code cargo-culted from iputils-ping postinst:
+		if setcap "CAP_SYS_ADMIN,CAP_NET_ADMIN=pe" /usr/bin/newpid; then
+			chmod u-s /usr/bin/newpid
+		else
+			echo "Setcap failed on /usr/bin/newpid, falling back to setuid" >&2
+			chmod u+s /usr/bin/newpid
+		fi
 		;;
 esac
 
Download as text