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

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/util-linux?expand=0&rev=17

Browse Source
This commit is contained in:
OBS User unknown 2007-06-07 11:16:42 +00:00 committed by Git OBS Bridge
parent fd115c791d
commit d6843cb50c
10 changed files with 56 additions and 3711 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
util-linux-2.12-misc_utils_hostid.patch
View File

@ -1,7 +1,7 @@
Index: util-linux-ng-2.12r+git20070412/misc-utils/hostid.1 Index: util-linux-ng-2.12r+git20070530/misc-utils/hostid.1
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ util-linux-ng-2.12r+git20070412/misc-utils/hostid.1 +++ util-linux-ng-2.12r+git20070530/misc-utils/hostid.1
@@ -0,0 +1,24 @@ @@ -0,0 +1,24 @@
+.TH hostid 1 +.TH hostid 1
+.SH NAME +.SH NAME
@ -27,10 +27,10 @@ Index: util-linux-ng-2.12r+git20070412/misc-utils/hostid.1
+.SH SEE ALSO +.SH SEE ALSO
+gethostid(2), sethostid(2) +gethostid(2), sethostid(2)
+ +
Index: util-linux-ng-2.12r+git20070412/misc-utils/hostid.c Index: util-linux-ng-2.12r+git20070530/misc-utils/hostid.c
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ util-linux-ng-2.12r+git20070412/misc-utils/hostid.c +++ util-linux-ng-2.12r+git20070530/misc-utils/hostid.c
@@ -0,0 +1,88 @@ @@ -0,0 +1,88 @@
+/* Program hostid. Changed on 7.10.1997 <ms@suse.de> +/* Program hostid. Changed on 7.10.1997 <ms@suse.de>
+ New: - Hostid 0 is not permitted. + New: - Hostid 0 is not permitted.
@ -120,20 +120,20 @@ Index: util-linux-ng-2.12r+git20070412/misc-utils/hostid.c
+ +
+ return 0; + return 0;
+} +}
Index: util-linux-ng-2.12r+git20070412/misc-utils/Makefile.am Index: util-linux-ng-2.12r+git20070530/misc-utils/Makefile.am
=================================================================== ===================================================================
--- util-linux-ng-2.12r+git20070412.orig/misc-utils/Makefile.am --- util-linux-ng-2.12r+git20070530.orig/misc-utils/Makefile.am
+++ util-linux-ng-2.12r+git20070412/misc-utils/Makefile.am +++ util-linux-ng-2.12r+git20070530/misc-utils/Makefile.am
@@ -9,7 +9,7 @@ EXTRA_DIST = README.* \ @@ -5,7 +5,7 @@ EXTRA_DIST = README.flushb
bin_PROGRAMS = bin_PROGRAMS =
usrbinexec_PROGRAMS = cal ddate logger look mcookie \ usrbinexec_PROGRAMS = cal ddate logger look mcookie \
- namei script whereis - namei script whereis
+ namei script whereis hostid + namei script whereis hostid
EXTRA_DIST += README.cal README.ddate README.namei README.namei2
mcookie_LDADD = $(top_srcdir)/lib/libmd5.a mcookie_SOURCES = mcookie.c ../lib/md5.c
@@ -15,7 +15,7 @@ usrbinexec_SCRIPTS = chkdupexe scriptrep
@@ -24,7 +24,7 @@ scriptreplay: scriptreplay.pl
CLEANFILES = chkdupexe scriptreplay CLEANFILES = chkdupexe scriptreplay
man_MANS = cal.1 chkdupexe.1 ddate.1 logger.1 look.1 mcookie.1 \ man_MANS = cal.1 chkdupexe.1 ddate.1 logger.1 look.1 mcookie.1 \

53
util-linux-2.12r-mount_by_uuid.patch
View File

@ -1,53 +0,0 @@
Index: util-linux-ng-2.12r+git20070330/mount/fstab.c
===================================================================
--- util-linux-ng-2.12r+git20070330.orig/mount/fstab.c
+++ util-linux-ng-2.12r+git20070330/mount/fstab.c
@@ -295,7 +295,7 @@ has_uuid(const char *device, const char
const char *devuuid;
int ret;
- devuuid = mount_get_devname_by_uuid(device);
+ devuuid = mount_get_volume_uuid_by_spec(device);
ret = !strcmp(uuid, devuuid);
/* free(devuuid); */
return ret;
Index: util-linux-ng-2.12r+git20070330/mount/mount_blkid.c
===================================================================
--- util-linux-ng-2.12r+git20070330.orig/mount/mount_blkid.c
+++ util-linux-ng-2.12r+git20070330/mount/mount_blkid.c
@@ -16,6 +16,11 @@ mount_blkid_put_cache(void) {
}
const char *
+mount_get_volume_uuid_by_spec(const char *spec) {
+ return blkid_get_tag_value(blkid, "UUID", spec);
+}
+
+const char *
mount_get_volume_label_by_spec(const char *spec) {
return blkid_get_tag_value(blkid, "LABEL", spec);
}
@@ -56,6 +61,11 @@ mount_blkid_put_cache(void) {
}
const char *
+mount_get_volume_uuid_by_spec(const char *spec) {
+ return xstrdup(get_volume_uuid_by_spec(spec));
+}
+
+const char *
mount_get_volume_label_by_spec(const char *spec) {
return xstrdup(get_volume_label_by_spec(spec));
}
Index: util-linux-ng-2.12r+git20070330/mount/mount_blkid.h
===================================================================
--- util-linux-ng-2.12r+git20070330.orig/mount/mount_blkid.h
+++ util-linux-ng-2.12r+git20070330/mount/mount_blkid.h
@@ -7,6 +7,7 @@ extern void mount_blkid_get_cache(void);
extern void mount_blkid_put_cache(void);
extern const char *mount_get_devname_by_uuid(const char *uuid);
extern const char *mount_get_devname_by_label(const char *label);
+extern const char *mount_get_volume_uuid_by_spec(const char *spec);
extern const char *mount_get_volume_label_by_spec(const char *spec);
extern const char *mount_get_devname(const char *spec);
extern const char *mount_get_devname_for_mounting(const char *spec);

12
util-linux-2.13-build_gnu_source.patch
View File

@ -1,12 +0,0 @@
Index: util-linux-ng-2.12r+git20070330/configure.ac
===================================================================
--- util-linux-ng-2.12r+git20070330.orig/configure.ac
+++ util-linux-ng-2.12r+git20070330/configure.ac
@@ -10,6 +10,7 @@ AC_CONFIG_SRCDIR(mount/mount.c)
AC_PREFIX_DEFAULT(/)
+AC_GNU_SOURCE
AC_PROG_CC_STDC
AC_PROG_RANLIB
AC_PROG_LIBTOOL

48
util-linux-2.13-build_no_perl_dependency.patch
View File

@ -1,48 +0,0 @@
Index: util-linux-ng-2.12r+git20070412/configure.ac
===================================================================
--- util-linux-ng-2.12r+git20070412.orig/configure.ac
+++ util-linux-ng-2.12r+git20070412/configure.ac
@@ -244,6 +244,11 @@ AC_ARG_ENABLE([partx],
)
AM_CONDITIONAL(BUILD_PARTX, test x$enable_partx = xyes)
+AC_ARG_ENABLE([perl-scripts],
+ AC_HELP_STRING([--enable-perl-scripts], [install perl scripts (chkdupexe, scriptreplay)]),
+ enable_perl_scripts=$enableval, enable_perl_scripts=no
+)
+AM_CONDITIONAL(INSTALL_PERL_SCRIPTS, test x$enable_perl_scripts = xyes)
AC_ARG_ENABLE([raw],
AC_HELP_STRING([--enable-raw], [build raw]),
Index: util-linux-ng-2.12r+git20070412/misc-utils/Makefile.am
===================================================================
--- util-linux-ng-2.12r+git20070412.orig/misc-utils/Makefile.am
+++ util-linux-ng-2.12r+git20070412/misc-utils/Makefile.am
@@ -11,9 +11,16 @@ bin_PROGRAMS =
usrbinexec_PROGRAMS = cal ddate logger look mcookie \
namei script whereis hostid
+usrbinexec_SCRIPTS =
+
+man_MANS = cal.1 ddate.1 logger.1 look.1 mcookie.1 \
+ namei.1 script.1 whereis.1 hostid.1
+
mcookie_LDADD = $(top_srcdir)/lib/libmd5.a
+if INSTALL_PERL_SCRIPTS
usrbinexec_SCRIPTS = chkdupexe scriptreplay
+man_MANS += chkdupexe.1 scriptreplay.1
chkdupexe: chkdupexe.pl
sed -e 's,[@]PERL[@],$(PERL),g' < chkdupexe.pl > chkdupexe
@@ -22,9 +29,7 @@ scriptreplay: scriptreplay.pl
sed -e 's,[@]PERL[@],$(PERL),g' < scriptreplay.pl > scriptreplay
CLEANFILES = chkdupexe scriptreplay
-
-man_MANS = cal.1 chkdupexe.1 ddate.1 logger.1 look.1 mcookie.1 \
- namei.1 script.1 whereis.1 scriptreplay.1 hostid.1
+endif
if HAVE_NCURSES
cal_LDADD = -lncurses

16
util-linux-2.13-misc_utils_cal_ncurses.patch Normal file
View File

@ -0,0 +1,16 @@
Index: util-linux-ng-2.12r+git20070530/configure.ac
===================================================================
--- util-linux-ng-2.12r+git20070530.orig/configure.ac
+++ util-linux-ng-2.12r+git20070530/configure.ac
@@ -107,8 +107,9 @@ fi
have_ncurses=no
AC_CHECK_HEADERS([ncurses.h ncurses/ncurses.h], [have_ncurses=yes])
case $have_ncurses in
-yes) AC_MSG_NOTICE([you have ncurses]);;
-no) AC_MSG_NOTICE([you do not have ncurses]);;
+ yes) AC_MSG_NOTICE([you have ncurses])
+ AC_DEFINE([HAVE_NCURSES],, [define this if you have libncurses]);;
+ no) AC_MSG_NOTICE([you do not have ncurses]);;
esac
AM_CONDITIONAL(HAVE_NCURSES, test x$have_ncurses = xyes)

3574
util-linux-2.13-mount_volume_id.patch
View File

File diff suppressed because it is too large Load Diff

3
util-linux-ng-2.12r+git20070509.tar.bz2
View File

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

3
util-linux-ng-2.12r+git20070530.tar.bz2 Normal file
View File

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

10
util-linux.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Wed Jun 6 16:15:43 CEST 2007 - mkoenig@suse.de
- update to git20070530
- removed patches
util-linux-2.13-mount_volume_id.patch
util-linux-2.12r-mount_by_uuid.patch
util-linux-2.13-build_gnu_source.patch
- fix build with ncurses
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Jun 5 17:01:48 CEST 2007 - mkoenig@suse.de Tue Jun 5 17:01:48 CEST 2007 - mkoenig@suse.de

26
util-linux.spec
View File

@ -1,5 +1,5 @@
# #
# spec file for package util-linux (Version 2.12r+git20070509) # spec file for package util-linux (Version 2.12r+git20070530)
# #
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine # This file and all modifications and additions to the pristine
@ -20,7 +20,7 @@ PreReq: %install_info_prereq permissions
License: BSD License and BSD-like, GNU General Public License (GPL) License: BSD License and BSD-like, GNU General Public License (GPL)
Group: System/Base Group: System/Base
Autoreqprov: on Autoreqprov: on
Version: 2.12r+git20070509 Version: 2.12r+git20070530
Release: 1 Release: 1
Summary: A collection of basic system utilities Summary: A collection of basic system utilities
Source: ftp://ftp.kernel.org/pub/linux/utils/util-linux/%name-ng-%version.tar.bz2 Source: ftp://ftp.kernel.org/pub/linux/utils/util-linux/%name-ng-%version.tar.bz2
@ -47,7 +47,6 @@ Source30: README.largedisk
## ##
## util-linux ## util-linux
## ##
Patch0: util-linux-2.13-mount_volume_id.patch
# add hostid # add hostid
Patch1: util-linux-2.12-misc_utils_hostid.patch Patch1: util-linux-2.12-misc_utils_hostid.patch
# 27181 (suse12181) - wall adds newlines # 27181 (suse12181) - wall adds newlines
@ -67,7 +66,6 @@ Patch15: util-linux-2.11q-fdisk_fs_mac.patch
Patch16: util-linux-mount_opt_hotplug.patch Patch16: util-linux-mount_opt_hotplug.patch
# 115129 - mount --move doesn't work as expected # 115129 - mount --move doesn't work as expected
Patch18: util-linux-2.12q-mount_--move.patch Patch18: util-linux-2.12q-mount_--move.patch
Patch20: util-linux-2.12r-mount_by_uuid.patch
Patch21: util-linux-2.12q-mount_umount2_not_static.patch Patch21: util-linux-2.12q-mount_umount2_not_static.patch
# 148409 - df, mount, /proc/mounts show root mounted twice # 148409 - df, mount, /proc/mounts show root mounted twice
# TODO: Needs fix, because of 231599 # TODO: Needs fix, because of 231599
@ -97,9 +95,8 @@ Patch36: util-linux-2.12r-mount_racy_loop.patch
# TODO: Needs to be ported to new version # TODO: Needs to be ported to new version
Patch38: util-linux-2.12r-mount_swapon_swsuspend_resume.patch Patch38: util-linux-2.12r-mount_swapon_swsuspend_resume.patch
Patch40: util-linux-2.13-sys_utils_arch.patch Patch40: util-linux-2.13-sys_utils_arch.patch
Patch41: util-linux-2.13-build_gnu_source.patch
Patch42: util-linux-2.13-build_fix_intel_check.patch Patch42: util-linux-2.13-build_fix_intel_check.patch
Patch43: util-linux-2.13-build_no_perl_dependency.patch Patch43: util-linux-2.13-misc_utils_cal_ncurses.patch
## ##
## adjtimex ## adjtimex
## ##
@ -133,7 +130,6 @@ Authors:
%prep %prep
%setup -q -a 9 -b 10 -b 11 -b 12 -b 13 -n %name-ng-%version %setup -q -a 9 -b 10 -b 11 -b 12 -b 13 -n %name-ng-%version
%patch0 -p1
%patch1 -p1 %patch1 -p1
%patch2 -p1 %patch2 -p1
%patch5 -p0 %patch5 -p0
@ -144,7 +140,6 @@ Authors:
%patch15 -p1 %patch15 -p1
%patch16 -p1 %patch16 -p1
%patch18 %patch18
#%patch20 -p1
%patch21 %patch21
%patch22 %patch22
%patch23 -p1 %patch23 -p1
@ -158,7 +153,6 @@ Authors:
%patch36 -p1 %patch36 -p1
#%patch38 -p1 #%patch38 -p1
%patch40 -p1 %patch40 -p1
%patch41 -p1
%patch42 -p1 %patch42 -p1
%patch43 -p1 %patch43 -p1
# #
@ -233,7 +227,6 @@ CFLAGS=-DCONFIG_SMP
--enable-partx \ --enable-partx \
--enable-raw \ --enable-raw \
--enable-rdev \ --enable-rdev \
--enable-perl-scripts=no \
--enable-write \ --enable-write \
--disable-use-tty-group \ --disable-use-tty-group \
CFLAGS="$CFLAGS $RPM_OPT_FLAGS" CFLAGS="$CFLAGS $RPM_OPT_FLAGS"
@ -302,6 +295,12 @@ ln -sf ../../etc/init.d/raw $RPM_BUILD_ROOT/usr/sbin/rcraw
# Following files we don't want to package, so remove them # Following files we don't want to package, so remove them
rm -f $RPM_BUILD_ROOT/usr/bin/pg rm -f $RPM_BUILD_ROOT/usr/bin/pg
rm -f $RPM_BUILD_ROOT/usr/share/man/man1/pg.1* rm -f $RPM_BUILD_ROOT/usr/share/man/man1/pg.1*
# Do not package these files to get rid of the perl dependency
rm -f $RPM_BUILD_ROOT/usr/bin/chkdupexe
rm -f $RPM_BUILD_ROOT/usr/bin/scriptreplay
rm -f $RPM_BUILD_ROOT/usr/share/man/man1/chkdupexe.1
rm -f $RPM_BUILD_ROOT/usr/share/man/man1/scriptreplay.1
# arch dependent
%ifarch s390 s390x %ifarch s390 s390x
rm -f $RPM_BUILD_ROOT/etc/fdprm rm -f $RPM_BUILD_ROOT/etc/fdprm
rm -f $RPM_BUILD_ROOT/usr/bin/cytune rm -f $RPM_BUILD_ROOT/usr/bin/cytune
@ -554,6 +553,13 @@ fi
%endif %endif
%changelog %changelog
* Wed Jun 06 2007 - mkoenig@suse.de
- update to git20070530
- removed patches
util-linux-2.13-mount_volume_id.patch
util-linux-2.12r-mount_by_uuid.patch
util-linux-2.13-build_gnu_source.patch
- fix build with ncurses
* Tue Jun 05 2007 - mkoenig@suse.de * Tue Jun 05 2007 - mkoenig@suse.de
- update to git20070509 - update to git20070509
mount: NFS code removed (use mount.nfs{,4} from nfs-utils) mount: NFS code removed (use mount.nfs{,4} from nfs-utils)