From 01eb4a393d17e6d3c27e107251bf00a292c7501e Mon Sep 17 00:00:00 2001 From: Ruediger Oertel Date: Tue, 16 Nov 2010 16:17:45 +0000 Subject: [PATCH] Accepting request 53134 from home:a_jaeger:branches:openSUSE:Factory forward to factory OBS-URL: https://build.opensuse.org/request/show/53134 OBS-URL: https://build.opensuse.org/package/show/Base:System/aaa_base?expand=0&rev=164 --- aaa_base.changes | 11 +++++++++++ aaa_base.post | 11 ++++++++--- aaa_base.spec | 2 -- aaa_base.tar.bz2 | 4 ++-- get_kernel_version.c | 2 +- ...nel_version_fix_plus_in_kernel_string.patch | 18 ------------------ 6 files changed, 22 insertions(+), 26 deletions(-) delete mode 100644 get_kernel_version_fix_plus_in_kernel_string.patch diff --git a/aaa_base.changes b/aaa_base.changes index c59f220..8575676 100644 --- a/aaa_base.changes +++ b/aaa_base.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Tue Nov 16 09:51:52 UTC 2010 - aj@suse.de + +- Remove get_kernel_version_fix_plus_in_kernel_string.patch after + applying it to file directly. + +------------------------------------------------------------------- +Tue Nov 16 09:25:43 UTC 2010 - aj@suse.de + +- Use group utmp for /var/run/utmp, btmp and lastlog (bnc#652877). + ------------------------------------------------------------------- Thu Nov 11 12:24:27 CET 2010 - werner@suse.de diff --git a/aaa_base.post b/aaa_base.post index 9c60768..e08026f 100644 --- a/aaa_base.post +++ b/aaa_base.post @@ -3,7 +3,8 @@ # # post.sh - to be done after extraction # -# Copyright (c) 2003 SuSE Linux AG Nuernberg, Germany. +# Copyright (c) 2010 SuSE Linux AG Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # # Run this script in C-Locale, or some tools will fail. @@ -159,13 +160,17 @@ fi if test ! -e /var/log/lastlog ; then touch /var/log/lastlog chmod 644 /var/log/lastlog - chown root:tty /var/log/lastlog + chown root:utmp /var/log/lastlog fi if test ! -e /var/log/wtmp ; then touch /var/log/wtmp chmod 664 /var/log/wtmp - chown root:tty /var/log/wtmp + chown root:utmp /var/log/wtmp fi +# The group ownership of the following files has changed for openSUSE 11.4 +# update it: +chgrp utmp /var/log/wtmp /var/log/lastlog /var/run/utmp + if test -e /usr/sbin/usrdel.local -a ! -e /usr/sbin/userdel.local ; then cp /usr/sbin/usrdel.local /usr/sbin/userdel.local fi diff --git a/aaa_base.spec b/aaa_base.spec index a6dd04a..2e0986c 100644 --- a/aaa_base.spec +++ b/aaa_base.spec @@ -41,7 +41,6 @@ Source8: get_kernel_version.c Source20: aaa_base-rpmlintrc Source21: aaa_base.pre Source22: aaa_base.post -Patch0: get_kernel_version_fix_plus_in_kernel_string.patch %description This package installs several important configuration files. Central @@ -68,7 +67,6 @@ cp -v %{SOURCE21} scripts cp -v %{SOURCE22} scripts cd $RPM_SOURCE_DIR -%patch0 -p0 %build gcc -Wl,-z,relro,-z,now $RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64 $RPM_SOURCE_DIR/get_kernel_version.c -o $RPM_SOURCE_DIR/get_kernel_version diff --git a/aaa_base.tar.bz2 b/aaa_base.tar.bz2 index c65a40e..0b1ca90 100644 --- a/aaa_base.tar.bz2 +++ b/aaa_base.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c12be5fda00fdd55379122d417e98067f0de89790900c24cbfa203be75464d7c -size 82259 +oid sha256:19cc44628dedb9943888b900fae17160f1e63c1de34b45933be44c553eefdb81 +size 82243 diff --git a/get_kernel_version.c b/get_kernel_version.c index 426c422..1c11865 100644 --- a/get_kernel_version.c +++ b/get_kernel_version.c @@ -26,7 +26,7 @@ static inline int my_is_alnum_punct(char c) { return isdigit(c) || (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') - || c == '.' || c == ',' || c == '-' || c == '_'; + || c == '.' || c == ',' || c == '-' || c == '_' || c == '+'; } int diff --git a/get_kernel_version_fix_plus_in_kernel_string.patch b/get_kernel_version_fix_plus_in_kernel_string.patch deleted file mode 100644 index 9b9a87b..0000000 --- a/get_kernel_version_fix_plus_in_kernel_string.patch +++ /dev/null @@ -1,18 +0,0 @@ -From: Michal Marek -Subject: get_kernel_version: accept '+' in kernel version string - -Starting with 2.6.35, the kernel build by default appends a plus sign to -the kernel version string when building in a git tree that is not in a clean -tagged state. - ---- get_kernel_version.c~ 2010-09-02 22:34:31.000000000 +0200 -+++ get_kernel_version.c 2010-09-02 22:34:47.000000000 +0200 -@@ -26,7 +26,7 @@ - static inline int my_is_alnum_punct(char c) - { - return isdigit(c) || (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') -- || c == '.' || c == ',' || c == '-' || c == '_'; -+ || c == '.' || c == ',' || c == '-' || c == '_' || c == '+'; - } - - int