Re: [ptxdist] [PATCH v3 1/3] polkit: add debian patches

["m.olbrich@pengutronix.de" <m.olbrich@pengutronix.de>]

[-- Attachment #1: Type: text/plain, Size: 1100 bytes --]

Hi,

On Wed, Jan 16, 2019 at 09:36:22AM +0000, Baeuerle, Florian wrote:
> is there a chance to get these patches into ptxdist? I think this fixes quite a
> few bugs.
> 
> Any rework required?

I've been doing some rework myself. The situation is unlikely to change in
the near future, so I expect we will need to import new patches again at
some point. So I want to automate this a bit.
I'm doing the same thing with openssl so I just copied and modified the
script I use there (see attachment). I'm doing some build tests with this
right now. This should hit master sometime this week.

My patch selection is a bit different from yours, so I'd appreciate some
feedback there. I'm currently importing from
policykit-1_0.105-25.debian.tar.xz, that the latest version in Debian
unstable.

Michael

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

[-- Attachment #2: polkit-apply-debian --]
[-- Type: text/plain, Size: 1241 bytes --]

#!/bin/bash

set -e
set -x

blacklist="
0.113/README-Note-to-send-security-reports-via-DBus-s-mech.patch
0.114/Add-gettext-support-for-.policy-files.patch
0.114/gettext-switch-to-default-translate-no.patch
0.116/tests-add-tests-for-high-uids.patch
01_pam_polkit.patch
02_gettext.patch
06_systemd-service.patch
"

start="$(pwd)"
src="$(pwd)/$1"
deb="$(pwd)/$2"

tmp="$(mktemp -d)"

cd "$tmp"

tar xf "$src"
policykit="$(ls -d polkit-*)"

tar xf "$deb"
patches=debian/patches
for patch in $blacklist; do
	sed -i "s;\(${patch}\);#\1;" ${patches}/series
done

for dir in $(find debian/patches/ -mindepth 1 -maxdepth 1 -type d -printf "%P\n"); do
	sed -i "s;Subject:;Subject: ${dir}:;" "debian/patches/${dir}/"*
done

cd "$policykit"
git init
git add *
git commit -m "base"
git tag base

git quiltimport --patches=../$patches/ --author "Michael Olbrich <m.olbrich@pengutronix.de>"
git filter-branch --msg-filter "cat | grep -v '^==*$' && echo '\nImported from $(basename $deb)\n\nSigned-off-by: Michael Olbrich <m.olbrich@pengutronix.de>'" base...master

git format-patch --no-signature -N base
mkdir "$start/$policykit"
mv 0*.patch "$start/$policykit/"
cd "$start"
rm -rf "$tmp"

cd "$start/$policykit/"
sed -i 1d 0*.patch
ls 0*.patch > series


[-- Attachment #3: Type: text/plain, Size: 91 bytes --]

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de