sbrabec/util-linux
SHA256
1
0
Fork 0
forked from pool/util-linux
Code Pull Requests Activity

Accepting request 285684 from home:rudi_m:branches:Base:System

Browse Source 
- define upstream source for klogconsole and remove patches
- remove openSUSE 13.1 specific eject permissions, did not worked
  anyway since eject-fpie.patch was removed
- always call autoreconf, not only for splitted packages, skip
  autopoint (gettext)

Both removed patches are upstream. We only import whitespace
changes from upstream.

BTW python-libmount.spec was again not in sync ...

OBS-URL: https://build.opensuse.org/request/show/285684
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=276
This commit is contained in:
Ruediger Meier 2015-02-12 10:11:35 +00:00 committed by Git OBS Bridge
parent 5108010c84
commit 4ff0b958d1
10 changed files with 40 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
klogconsole-quiet.patch
View File

@ -1,11 +0,0 @@
--- klogconsole/klogconsole.c
+++ klogconsole/klogconsole.c
@@ -59,7 +59,7 @@
exit(1);
}
if( ioctl( vt, TIOCLINUX, &newvt ) ) {
- perror("ioctl(TIOCLINUX)");
+ /* shut up perror("ioctl(TIOCLINUX)"); */
exit(1);
}
close(vt);

27
klogconsole.diff
View File

@ -1,27 +0,0 @@
--- klogconsole/Makefile
+++ klogconsole/Makefile
@@ -15,11 +15,11 @@
all: klogconsole
klogconsole: klogconsole.c
- $(CC) $(CFLAGS) -s -o $@ $<
+ $(CC) $(CFLAGS) -o $@ $<
clean:
$(RM) klogconsole
install: klogconsole klogconsole.man
- $(INSTALL) -s -m 0700 klogconsole $(DEST)/usr/sbin/
+ $(INSTALL) -m 0700 klogconsole $(DEST)/usr/sbin/
$(INSTALL) -c -m 0444 klogconsole.man $(DEST)/usr/share/man/man8/klogconsole.8
--- klogconsole/klogconsole.c
+++ klogconsole/klogconsole.c
@@ -46,7 +46,7 @@
char newvt[2];
int vt;
- if ((new_console < 1) || (new_console > MAX_CONSOLE)) {
+ if ((new_console < 0) || (new_console > MAX_CONSOLE)) {
fprintf(stderr,"wrong console number\n");
exit(1);
}

3
klogconsole.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a1efa9f001c8a92fb91a544d62a3f43356f31955dd5125364300827c239ee611
size 1942

3
klogconsole.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a4cd7c96ea647ad6ede62f93675acf3fa3c21ce225f9b771b82618fb2e676e4e
size 2060

9
python-libmount.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Tue Feb 10 15:26:55 UTC 2015 - sweet_f_a@gmx.de
- define upstream source for klogconsole and remove patches
- remove openSUSE 13.1 specific eject permissions, did not worked
anyway since eject-fpie.patch was removed
- always call autoreconf, not only for splitted packages, skip
autopoint (gettext)
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Feb 6 17:01:02 UTC 2015 - dimstar@opensuse.org Fri Feb 6 17:01:02 UTC 2015 - dimstar@opensuse.org

25
python-libmount.spec
View File

@ -76,7 +76,7 @@ Name: python-libmount
%endif %endif
Summary: %main_summary Summary: %main_summary
License: GPL-2.0+ License: GPL-2.0+
Group: %group_pl Group: %main_group
BuildRequires: audit-devel BuildRequires: audit-devel
BuildRequires: bc BuildRequires: bc
BuildRequires: binutils-devel BuildRequires: binutils-devel
@ -142,8 +142,9 @@ Source11: su.default
Source12: ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.25/%{_name}-%{version}.tar.sign Source12: ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.25/%{_name}-%{version}.tar.sign
Source13: %{_name}.keyring Source13: %{_name}.keyring
Source14: runuser.pamd Source14: runuser.pamd
# klogconsole, http://opensuse.github.com/kiwi, 7.02.25, git 859dc050
# TODO: split to separate package # TODO: split to separate package
Source40: klogconsole.tar.bz2 Source40: klogconsole.tar.xz
# XXX: Run a program in a new session and with controlling tty # XXX: Run a program in a new session and with controlling tty
Source22: setctsid.c Source22: setctsid.c
Source23: setctsid.8 Source23: setctsid.8
@ -164,11 +165,6 @@ Patch12: util-linux-noenc-suse.patch
Patch13: util-linux-libblkid-unsafe-chars.patch Patch13: util-linux-libblkid-unsafe-chars.patch
# PATCH-FIX-SECURITY util-linux-libblkid-overflow.patch bsc907434 CVE-2014-9114 sbrabec@suse.cz -- libblkid: fix possible buffer overflow # PATCH-FIX-SECURITY util-linux-libblkid-overflow.patch bsc907434 CVE-2014-9114 sbrabec@suse.cz -- libblkid: fix possible buffer overflow
Patch14: util-linux-libblkid-overflow.patch Patch14: util-linux-libblkid-overflow.patch
##
## klogconsole
##
Patch55: klogconsole-quiet.patch
Patch56: klogconsole.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
# #
%if %build_util_linux %if %build_util_linux
@ -370,7 +366,6 @@ SMP systems.
%if %build_util_linux %if %build_util_linux
%package -n python-libmount %package -n python-libmount
Summary: %summary_pl Summary: %summary_pl
License: GPL-2.0+
Group: %group_pl Group: %group_pl
%description -n python-libmount %description -n python-libmount
@ -394,11 +389,6 @@ xzcat %{S:0} | %gpg_verify -p %{_name} %{S:12} -
# setctsid # setctsid
cp -p %{S:22} %{S:23} . cp -p %{S:22} %{S:23} .
pushd ../klogconsole
%patch55 -p1
%patch56 -p1
popd
%build %build
#BEGIN CONFIG ALTER #BEGIN CONFIG ALTER
%if !%build_util_linux_systemd %if !%build_util_linux_systemd
@ -437,7 +427,6 @@ fi
sed -i 's/BUILD_LSLOGINS/FALSE/ sed -i 's/BUILD_LSLOGINS/FALSE/
s/BUILD_LOGGER/FALSE/ s/BUILD_LOGGER/FALSE/
' misc-utils/Makemodule.am login-utils/Makemodule.am bash-completion/Makemodule.am ' misc-utils/Makemodule.am login-utils/Makemodule.am bash-completion/Makemodule.am
autoreconf -f -i
%endif %endif
#END FIRST STAGE MODIFICATIONS #END FIRST STAGE MODIFICATIONS
%else %else
@ -516,7 +505,6 @@ sed -i '
sed -i ' sed -i '
/SUBDIRS =/s/ po// /SUBDIRS =/s/ po//
' Makefile.am ' Makefile.am
autoreconf -f -i
#END SECOND STAGE MODIFICATIONS #END SECOND STAGE MODIFICATIONS
%endif %endif
# #
@ -538,6 +526,7 @@ export SUID_LDFLAGS="-pie"
# #
# SUSE now supports only systemd based system. We do not build # SUSE now supports only systemd based system. We do not build
# sysvinit-only versions of UTIL_LINUX_SYSTEMD_SOURCES utilities. # sysvinit-only versions of UTIL_LINUX_SYSTEMD_SOURCES utilities.
AUTOPOINT=true autoreconf -vfi
%configure \ %configure \
--localstatedir=/run \ --localstatedir=/run \
--docdir=%{_docdir}/%{_name} \ --docdir=%{_docdir}/%{_name} \
@ -601,10 +590,8 @@ export TS_OPT_fdisk_bsd_known_fail="yes"
export TS_OPT_misc_setarch_known_fail="yes" export TS_OPT_misc_setarch_known_fail="yes"
%endif %endif
# #
%if 0%{?suse_version} > 1310
# glibc requires kernel >= 3.0, thus setarch --uname-2.6 fails on platforms without VDSO # glibc requires kernel >= 3.0, thus setarch --uname-2.6 fails on platforms without VDSO
export TS_OPT_misc_setarch_known_fail="yes" export TS_OPT_misc_setarch_known_fail="yes"
%endif
# #
%ifarch armv6l armv6hl aarch64 %ifarch armv6l armv6hl aarch64
export TS_OPT_fdisk_gpt_known_fail="yes" export TS_OPT_fdisk_gpt_known_fail="yes"
@ -964,12 +951,8 @@ fi
%{_bindir}/su %{_bindir}/su
%endif %endif
%if %{with enable_eject} %if %{with enable_eject}
%if 0%{?suse_version} <= 1310
%verify(not mode) %attr(4750,root,audio) %{_bindir}/eject
%else
%{_bindir}/eject %{_bindir}/eject
%endif %endif
%endif
%{_bindir}/cal %{_bindir}/cal
%{_bindir}/chrt %{_bindir}/chrt
%{_bindir}/col %{_bindir}/col

9
util-linux-systemd.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Tue Feb 10 15:26:55 UTC 2015 - sweet_f_a@gmx.de
- define upstream source for klogconsole and remove patches
- remove openSUSE 13.1 specific eject permissions, did not worked
anyway since eject-fpie.patch was removed
- always call autoreconf, not only for splitted packages, skip
autopoint (gettext)
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Feb 6 17:01:02 UTC 2015 - dimstar@opensuse.org Fri Feb 6 17:01:02 UTC 2015 - dimstar@opensuse.org

22
util-linux-systemd.spec
View File

@ -142,8 +142,9 @@ Source11: su.default
Source12: ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.25/%{_name}-%{version}.tar.sign Source12: ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.25/%{_name}-%{version}.tar.sign
Source13: %{_name}.keyring Source13: %{_name}.keyring
Source14: runuser.pamd Source14: runuser.pamd
# klogconsole, http://opensuse.github.com/kiwi, 7.02.25, git 859dc050
# TODO: split to separate package # TODO: split to separate package
Source40: klogconsole.tar.bz2 Source40: klogconsole.tar.xz
# XXX: Run a program in a new session and with controlling tty # XXX: Run a program in a new session and with controlling tty
Source22: setctsid.c Source22: setctsid.c
Source23: setctsid.8 Source23: setctsid.8
@ -164,11 +165,6 @@ Patch12: util-linux-noenc-suse.patch
Patch13: util-linux-libblkid-unsafe-chars.patch Patch13: util-linux-libblkid-unsafe-chars.patch
# PATCH-FIX-SECURITY util-linux-libblkid-overflow.patch bsc907434 CVE-2014-9114 sbrabec@suse.cz -- libblkid: fix possible buffer overflow # PATCH-FIX-SECURITY util-linux-libblkid-overflow.patch bsc907434 CVE-2014-9114 sbrabec@suse.cz -- libblkid: fix possible buffer overflow
Patch14: util-linux-libblkid-overflow.patch Patch14: util-linux-libblkid-overflow.patch
##
## klogconsole
##
Patch55: klogconsole-quiet.patch
Patch56: klogconsole.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
# #
%if %build_util_linux %if %build_util_linux
@ -393,11 +389,6 @@ xzcat %{S:0} | %gpg_verify -p %{_name} %{S:12} -
# setctsid # setctsid
cp -p %{S:22} %{S:23} . cp -p %{S:22} %{S:23} .
pushd ../klogconsole
%patch55 -p1
%patch56 -p1
popd
%build %build
#BEGIN CONFIG ALTER #BEGIN CONFIG ALTER
%if !%build_util_linux_systemd %if !%build_util_linux_systemd
@ -436,7 +427,6 @@ fi
sed -i 's/BUILD_LSLOGINS/FALSE/ sed -i 's/BUILD_LSLOGINS/FALSE/
s/BUILD_LOGGER/FALSE/ s/BUILD_LOGGER/FALSE/
' misc-utils/Makemodule.am login-utils/Makemodule.am bash-completion/Makemodule.am ' misc-utils/Makemodule.am login-utils/Makemodule.am bash-completion/Makemodule.am
autoreconf -f -i
%endif %endif
#END FIRST STAGE MODIFICATIONS #END FIRST STAGE MODIFICATIONS
%else %else
@ -515,7 +505,6 @@ sed -i '
sed -i ' sed -i '
/SUBDIRS =/s/ po// /SUBDIRS =/s/ po//
' Makefile.am ' Makefile.am
autoreconf -f -i
#END SECOND STAGE MODIFICATIONS #END SECOND STAGE MODIFICATIONS
%endif %endif
# #
@ -537,6 +526,7 @@ export SUID_LDFLAGS="-pie"
# #
# SUSE now supports only systemd based system. We do not build # SUSE now supports only systemd based system. We do not build
# sysvinit-only versions of UTIL_LINUX_SYSTEMD_SOURCES utilities. # sysvinit-only versions of UTIL_LINUX_SYSTEMD_SOURCES utilities.
AUTOPOINT=true autoreconf -vfi
%configure \ %configure \
--localstatedir=/run \ --localstatedir=/run \
--docdir=%{_docdir}/%{_name} \ --docdir=%{_docdir}/%{_name} \
@ -600,10 +590,8 @@ export TS_OPT_fdisk_bsd_known_fail="yes"
export TS_OPT_misc_setarch_known_fail="yes" export TS_OPT_misc_setarch_known_fail="yes"
%endif %endif
# #
%if 0%{?suse_version} > 1310
# glibc requires kernel >= 3.0, thus setarch --uname-2.6 fails on platforms without VDSO # glibc requires kernel >= 3.0, thus setarch --uname-2.6 fails on platforms without VDSO
export TS_OPT_misc_setarch_known_fail="yes" export TS_OPT_misc_setarch_known_fail="yes"
%endif
# #
%ifarch armv6l armv6hl aarch64 %ifarch armv6l armv6hl aarch64
export TS_OPT_fdisk_gpt_known_fail="yes" export TS_OPT_fdisk_gpt_known_fail="yes"
@ -963,12 +951,8 @@ fi
%{_bindir}/su %{_bindir}/su
%endif %endif
%if %{with enable_eject} %if %{with enable_eject}
%if 0%{?suse_version} <= 1310
%verify(not mode) %attr(4750,root,audio) %{_bindir}/eject
%else
%{_bindir}/eject %{_bindir}/eject
%endif %endif
%endif
%{_bindir}/cal %{_bindir}/cal
%{_bindir}/chrt %{_bindir}/chrt
%{_bindir}/col %{_bindir}/col

9
util-linux.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Tue Feb 10 15:26:55 UTC 2015 - sweet_f_a@gmx.de
- define upstream source for klogconsole and remove patches
- remove openSUSE 13.1 specific eject permissions, did not worked
anyway since eject-fpie.patch was removed
- always call autoreconf, not only for splitted packages, skip
autopoint (gettext)
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Feb 6 17:01:02 UTC 2015 - dimstar@opensuse.org Fri Feb 6 17:01:02 UTC 2015 - dimstar@opensuse.org

22
util-linux.spec
View File

@ -142,8 +142,9 @@ Source11: su.default
Source12: ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.25/%{_name}-%{version}.tar.sign Source12: ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.25/%{_name}-%{version}.tar.sign
Source13: %{_name}.keyring Source13: %{_name}.keyring
Source14: runuser.pamd Source14: runuser.pamd
# klogconsole, http://opensuse.github.com/kiwi, 7.02.25, git 859dc050
# TODO: split to separate package # TODO: split to separate package
Source40: klogconsole.tar.bz2 Source40: klogconsole.tar.xz
# XXX: Run a program in a new session and with controlling tty # XXX: Run a program in a new session and with controlling tty
Source22: setctsid.c Source22: setctsid.c
Source23: setctsid.8 Source23: setctsid.8
@ -164,11 +165,6 @@ Patch12: util-linux-noenc-suse.patch
Patch13: util-linux-libblkid-unsafe-chars.patch Patch13: util-linux-libblkid-unsafe-chars.patch
# PATCH-FIX-SECURITY util-linux-libblkid-overflow.patch bsc907434 CVE-2014-9114 sbrabec@suse.cz -- libblkid: fix possible buffer overflow # PATCH-FIX-SECURITY util-linux-libblkid-overflow.patch bsc907434 CVE-2014-9114 sbrabec@suse.cz -- libblkid: fix possible buffer overflow
Patch14: util-linux-libblkid-overflow.patch Patch14: util-linux-libblkid-overflow.patch
##
## klogconsole
##
Patch55: klogconsole-quiet.patch
Patch56: klogconsole.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
# #
%if %build_util_linux %if %build_util_linux
@ -393,11 +389,6 @@ xzcat %{S:0} | %gpg_verify -p %{_name} %{S:12} -
# setctsid # setctsid
cp -p %{S:22} %{S:23} . cp -p %{S:22} %{S:23} .
pushd ../klogconsole
%patch55 -p1
%patch56 -p1
popd
%build %build
#BEGIN CONFIG ALTER #BEGIN CONFIG ALTER
%if !%build_util_linux_systemd %if !%build_util_linux_systemd
@ -436,7 +427,6 @@ fi
sed -i 's/BUILD_LSLOGINS/FALSE/ sed -i 's/BUILD_LSLOGINS/FALSE/
s/BUILD_LOGGER/FALSE/ s/BUILD_LOGGER/FALSE/
' misc-utils/Makemodule.am login-utils/Makemodule.am bash-completion/Makemodule.am ' misc-utils/Makemodule.am login-utils/Makemodule.am bash-completion/Makemodule.am
autoreconf -f -i
%endif %endif
#END FIRST STAGE MODIFICATIONS #END FIRST STAGE MODIFICATIONS
%else %else
@ -515,7 +505,6 @@ sed -i '
sed -i ' sed -i '
/SUBDIRS =/s/ po// /SUBDIRS =/s/ po//
' Makefile.am ' Makefile.am
autoreconf -f -i
#END SECOND STAGE MODIFICATIONS #END SECOND STAGE MODIFICATIONS
%endif %endif
# #
@ -537,6 +526,7 @@ export SUID_LDFLAGS="-pie"
# #
# SUSE now supports only systemd based system. We do not build # SUSE now supports only systemd based system. We do not build
# sysvinit-only versions of UTIL_LINUX_SYSTEMD_SOURCES utilities. # sysvinit-only versions of UTIL_LINUX_SYSTEMD_SOURCES utilities.
AUTOPOINT=true autoreconf -vfi
%configure \ %configure \
--localstatedir=/run \ --localstatedir=/run \
--docdir=%{_docdir}/%{_name} \ --docdir=%{_docdir}/%{_name} \
@ -600,10 +590,8 @@ export TS_OPT_fdisk_bsd_known_fail="yes"
export TS_OPT_misc_setarch_known_fail="yes" export TS_OPT_misc_setarch_known_fail="yes"
%endif %endif
# #
%if 0%{?suse_version} > 1310
# glibc requires kernel >= 3.0, thus setarch --uname-2.6 fails on platforms without VDSO # glibc requires kernel >= 3.0, thus setarch --uname-2.6 fails on platforms without VDSO
export TS_OPT_misc_setarch_known_fail="yes" export TS_OPT_misc_setarch_known_fail="yes"
%endif
# #
%ifarch armv6l armv6hl aarch64 %ifarch armv6l armv6hl aarch64
export TS_OPT_fdisk_gpt_known_fail="yes" export TS_OPT_fdisk_gpt_known_fail="yes"
@ -963,12 +951,8 @@ fi
%{_bindir}/su %{_bindir}/su
%endif %endif
%if %{with enable_eject} %if %{with enable_eject}
%if 0%{?suse_version} <= 1310
%verify(not mode) %attr(4750,root,audio) %{_bindir}/eject
%else
%{_bindir}/eject %{_bindir}/eject
%endif %endif
%endif
%{_bindir}/cal %{_bindir}/cal
%{_bindir}/chrt %{_bindir}/chrt
%{_bindir}/col %{_bindir}/col