Source: libjpeg-turbo
Severity: normal
Tags: patch

The following two patches re-enable "Rules-Requires-Root: no"

The only thing needed was to remove the user and group arguments passed
to the install target in debian/extra/Makefile.


live well,
  vagrant
From afcd53fb510a81cb700d139706521d85f94c8c8f Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian <[email protected]>
Date: Fri, 1 Jan 2021 19:49:36 +0000
Subject: [PATCH 1/3] debian/extra/Makefile: Do not pass user and group to
 install command.

This allows setting "Root-Requires-Root: no" in debian/control.
---
 debian/extra/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/extra/Makefile b/debian/extra/Makefile
index fb036cd..0c31dfe 100644
--- a/debian/extra/Makefile
+++ b/debian/extra/Makefile
@@ -1,5 +1,5 @@
-INSTALL = install -m755 -o root -g root
-INSTALLDIR = install -m755 -o root -g root -d
+INSTALL = install -m755
+INSTALLDIR = install -m755 -d
 DESTDIR =
 prefix  = /usr/local
 bindir  = $(prefix)/bin
-- 
2.20.1

From 87f957eeaba950ffa5af825b52b75ee0aeba3c78 Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian <[email protected]>
Date: Fri, 1 Jan 2021 20:01:41 +0000
Subject: [PATCH 2/3] Revert "Remove non-working Rules-Requires-Root"

This reverts commit ac933a1b8f4b0a8d74626e2848d57dff4a5b24f6.
---
 debian/control | 1 +
 1 file changed, 1 insertion(+)

diff --git a/debian/control b/debian/control
index 2602243..5818035 100644
--- a/debian/control
+++ b/debian/control
@@ -7,6 +7,7 @@ Build-Depends: cmake (>= 2.8.12),
                debhelper-compat (= 13),
 	       nasm
 Standards-Version: 4.5.0
+Rules-Requires-Root: no
 Homepage: https://www.libjpeg-turbo.org/
 Vcs-Git: https://salsa.debian.org/debian/libjpeg-turbo.git
 Vcs-Browser: https://salsa.debian.org/debian/libjpeg-turbo/
-- 
2.20.1

Attachment: signature.asc
Description: PGP signature

Reply via email to