SHA256
1
0
forked from pool/rpmlint

Accepting request 295192 from devel:openSUSE:Factory:rpmlint

- rpmlint-pie-fixes.patch: build own non-pie binaries to avoid
  relying on random system binaries.

- use the correct networkd dbus service names. (bnc#918799)

OBS-URL: https://build.opensuse.org/request/show/295192
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rpmlint?expand=0&rev=235
This commit is contained in:
Dominique Leuenberger 2015-04-10 07:50:05 +00:00 committed by Git OBS Bridge
commit 563d2ad454
5 changed files with 47 additions and 1 deletions

3
config
View File

@ -659,7 +659,8 @@ setOption("DBUSServices.WhiteList", (
"com.redhat.storaged",
"com.redhat.lvm2",
# systemd networkd (bnc#918799)
"org.freedesktop.network1"
"org.freedesktop.network1.conf",
"org.freedesktop.network1.service"
))
setOption("PAMModules.WhiteList", (

32
rpmlint-pie-fixes.patch Normal file
View File

@ -0,0 +1,32 @@
Index: rpmlint-tests-13.2+git20150310.00c9b55/tests/pie.spec
===================================================================
--- rpmlint-tests-13.2+git20150310.00c9b55.orig/tests/pie.spec
+++ rpmlint-tests-13.2+git20150310.00c9b55/tests/pie.spec
@@ -20,7 +20,10 @@ officia deserunt mollit anim id est labo
%build
%install
-install -D -m 755 /bin/ls %buildroot/usr/bin/telnet
+mkdir -p %buildroot/usr/bin/
+echo "int main() {}" >xx.c
+gcc -O2 -fno-PIE xx.c -o %buildroot/usr/bin/telnet
+strip %buildroot/usr/bin/telnet
install -D -m 755 /bin/mount %buildroot/bin/mount
Index: rpmlint-tests-13.2+git20150310.00c9b55/tests/permissions1.spec
===================================================================
--- rpmlint-tests-13.2+git20150310.00c9b55.orig/tests/permissions1.spec
+++ rpmlint-tests-13.2+git20150310.00c9b55/tests/permissions1.spec
@@ -23,7 +23,10 @@ officia deserunt mollit anim id est labo
install -d -m 755 %buildroot/etc/permissions.d
install -d -m 755 %buildroot/bin
echo "/bin/foo root:root 4755" > %buildroot/etc/permissions.d/test
-cp /bin/ls %buildroot/bin
+
+echo "int main() {}" > xx.c
+gcc -fno-PIE -O2 xx.c -o %buildroot/bin/ls
+strip %buildroot/bin/ls
cp /bin/su %buildroot/bin
%clean

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Apr 9 14:00:19 UTC 2015 - meissner@suse.com
- rpmlint-pie-fixes.patch: build own non-pie binaries to avoid
relying on random system binaries.
-------------------------------------------------------------------
Tue Mar 10 12:55:04 UTC 2015 - lnussel@suse.de

View File

@ -30,6 +30,7 @@ Group: Development/Tools/Building
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Url: http://www.opensuse.org/
Source: rpmlint-tests-%version.tar.xz
Patch0: rpmlint-pie-fixes.patch
%description
This package doesn't actually contain any files and is not meant to
@ -38,6 +39,7 @@ regression tests against rpmlint(-mini).
%prep
%setup -q
%patch0 -p1
%build
mkdir rpms

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Apr 9 08:13:46 UTC 2015 - meissner@suse.com
- use the correct networkd dbus service names. (bnc#918799)
-------------------------------------------------------------------
Mon Mar 9 11:29:41 UTC 2015 - krahmer@suse.com