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=35

Browse Source
This commit is contained in:
OBS User unknown 2007-11-21 22:03:26 +00:00 committed by Git OBS Bridge
parent e5ca80cb29
commit 3a2c622d7c
7 changed files with 62 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
raw.init
View File

@ -15,6 +15,7 @@
# Required-Stop: # Required-Stop:
# Default-Start: 2 3 5 # Default-Start: 2 3 5
# Default-Stop: 0 1 6 # Default-Stop: 0 1 6
# Short-Description: raw devices
# Description: raw-devices # Description: raw-devices
### END INIT INFO ### END INIT INFO

60
util-linux-2.13-mount_losetup_crypto.patch
View File

@ -4,20 +4,20 @@
Signed-off-by: Ludwig Nussel <ludwig.nussel@suse.de> Signed-off-by: Ludwig Nussel <ludwig.nussel@suse.de>
Index: util-linux-ng-2.13.0.1+git20071106/mount/Makefile.am Index: util-linux-ng-2.13.0.1+git20071121/mount/Makefile.am
=================================================================== ===================================================================
--- util-linux-ng-2.13.0.1+git20071106.orig/mount/Makefile.am --- util-linux-ng-2.13.0.1+git20071121.orig/mount/Makefile.am
+++ util-linux-ng-2.13.0.1+git20071106/mount/Makefile.am +++ util-linux-ng-2.13.0.1+git20071121/mount/Makefile.am
@@ -12,7 +12,7 @@ headers_common = fstab.h linux_fs.h moun @@ -12,7 +12,7 @@ headers_common = fstab.h mount_mntent.h
mount_paths.h lomount.h fsprobe.h realpath.h xmalloc.h \ mount_paths.h lomount.h fsprobe.h realpath.h xmalloc.h \
getusername.h loop.h sundries.h getusername.h loop.h sundries.h
-mount_common = fstab.c mount_mntent.c getusername.c lomount.c \ -mount_common = fstab.c mount_mntent.c getusername.c lomount.c \
+mount_common = fstab.c mount_mntent.c getusername.c lomount.c rmd160.c sha512.c \ +mount_common = fstab.c mount_mntent.c getusername.c lomount.c rmd160.c sha512.c \
$(utils_common) $(headers_common) ../lib/env.c $(utils_common) $(headers_common) ../lib/env.c ../lib/linux_version.c \
../lib/blkdev.c
mount_SOURCES = mount.c $(mount_common) ../lib/setproctitle.c @@ -26,7 +26,7 @@ umount_LDFLAGS = $(SUID_LDFLAGS) $(AM_LD
@@ -25,7 +25,7 @@ umount_LDFLAGS = $(SUID_LDFLAGS) $(AM_LD
swapon_SOURCES = swapon.c swap_constants.h $(utils_common) swapon_SOURCES = swapon.c swap_constants.h $(utils_common)
@ -26,10 +26,10 @@ Index: util-linux-ng-2.13.0.1+git20071106/mount/Makefile.am
loop.h lomount.h xmalloc.h sundries.h realpath.h loop.h lomount.h xmalloc.h sundries.h realpath.h
losetup_CPPFLAGS = -DMAIN $(AM_CPPFLAGS) losetup_CPPFLAGS = -DMAIN $(AM_CPPFLAGS)
Index: util-linux-ng-2.13.0.1+git20071106/mount/rmd160.h Index: util-linux-ng-2.13.0.1+git20071121/mount/rmd160.h
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ util-linux-ng-2.13.0.1+git20071106/mount/rmd160.h +++ util-linux-ng-2.13.0.1+git20071121/mount/rmd160.h
@@ -0,0 +1,11 @@ @@ -0,0 +1,11 @@
+#ifndef RMD160_H +#ifndef RMD160_H
+#define RMD160_H +#define RMD160_H
@ -42,10 +42,10 @@ Index: util-linux-ng-2.13.0.1+git20071106/mount/rmd160.h
+#endif /*RMD160_H*/ +#endif /*RMD160_H*/
+ +
+ +
Index: util-linux-ng-2.13.0.1+git20071106/mount/lomount.c Index: util-linux-ng-2.13.0.1+git20071121/mount/lomount.c
=================================================================== ===================================================================
--- util-linux-ng-2.13.0.1+git20071106.orig/mount/lomount.c --- util-linux-ng-2.13.0.1+git20071121.orig/mount/lomount.c
+++ util-linux-ng-2.13.0.1+git20071106/mount/lomount.c +++ util-linux-ng-2.13.0.1+git20071121/mount/lomount.c
@@ -20,12 +20,18 @@ @@ -20,12 +20,18 @@
#include "loop.h" #include "loop.h"
@ -343,10 +343,10 @@ Index: util-linux-ng-2.13.0.1+git20071106/mount/lomount.c
if (res == 2 && find) { if (res == 2 && find) {
if (verbose) if (verbose)
printf("stolen loop=%s...trying again\n", printf("stolen loop=%s...trying again\n",
Index: util-linux-ng-2.13.0.1+git20071106/mount/mount.c Index: util-linux-ng-2.13.0.1+git20071121/mount/mount.c
=================================================================== ===================================================================
--- util-linux-ng-2.13.0.1+git20071106.orig/mount/mount.c --- util-linux-ng-2.13.0.1+git20071121.orig/mount/mount.c
+++ util-linux-ng-2.13.0.1+git20071106/mount/mount.c +++ util-linux-ng-2.13.0.1+git20071121/mount/mount.c
@@ -88,6 +88,9 @@ static int suid = 0; @@ -88,6 +88,9 @@ static int suid = 0;
/* Contains the fd to read the passphrase from, if any. */ /* Contains the fd to read the passphrase from, if any. */
static int pfd = -1; static int pfd = -1;
@ -393,7 +393,7 @@ Index: util-linux-ng-2.13.0.1+git20071106/mount/mount.c
+ keysz = strtoul(opt_keybits, NULL, 0); + keysz = strtoul(opt_keybits, NULL, 0);
+ if (opt_nohashpass) { + if (opt_nohashpass) {
+ if(opt_phash && strcmp(opt_phash, "none")) { + if(opt_phash && strcmp(opt_phash, "none")) {
+ error(_("mount: please specify either phash=%s or nohashpass\n")); + error(_("mount: please specify either phash=%s or nohashpass\n"), opt_phash);
+ return EX_FAIL; + return EX_FAIL;
+ } + }
+ opt_phash = "none"; + opt_phash = "none";
@ -404,7 +404,7 @@ Index: util-linux-ng-2.13.0.1+git20071106/mount/mount.c
if (res == 2) { if (res == 2) {
/* loop dev has been grabbed by some other process, /* loop dev has been grabbed by some other process,
try again, if not given explicitly */ try again, if not given explicitly */
@@ -1677,6 +1692,7 @@ static struct option longopts[] = { @@ -1668,6 +1683,7 @@ static struct option longopts[] = {
{ "options", 1, 0, 'o' }, { "options", 1, 0, 'o' },
{ "test-opts", 1, 0, 'O' }, { "test-opts", 1, 0, 'O' },
{ "pass-fd", 1, 0, 'p' }, { "pass-fd", 1, 0, 'p' },
@ -412,7 +412,7 @@ Index: util-linux-ng-2.13.0.1+git20071106/mount/mount.c
{ "types", 1, 0, 't' }, { "types", 1, 0, 't' },
{ "bind", 0, 0, 128 }, { "bind", 0, 0, 128 },
{ "move", 0, 0, 133 }, { "move", 0, 0, 133 },
@@ -1823,6 +1839,7 @@ main(int argc, char *argv[]) { @@ -1814,6 +1830,7 @@ main(int argc, char *argv[]) {
char *options = NULL, *test_opts = NULL, *node; char *options = NULL, *test_opts = NULL, *node;
const char *spec = NULL; const char *spec = NULL;
char *label = NULL; char *label = NULL;
@ -420,7 +420,7 @@ Index: util-linux-ng-2.13.0.1+git20071106/mount/mount.c
char *uuid = NULL; char *uuid = NULL;
char *types = NULL; char *types = NULL;
char *p; char *p;
@@ -1853,7 +1870,7 @@ main(int argc, char *argv[]) { @@ -1844,7 +1861,7 @@ main(int argc, char *argv[]) {
initproctitle(argc, argv); initproctitle(argc, argv);
#endif #endif
@ -429,7 +429,7 @@ Index: util-linux-ng-2.13.0.1+git20071106/mount/mount.c
longopts, NULL)) != -1) { longopts, NULL)) != -1) {
switch (c) { switch (c) {
case 'a': /* mount everything in fstab */ case 'a': /* mount everything in fstab */
@@ -1871,6 +1888,9 @@ main(int argc, char *argv[]) { @@ -1862,6 +1879,9 @@ main(int argc, char *argv[]) {
case 'i': case 'i':
external_allowed = 0; external_allowed = 0;
break; break;
@ -439,7 +439,7 @@ Index: util-linux-ng-2.13.0.1+git20071106/mount/mount.c
case 'l': case 'l':
list_with_volumelabel = 1; list_with_volumelabel = 1;
break; break;
@@ -2007,6 +2027,9 @@ main(int argc, char *argv[]) { @@ -1998,6 +2018,9 @@ main(int argc, char *argv[]) {
atexit(unlock_mtab); atexit(unlock_mtab);
@ -449,10 +449,10 @@ Index: util-linux-ng-2.13.0.1+git20071106/mount/mount.c
switch (argc+specseen) { switch (argc+specseen) {
case 0: case 0:
/* mount -a */ /* mount -a */
Index: util-linux-ng-2.13.0.1+git20071106/mount/rmd160.c Index: util-linux-ng-2.13.0.1+git20071121/mount/rmd160.c
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ util-linux-ng-2.13.0.1+git20071106/mount/rmd160.c +++ util-linux-ng-2.13.0.1+git20071121/mount/rmd160.c
@@ -0,0 +1,532 @@ @@ -0,0 +1,532 @@
+/* rmd160.c - RIPE-MD160 +/* rmd160.c - RIPE-MD160
+ * Copyright (C) 1998 Free Software Foundation, Inc. + * Copyright (C) 1998 Free Software Foundation, Inc.
@ -986,10 +986,10 @@ Index: util-linux-ng-2.13.0.1+git20071106/mount/rmd160.c
+ rmd160_final( &hd ); + rmd160_final( &hd );
+ memcpy( outbuf, hd.buf, 20 ); + memcpy( outbuf, hd.buf, 20 );
+} +}
Index: util-linux-ng-2.13.0.1+git20071106/mount/sha512.c Index: util-linux-ng-2.13.0.1+git20071121/mount/sha512.c
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ util-linux-ng-2.13.0.1+git20071106/mount/sha512.c +++ util-linux-ng-2.13.0.1+git20071121/mount/sha512.c
@@ -0,0 +1,432 @@ @@ -0,0 +1,432 @@
+/* +/*
+ * sha512.c + * sha512.c
@ -1423,10 +1423,10 @@ Index: util-linux-ng-2.13.0.1+git20071106/mount/sha512.c
+ memset(&ctx, 0, sizeof(ctx)); + memset(&ctx, 0, sizeof(ctx));
+} +}
+#endif +#endif
Index: util-linux-ng-2.13.0.1+git20071106/mount/sha512.h Index: util-linux-ng-2.13.0.1+git20071121/mount/sha512.h
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ util-linux-ng-2.13.0.1+git20071106/mount/sha512.h +++ util-linux-ng-2.13.0.1+git20071121/mount/sha512.h
@@ -0,0 +1,45 @@ @@ -0,0 +1,45 @@
+/* +/*
+ * sha512.h + * sha512.h
@ -1473,10 +1473,10 @@ Index: util-linux-ng-2.13.0.1+git20071106/mount/sha512.h
+/* no sha384_write(), use sha512_write() */ +/* no sha384_write(), use sha512_write() */
+/* no sha384_final(), use sha512_final(), result in ctx->sha_out[0...47] */ +/* no sha384_final(), use sha512_final(), result in ctx->sha_out[0...47] */
+extern void sha384_hash_buffer(const unsigned char *, size_t, unsigned char *, size_t); +extern void sha384_hash_buffer(const unsigned char *, size_t, unsigned char *, size_t);
Index: util-linux-ng-2.13.0.1+git20071106/mount/lomount.h Index: util-linux-ng-2.13.0.1+git20071121/mount/lomount.h
=================================================================== ===================================================================
--- util-linux-ng-2.13.0.1+git20071106.orig/mount/lomount.h --- util-linux-ng-2.13.0.1+git20071121.orig/mount/lomount.h
+++ util-linux-ng-2.13.0.1+git20071106/mount/lomount.h +++ util-linux-ng-2.13.0.1+git20071121/mount/lomount.h
@@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
-extern int set_loop(const char *, const char *, unsigned long long, -extern int set_loop(const char *, const char *, unsigned long long,
- const char *, int, int *); - const char *, int, int *);

5
util-linux-2.13-rpmlintrc Normal file
View File

@ -0,0 +1,5 @@
addFilter("init-script-without-%stop_on_removal-preun /etc/init.d/raw")
addFilter("incoherent-init-script-name raw")
addFilter("no-reload-entry /etc/init.d/raw")
addFilter("files-duplicate .*(rootflags|ramsize|vidmode)")

3
util-linux-ng-2.13.0.1+git20071106.tar.bz2
View File

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

3
util-linux-ng-2.13.0.1+git20071121.tar.bz2 Normal file
View File

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

9
util-linux.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Wed Nov 21 13:43:31 CET 2007 - mkoenig@suse.de
- update to git20071121:
add sector size check for mkfs.minix [#308256]
fix canonicalization for cifs [#338375]
- provide Short-Description for raw init script
- add rpmlintrc
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Nov 20 17:49:35 CET 2007 - mkoenig@suse.de Tue Nov 20 17:49:35 CET 2007 - mkoenig@suse.de

18
util-linux.spec
View File

@ -1,5 +1,5 @@
# #
# spec file for package util-linux (Version 2.13.0.1+git20071106) # spec file for package util-linux (Version 2.13.0.1+git20071121)
# #
# 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,10 +20,11 @@ PreReq: %install_info_prereq permissions
License: BSD 3-Clause; GPL v2 or later License: BSD 3-Clause; GPL v2 or later
Group: System/Base Group: System/Base
AutoReqProv: on AutoReqProv: on
Version: 2.13.0.1+git20071106 Version: 2.13.0.1+git20071121
Release: 4 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
Source1: util-linux-2.13-rpmlintrc
Source2: nologin.c Source2: nologin.c
Source3: nologin.8 Source3: nologin.8
Source4: raw.init Source4: raw.init
@ -154,7 +155,6 @@ CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE " INSTALL_PROGRAM='$(INSTALL)' \
--infodir=%{_infodir} \ --infodir=%{_infodir} \
%{_target_cpu}-suse-linux %{_target_cpu}-suse-linux
make make
make check
cd .. cd ..
# klogconsole build # klogconsole build
cd klogconsole cd klogconsole
@ -190,6 +190,10 @@ make
gcc $RPM_OPT_FLAGS -o nologin nologin.c gcc $RPM_OPT_FLAGS -o nologin nologin.c
gcc $RPM_OPT_FLAGS -o mkzimage_cmdline %{S:29} gcc $RPM_OPT_FLAGS -o mkzimage_cmdline %{S:29}
%check
cd ../time-%{time_ver}
make check
%install %install
mkdir -p "$RPM_BUILD_ROOT"{/etc/init.d,%{_mandir}/man{1,8},\ mkdir -p "$RPM_BUILD_ROOT"{/etc/init.d,%{_mandir}/man{1,8},\
/bin,/sbin,/usr/bin,/usr/sbin,%{_infodir}} /bin,/sbin,/usr/bin,/usr/sbin,%{_infodir}}
@ -554,6 +558,12 @@ fi
#/usr/bin/ia64 #/usr/bin/ia64
#%endif #%endif
%changelog %changelog
* Wed Nov 21 2007 - mkoenig@suse.de
- update to git20071121:
add sector size check for mkfs.minix [#308256]
fix canonicalization for cifs [#338375]
- provide Short-Description for raw init script
- add rpmlintrc
* Tue Nov 20 2007 - mkoenig@suse.de * Tue Nov 20 2007 - mkoenig@suse.de
- fix raw path in init script - fix raw path in init script
* Tue Nov 06 2007 - mkoenig@suse.de * Tue Nov 06 2007 - mkoenig@suse.de