From 0bb8834bee1607da977d9ea66fdd2d42997e25705abca172ce8ce3036c04bdf6 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Tue, 2 Nov 2010 09:13:30 +0000 Subject: [PATCH 1/3] Updating link to change in openSUSE:Factory/rpm revision 108.0 OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=0af04f449b4ba75e521118b45ef4c1f2 --- rpm-python.spec | 2 +- rpm.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rpm-python.spec b/rpm-python.spec index 3d5fe21..ad14429 100644 --- a/rpm-python.spec +++ b/rpm-python.spec @@ -26,7 +26,7 @@ License: GPLv2+ Group: System/Packages Summary: Python Bindings for Manipulating RPM Packages Version: 4.8.0 -Release: 11 +Release: 12 Requires: rpm = %{version} %py_requires Source99: rpm.spec diff --git a/rpm.spec b/rpm.spec index f982907..f0f3c32 100644 --- a/rpm.spec +++ b/rpm.spec @@ -29,7 +29,7 @@ PreReq: %insserv_prereq %fillup_prereq permissions AutoReqProv: on Summary: The RPM Package Manager Version: 4.8.0 -Release: 11 +Release: 12 Source: rpm-%{version}.tar.bz2 Source1: RPM-HOWTO.tar.bz2 Source2: RPM-Tips.html.tar.bz2 From 42658f6e7ab2e61b6e3b25cb9efe786640a7474641d06dbdde8ddfd738343032 Mon Sep 17 00:00:00 2001 From: Philipp Thomas Date: Thu, 11 Nov 2010 10:59:29 +0000 Subject: [PATCH 2/3] Accepting request 52720 from home:lnussel:fscaps OBS-URL: https://build.opensuse.org/request/show/52720 OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=72 --- brp.diff | 2 +- rpm-suse_macros | 22 ++++------------------ rpm.changes | 10 ++++++++++ rpm.spec | 1 + 4 files changed, 16 insertions(+), 19 deletions(-) diff --git a/brp.diff b/brp.diff index 3f7a341..8eaf776 100644 --- a/brp.diff +++ b/brp.diff @@ -276,7 +276,7 @@ Index: scripts/Makefile.am check-files check-prereqs \ check-buildroot check-rpaths check-rpaths-worker \ find-debuginfo.sh find-lang.sh \ -@@ -23,8 +25,10 @@ EXTRA_DIST = \ +@@ -24,8 +26,10 @@ EXTRA_DIST = \ rpmconfig_SCRIPTS = \ brp-compress brp-python-bytecompile brp-java-gcjcompile \ diff --git a/rpm-suse_macros b/rpm-suse_macros index cb75541..eea1306 100644 --- a/rpm-suse_macros +++ b/rpm-suse_macros @@ -1,10 +1,5 @@ -%suse_check \ - %{?buildroot:RPM_BUILD_ROOT=\"%{buildroot}\"\ - export RPM_BUILD_ROOT}\ - test -x /usr/sbin/Check -a $UID = 0 -o -x /usr/sbin/Check -a ! -z "$RPM_BUILD_ROOT" && {\ - echo "I call /usr/sbin/Check..."\ - /usr/sbin/Check\ - } +# need to keep this around for a while +%suse_check %{nil} # directories %_infodir %{_prefix}/share/info @@ -23,8 +18,8 @@ %suseconfig_fonts_prereq perl aaa_base %install_info_prereq info +# _suse_os_install_post is defined in brp-checks-suse %__os_install_post %{?_suse_os_install_post}%{!?_suse_os_install_post: \ - %{suse_check} \ /usr/lib/rpm/brp-compress \ /usr/lib/rpm/brp-symlink \ %{nil}} @@ -125,16 +120,7 @@ %verify_permissions(e:f:) \ - if test -f /etc/sysconfig/security ; then \ - source /etc/sysconfig/security \ - fi \ - PERMFILES="/etc/permissions" \ - for PERMEXT in $PERMISSION_SECURITY ; do \ - if test -f /etc/permissions.$PERMEXT ; then \ - PERMFILES="$PERMFILES /etc/permissions.$PERMEXT" \ - fi \ - done \ - /usr/bin/chkstat -n %{**} $PERMFILES 1>&2 \ + /usr/bin/chkstat -n --system %{**} 1>&2 \ %nil # %{suse_update_config [-fcl] [dirs...]} diff --git a/rpm.changes b/rpm.changes index 2d32185..77c0ee2 100644 --- a/rpm.changes +++ b/rpm.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Tue Nov 9 15:07:52 UTC 2010 - lnussel@suse.de + +- don't call /usr/bin/Check at all anymore. superfluous + +------------------------------------------------------------------- +Tue Nov 9 13:04:21 UTC 2010 - lnussel@suse.de + +- change %verify_permissions to use new system mode of chkstat + ------------------------------------------------------------------- Fri Oct 29 15:03:50 CEST 2010 - mls@suse.de diff --git a/rpm.spec b/rpm.spec index f0f3c32..f9d00f0 100644 --- a/rpm.spec +++ b/rpm.spec @@ -300,6 +300,7 @@ fi %postun %{insserv_cleanup} + %verifyscript %verify_permissions -f /usr/lib/rpm/permlist From 254557809c0510a565c52bb09748f1cb295923bb08ef3a3a600c7816383b31d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= Date: Thu, 18 Nov 2010 12:53:52 +0000 Subject: [PATCH 3/3] Accepting request 53234 from home:lnussel:fscaps OBS-URL: https://build.opensuse.org/request/show/53234 OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=73 --- rpm-suse_macros | 8 +++++++- rpm.changes | 6 ++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/rpm-suse_macros b/rpm-suse_macros index eea1306..ab14b81 100644 --- a/rpm-suse_macros +++ b/rpm-suse_macros @@ -80,6 +80,7 @@ %is_plus %(if test -f /.buildenv ; then source /.buildenv ; if [[ "$BUILD_BASENAME" == *+kde ]] ; then echo 1 ; else echo 0 ; fi ; else echo 0 ; fi) +# deprecated, use %set_permissions instead %run_permissions() \ if test "$YAST_IS_RUNNING" != "instsys" ; then \ if test -x /sbin/SuSEconfig -a -f /sbin/conf.d/SuSEconfig.permissions ; then \ @@ -118,9 +119,14 @@ fi \ %nil +%set_permissions(f:) \ + if [ -x /usr/bin/chkstat ]; then \ + /usr/bin/chkstat -n --set --system %{**} \ + fi \ + %nil %verify_permissions(e:f:) \ - /usr/bin/chkstat -n --system %{**} 1>&2 \ + /usr/bin/chkstat -n --warn --system %{**} 1>&2 \ %nil # %{suse_update_config [-fcl] [dirs...]} diff --git a/rpm.changes b/rpm.changes index 77c0ee2..335c374 100644 --- a/rpm.changes +++ b/rpm.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Nov 16 15:25:45 UTC 2010 - lnussel@suse.de + +- fix %verify_permissions to actually only warn +- introduce %set_permissions to replace %run_permissions in the future + ------------------------------------------------------------------- Tue Nov 9 15:07:52 UTC 2010 - lnussel@suse.de