forked from pool/aaa_base
Accepting request 53203 from Base:System
Accepted submit request 53203 from user oertel OBS-URL: https://build.opensuse.org/request/show/53203 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/aaa_base?expand=0&rev=229
This commit is contained in:
parent
85865e2a31
commit
59e4ce953d
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:c12be5fda00fdd55379122d417e98067f0de89790900c24cbfa203be75464d7c
|
||||
size 82259
|
||||
oid sha256:19cc44628dedb9943888b900fae17160f1e63c1de34b45933be44c553eefdb81
|
||||
size 82243
|
||||
|
@ -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
|
||||
|
@ -1,18 +0,0 @@
|
||||
From: Michal Marek <mmarek@suse.cz>
|
||||
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
|
Loading…
Reference in New Issue
Block a user