[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/util-linux/devel util-linux-2.13-usrsbin.patch, NONE, 1.1 .cvsignore, 1.14, 1.15 sources, 1.14, 1.15 util-linux-2.13-moretc.patch, 1.1, 1.2 util-linux-2.13-nfsv4.patch, 1.1, 1.2 util-linux.spec, 1.78, 1.79 util-linux-2.13-init.patch, 1.1, NONE



Author: kzak

Update of /cvs/dist/rpms/util-linux/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv883

Modified Files:
	.cvsignore sources util-linux-2.13-moretc.patch 
	util-linux-2.13-nfsv4.patch util-linux.spec 
Added Files:
	util-linux-2.13-usrsbin.patch 
Removed Files:
	util-linux-2.13-init.patch 
Log Message:
- pre2 version

util-linux-2.13-usrsbin.patch:
 Makefile.am |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE util-linux-2.13-usrsbin.patch ---
--- util-linux-2.13-pre2/sys-utils/Makefile.am.usrsbin	2005-08-17 12:55:07.000000000 +0200
+++ util-linux-2.13-pre2/sys-utils/Makefile.am	2005-08-17 12:55:24.000000000 +0200
@@ -23,9 +23,9 @@
 man_MANS += rdev.8 ramsize.8 rootflags.8 vidmode.8
 
 install-exec-hook:
-	cd $(DESTDIR)$(usrsbindir) && ln -sf rdev ramsize
-	cd $(DESTDIR)$(usrsbindir) && ln -sf rdev vidmode
-	cd $(DESTDIR)$(usrsbindir) && ln -sf rdev rootflags
+	cd $(DESTDIR)$(usrsbinexecdir) && ln -sf rdev ramsize
+	cd $(DESTDIR)$(usrsbinexecdir) && ln -sf rdev vidmode
+	cd $(DESTDIR)$(usrsbinexecdir) && ln -sf rdev rootflags
 
 endif
 


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/util-linux/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	16 Aug 2005 17:58:01 -0000	1.14
+++ .cvsignore	17 Aug 2005 11:53:18 -0000	1.15
@@ -1,4 +1,4 @@
 cramfs-1.1.tar.gz
 floppy-0.12.tar.gz
 kbdrate.tar.gz
-util-linux-2.13-pre1.tar.bz2
+util-linux-2.13-pre2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/util-linux/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	16 Aug 2005 17:58:01 -0000	1.14
+++ sources	17 Aug 2005 11:53:18 -0000	1.15
@@ -1,4 +1,4 @@
 d3912b9f7bf745fbfea68f6a9b9de30f  cramfs-1.1.tar.gz
 7d3ac81855e26687dada6a31d2677875  floppy-0.12.tar.gz
 555e4bd2a23347fddac4268cbf4e1fe4  kbdrate.tar.gz
-d65154c41657f7bcb1b2025cdbe588a7  util-linux-2.13-pre1.tar.bz2
+9df13e6a02ed4292966693533ae768aa  util-linux-2.13-pre2.tar.bz2

util-linux-2.13-moretc.patch:
 Makefile.am |    7 ++-----
 more.c      |   53 +++++++++++++++++++++++++++++++++++++++++++++++++----
 2 files changed, 51 insertions(+), 9 deletions(-)

Index: util-linux-2.13-moretc.patch
===================================================================
RCS file: /cvs/dist/rpms/util-linux/devel/util-linux-2.13-moretc.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- util-linux-2.13-moretc.patch	16 Aug 2005 17:58:01 -0000	1.1
+++ util-linux-2.13-moretc.patch	17 Aug 2005 11:53:18 -0000	1.2
@@ -1,11 +1,11 @@
---- util-linux-2.13-pre1/text-utils/Makefile.am.moretc	2005-08-01 20:11:07.000000000 +0200
-+++ util-linux-2.13-pre1/text-utils/Makefile.am	2005-08-15 13:36:12.000000000 +0200
+--- util-linux-2.13-pre2/text-utils/Makefile.am.moretc	2005-08-17 10:40:44.000000000 +0200
++++ util-linux-2.13-pre2/text-utils/Makefile.am	2005-08-17 10:41:52.000000000 +0200
 @@ -7,16 +7,13 @@
  man_MANS = col.1 colcrt.1 colrm.1 column.1 hexdump.1 rev.1 line.1 tailf.1
  
  if HAVE_NCURSES
 -bin_PROGRAMS = more
- usrbin_PROGRAMS += ul pg
+ usrbinexec_PROGRAMS += ul pg
 -more_LDADD = -lncurses
  pg_LDADD = -lncurses
  ul_LDADD = -lncurses
@@ -19,9 +19,8 @@
  man_MANS += more.1
  endif
 -endif
-\ No newline at end of file
---- util-linux-2.13-pre1/text-utils/more.c.moretc	2005-07-28 23:49:31.000000000 +0200
-+++ util-linux-2.13-pre1/text-utils/more.c	2005-08-15 13:40:55.000000000 +0200
+--- util-linux-2.13-pre2/text-utils/more.c.moretc	2005-07-28 23:49:31.000000000 +0200
++++ util-linux-2.13-pre2/text-utils/more.c	2005-08-17 10:40:23.000000000 +0200
 @@ -59,6 +59,8 @@
  #include "nls.h"
  #include "widechar.h"

util-linux-2.13-nfsv4.patch:
 Makefile.am  |    4 
 mount.8      |   75 +++
 mount.c      |   10 
 nfs.5        |  219 +++++++++
 nfs4_mount.h |   82 +++
 nfs4mount.c  |  433 ++++++++++++++++++
 nfs_mount4.h |   22 
 nfsmount.c   | 1361 +++++++++++++++++++++++++++++++++++++++--------------------
 sundries.h   |    4 
 umount.c     |    7 
 10 files changed, 1757 insertions(+), 460 deletions(-)

Index: util-linux-2.13-nfsv4.patch
===================================================================
RCS file: /cvs/dist/rpms/util-linux/devel/util-linux-2.13-nfsv4.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- util-linux-2.13-nfsv4.patch	16 Aug 2005 17:58:01 -0000	1.1
+++ util-linux-2.13-nfsv4.patch	17 Aug 2005 11:53:18 -0000	1.2
@@ -1,5 +1,5 @@
---- util-linux-2.13-pre1/mount/mount.8.nfsv4	2005-08-02 19:34:16.000000000 +0200
-+++ util-linux-2.13-pre1/mount/mount.8	2005-08-12 13:32:53.000000000 +0200
+--- util-linux-2.13-pre2/mount/mount.8.nfsv4	2005-08-02 19:34:16.000000000 +0200
++++ util-linux-2.13-pre2/mount/mount.8	2005-08-17 10:44:06.000000000 +0200
 @@ -384,6 +384,7 @@
  .IR msdos ,
  .IR ncpfs ,
@@ -104,8 +104,8 @@
  .SH "Mount options for ntfs"
  .TP
  .BI iocharset= name
---- util-linux-2.13-pre1/mount/nfs.5.nfsv4	2002-06-27 23:31:33.000000000 +0200
-+++ util-linux-2.13-pre1/mount/nfs.5	2005-08-12 13:32:53.000000000 +0200
+--- util-linux-2.13-pre2/mount/nfs.5.nfsv4	2002-06-27 23:31:33.000000000 +0200
++++ util-linux-2.13-pre2/mount/nfs.5	2005-08-17 10:44:06.000000000 +0200
 @@ -3,7 +3,7 @@
  .\" patches. "
  .TH NFS 5 "20 November 1993" "Linux 0.99" "Linux Programmer's Manual"
@@ -373,8 +373,8 @@
  .SH FILES
  .I /etc/fstab
  .SH "SEE ALSO"
---- util-linux-2.13-pre1/mount/umount.c.nfsv4	2005-08-12 13:30:46.000000000 +0200
-+++ util-linux-2.13-pre1/mount/umount.c	2005-08-12 13:41:23.000000000 +0200
+--- util-linux-2.13-pre2/mount/umount.c.nfsv4	2005-08-17 10:44:06.000000000 +0200
++++ util-linux-2.13-pre2/mount/umount.c	2005-08-17 10:44:06.000000000 +0200
 @@ -88,6 +88,9 @@
  /* True if ruid != euid.  */
  int suid = 0;
@@ -410,8 +410,8 @@
   
  	umnt_err = umnt_err2 = 0;
  	if (lazy) {
---- util-linux-2.13-pre1/mount/Makefile.am.nfsv4	2005-08-12 14:20:40.000000000 +0200
-+++ util-linux-2.13-pre1/mount/Makefile.am	2005-08-12 14:21:44.000000000 +0200
+--- util-linux-2.13-pre2/mount/Makefile.am.nfsv4	2005-08-17 10:45:20.000000000 +0200
++++ util-linux-2.13-pre2/mount/Makefile.am	2005-08-17 10:46:34.000000000 +0200
 @@ -8,14 +8,14 @@
  mount_SOURCES = mount.c fstab.c sundries.c xmalloc.c realpath.c mntent.c \
  	get_label_uuid.c mount_by_label.c mount_blkid.c mount_guess_fstype.c \
@@ -420,17 +420,17 @@
 +	nfsmount.c nfsmount_xdr.c nfsmount_clnt.c nfs4mount.c \
  	lomount.c
  
- mount_LDADD = $(top_srcdir)/lib/libenv.la $(top_srcdir)/lib/libsetproctitle.la
+ mount_LDADD = $(top_srcdir)/lib/libenv.a $(top_srcdir)/lib/libsetproctitle.a
  
  umount_SOURCES = umount.c fstab.c sundries.c xmalloc.c realpath.c mntent.c \
  	getusername.c get_label_uuid.c mount_by_label.c mount_blkid.c \
 -	lomount.c
 +	lomount.c nfsmount.c nfsmount_xdr.c
  
- umount_LDADD = $(top_srcdir)/lib/libenv.la
+ umount_LDADD = $(top_srcdir)/lib/libenv.a
  
---- /dev/null	2005-08-10 15:18:23.129961080 +0200
-+++ util-linux-2.13-pre1/mount/nfs4mount.c	2005-08-12 13:32:53.000000000 +0200
+--- /dev/null	2005-08-13 21:51:43.225642488 +0200
++++ util-linux-2.13-pre2/mount/nfs4mount.c	2005-08-17 10:44:06.000000000 +0200
 @@ -0,0 +1,433 @@
 +/*
 + * nfs4mount.c -- Linux NFS mount
@@ -865,8 +865,8 @@
 +	}
 +	return retval;
 +}
---- util-linux-2.13-pre1/mount/mount.c.nfsv4	2005-08-12 13:30:46.000000000 +0200
-+++ util-linux-2.13-pre1/mount/mount.c	2005-08-12 14:11:17.000000000 +0200
+--- util-linux-2.13-pre2/mount/mount.c.nfsv4	2005-08-17 10:44:06.000000000 +0200
++++ util-linux-2.13-pre2/mount/mount.c	2005-08-17 10:44:06.000000000 +0200
 @@ -875,8 +875,18 @@
  	goto out;
      }
@@ -886,8 +886,8 @@
  
    if (!fake)
      mnt5_res = guess_fstype_and_mount (spec, node, &types, flags & ~MS_NOSYS,
---- /dev/null	2005-08-10 15:18:23.129961080 +0200
-+++ util-linux-2.13-pre1/mount/nfs4_mount.h	2005-08-12 13:32:53.000000000 +0200
+--- /dev/null	2005-08-13 21:51:43.225642488 +0200
++++ util-linux-2.13-pre2/mount/nfs4_mount.h	2005-08-17 10:44:06.000000000 +0200
 @@ -0,0 +1,82 @@
 +#ifndef _LINUX_NFS4_MOUNT_H
 +#define _LINUX_NFS4_MOUNT_H
@@ -971,8 +971,8 @@
 +#define RPC_AUTH_GSS_SPKMP      390011
 +
 +#endif
---- util-linux-2.13-pre1/mount/nfsmount.c.nfsv4	2005-08-01 00:18:17.000000000 +0200
-+++ util-linux-2.13-pre1/mount/nfsmount.c	2005-08-12 14:01:14.000000000 +0200
+--- util-linux-2.13-pre2/mount/nfsmount.c.nfsv4	2005-08-01 00:18:17.000000000 +0200
++++ util-linux-2.13-pre2/mount/nfsmount.c	2005-08-17 10:44:06.000000000 +0200
 @@ -32,6 +32,7 @@
   * nfsmount.c,v 1.1.1.1 1993/11/18 08:40:51 jrs Exp
   */
@@ -2544,8 +2544,8 @@
  
  /*
   * We need to translate between nfs status return values and
---- util-linux-2.13-pre1/mount/nfs_mount4.h.nfsv4	2000-10-14 16:20:51.000000000 +0200
-+++ util-linux-2.13-pre1/mount/nfs_mount4.h	2005-08-12 13:32:53.000000000 +0200
+--- util-linux-2.13-pre2/mount/nfs_mount4.h.nfsv4	2000-10-14 16:20:51.000000000 +0200
++++ util-linux-2.13-pre2/mount/nfs_mount4.h	2005-08-17 10:44:06.000000000 +0200
 @@ -8,7 +8,9 @@
   * so it is easiest to ignore the kernel altogether (at compile time).
   */
@@ -2587,8 +2587,8 @@
 +#define AUTH_GSS_SPKMP		390011
 +#endif
  
---- util-linux-2.13-pre1/mount/sundries.h.nfsv4	2005-07-29 01:07:31.000000000 +0200
-+++ util-linux-2.13-pre1/mount/sundries.h	2005-08-12 14:04:39.000000000 +0200
+--- util-linux-2.13-pre2/mount/sundries.h.nfsv4	2005-07-29 01:07:31.000000000 +0200
++++ util-linux-2.13-pre2/mount/sundries.h	2005-08-17 10:44:06.000000000 +0200
 @@ -37,6 +37,10 @@
  int nfsmount (const char *spec, const char *node, int *flags,
  	      char **orig_opts, char **opt_args, int *version, int running_bg);


Index: util-linux.spec
===================================================================
RCS file: /cvs/dist/rpms/util-linux/devel/util-linux.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- util-linux.spec	16 Aug 2005 17:58:01 -0000	1.78
+++ util-linux.spec	17 Aug 2005 11:53:18 -0000	1.79
@@ -28,7 +28,7 @@
 Summary: A collection of basic system utilities.
 Name: util-linux
 Version: 2.13
-Release: 0.1.pre1
+Release: 0.2.pre2
 License: distributable
 Group: System Environment/Base
 
@@ -46,8 +46,8 @@
 BuildRequires: audit-libs-devel
 
 ### Sources
-# TODO [stable]: s/2.13-pre1/%{version}/
-Source0: ftp://ftp.win.tue.nl/pub/linux-local/utils/util-linux/util-linux-2.13-pre1.tar.bz2
+# TODO [stable]: s/2.13-pre2/%{version}/
+Source0: ftp://ftp.win.tue.nl/pub/linux-local/utils/util-linux/util-linux-2.13-pre2.tar.bz2
 Source1: util-linux-selinux.pamd
 Source2: util-linux-chsh-chfn.pamd
 Source8: nologin.c
@@ -150,9 +150,10 @@
 Patch205: util-linux-2.12p-execl.patch
 # deprecated the arch command (for compatibility only)
 Patch206: util-linux-2.13-arch.patch
+
 # upstream mistakes
 Patch207: util-linux-2.13-agetty-man.patch
-Patch208: util-linux-2.13-init.patch
+Patch208: util-linux-2.13-usrsbin.patch
 
 # When adding patches, please make sure that it is easy to find out what bug # the 
 # patch fixes.
@@ -167,7 +168,7 @@
 
 %prep
 # TODO [stable]: remove -n
-%setup -q -a 10 -a 11 -a 12 -n util-linux-2.13-pre1
+%setup -q -a 10 -a 11 -a 12 -n util-linux-2.13-pre2
 
 %patch1 -p1 -b .moretc
 %patch70 -p1
@@ -238,9 +239,13 @@
 %define _prefix	""
 
 # configure
-export CFLAGS="%{make_cflags} $RPM_OPT_FLAGS" %{?_smp_mflags}
+# note: we disable tty group (USE_TTY_GROUP) in Makefiles to prevent call chgrp 
+# during the "make install". But we define -DUSE_TTY_GROUP that enable tty groups in
+# *.c files only.
+export CFLAGS="%{make_cflags} -DUSE_TTY_GROUP $RPM_OPT_FLAGS" %{?_smp_mflags}
 %configure \
 	--disable-wall \
+	--disable-use-tty-group \
 	--enable-partx \
 	--enable-login-utils \
 	--enable-kill \
@@ -379,7 +384,6 @@
 %endif
 %ifarch s390 s390x
 rm -f $RPM_BUILD_ROOT/usr/{bin,sbin}/{fdformat,tunelp,floppy} $RPM_BUILD_ROOT%{_mandir}/man8/{fdformat,tunelp,floppy}.8*
-rm -f $RPM_BUILD_ROOT/%{_sysconfdir}/fdprm
 %endif
 
 # deprecated commands
@@ -449,9 +453,6 @@
 /bin/more
 /bin/kill
 
-%ifnarch s390 s390x
-%config %{_sysconfdir}/fdprm
-%endif
 %config %{_sysconfdir}/pam.d/chfn
 %config %{_sysconfdir}/pam.d/chsh
 %config %{_sysconfdir}/pam.d/login
@@ -638,7 +639,7 @@
 /sbin/losetup
 
 %changelog
-* Tue Aug 16 2005 Karel Zak <kzak redhat com> 2.13-0.1.pre1
+* Tue Aug 16 2005 Karel Zak <kzak redhat com> 2.13-0.2.pre2
 - /usr/share/misc/getopt/* -move-> /usr/share/doc/util-linux-2.13/getopt-*
 - the arch command marked as deprecated
 - removed: elvtune, rescuept and setfdprm


--- util-linux-2.13-init.patch DELETED ---


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]