Accepting request 79244 from home:vitezslav_cizek:branches:Base:System
- update to 4.00-pre1 - dropped nfs-mntpoint patch (merged upstream) OBS-URL: https://build.opensuse.org/request/show/79244 OBS-URL: https://build.opensuse.org/package/show/Base:System/quota?expand=0&rev=15
This commit is contained in:
parent
4dbf6468df
commit
e616138679
@ -1,11 +1,13 @@
|
|||||||
--- Makefile.in
|
Index: Makefile.in
|
||||||
|
===================================================================
|
||||||
|
--- Makefile.in.orig
|
||||||
+++ Makefile.in
|
+++ Makefile.in
|
||||||
@@ -16,16 +16,16 @@
|
@@ -10,16 +10,16 @@ LDFLAGS = @LDFLAGS@
|
||||||
CFLAGS += @HOSTS_ACCESS@
|
LDAPLIBS = @LDAPLIBS@
|
||||||
|
|
||||||
INSTALL = @INSTALL@
|
INSTALL = @INSTALL@
|
||||||
-STRIP = -s
|
-STRIP = -s
|
||||||
+STRIP =
|
+STRIP =
|
||||||
LN = ln -sf
|
LN = ln -sf
|
||||||
ROOTDIR =
|
ROOTDIR =
|
||||||
SUPER_OWNER = root
|
SUPER_OWNER = root
|
||||||
|
@ -1,31 +0,0 @@
|
|||||||
Index: quotasys.c
|
|
||||||
===================================================================
|
|
||||||
RCS file: /cvsroot/linuxquota/quota-tools/quotasys.c,v
|
|
||||||
retrieving revision 1.59
|
|
||||||
retrieving revision 1.60
|
|
||||||
diff -u -r1.59 -r1.60
|
|
||||||
--- quotasys.c 17 Dec 2008 12:40:07 -0000 1.59
|
|
||||||
+++ quotasys.c 21 Sep 2009 15:14:48 -0000 1.60
|
|
||||||
@@ -606,6 +606,10 @@
|
|
||||||
hlist_allocated = START_MNT_POINTS;
|
|
||||||
}
|
|
||||||
|
|
||||||
+ /* If directories are specified, cache all NFS mountpoints */
|
|
||||||
+ if (count && !(mntflags & MS_LOCALONLY))
|
|
||||||
+ mntflags |= MS_NFS_ALL;
|
|
||||||
+
|
|
||||||
if (init_mounts_scan(count, mntpoints, mntflags) < 0)
|
|
||||||
die(2, _("Cannot initialize mountpoint scan.\n"));
|
|
||||||
while ((mnt = get_next_mount())) {
|
|
||||||
@@ -987,9 +991,9 @@
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
if (nfs_fstype(mnt->mnt_type)) {
|
|
||||||
+ /* For network filesystems we must get device from root */
|
|
||||||
+ dev = st.st_dev;
|
|
||||||
if (!(flags & MS_NFS_ALL)) {
|
|
||||||
- /* For network filesystems we must get device from root */
|
|
||||||
- dev = st.st_dev;
|
|
||||||
for (i = 0; i < mnt_entries_cnt && mnt_entries[i].me_dev != dev; i++);
|
|
||||||
}
|
|
||||||
else /* Always behave as if the device was unique */
|
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:4f384ab78356b028bfdd71dfc3fbafc83fe55b38003657e0303e908e2851ffcd
|
|
||||||
size 275641
|
|
3
quota-4.00-pre1.tar.gz
Normal file
3
quota-4.00-pre1.tar.gz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:181a9b90b10bbffaaf9a18e7fef96a5752ab20f7b72d81c472166ab32e415994
|
||||||
|
size 434724
|
@ -1,3 +1,24 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Aug 18 14:08:07 UTC 2011 - vcizek@novell.com
|
||||||
|
|
||||||
|
- update to 4.00-pre1
|
||||||
|
- dropped nfs-mntpoint patch (merged upstream)
|
||||||
|
- Changes in quota-tools from 3.17 to 4.00-pre1:
|
||||||
|
* don't try to set inode flags when getting them failed (Michalski Wojciech)
|
||||||
|
* added liblber to the list of libraries needed for LDAP support (Michael Meskes)
|
||||||
|
* Rewritten configuration script to create config.h (Jan Kara)
|
||||||
|
* Use /proc/mounts for mountpoint scanning (Jan Kara)
|
||||||
|
* Removed use of reserved identifiers (Jan Kara)
|
||||||
|
* Improved manpage of quota_nld (Eddie Eyles)
|
||||||
|
* Fixed long option handling of quota_nld (Jan Kara)
|
||||||
|
* Fixed error reporting when rpc format specified on command line (Jan Kara)
|
||||||
|
* Convert quota limits using rq_bsize from RPC request (Jan Kara)
|
||||||
|
* Added noreturn attribute to die to avoid false warnings (Jan Kara)
|
||||||
|
* 64-bit quota support, rewritten some code to allow clean integration (Jan Kara)
|
||||||
|
* Improved header of quota an repquota output when -s option is used (Jan Kara)
|
||||||
|
* Fixed mountpoint scanning when NFS mountpoint is specified on command line (Jan Kara)
|
||||||
|
* Updated manpage of quotactl(2) (Jan Kara)
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Fri Feb 18 10:46:04 UTC 2011 - vcizek@novell.com
|
Fri Feb 18 10:46:04 UTC 2011 - vcizek@novell.com
|
||||||
|
|
||||||
|
15
quota.spec
15
quota.spec
@ -20,7 +20,7 @@
|
|||||||
|
|
||||||
Name: quota
|
Name: quota
|
||||||
BuildRequires: dbus-1-devel e2fsprogs-devel libnl-devel pkg-config tcpd-devel
|
BuildRequires: dbus-1-devel e2fsprogs-devel libnl-devel pkg-config tcpd-devel
|
||||||
Version: 3.17
|
Version: 4.00
|
||||||
Release: 14
|
Release: 14
|
||||||
PreReq: %insserv_prereq %fillup_prereq
|
PreReq: %insserv_prereq %fillup_prereq
|
||||||
AutoReqProv: on
|
AutoReqProv: on
|
||||||
@ -28,14 +28,12 @@ Group: System/Filesystems
|
|||||||
License: GPLv2
|
License: GPLv2
|
||||||
Url: http://sourceforge.net/projects/linuxquota/
|
Url: http://sourceforge.net/projects/linuxquota/
|
||||||
Summary: Disk Quota System
|
Summary: Disk Quota System
|
||||||
Source: %{name}-%{version}.tar.bz2
|
Source: %{name}-%{version}-pre1.tar.gz
|
||||||
Source1: %{name}-SUSE.tar.bz2
|
Source1: %{name}-SUSE.tar.bz2
|
||||||
Patch1: %{name}-%{version}-makefile.patch
|
Patch1: %{name}-3.17-makefile.patch
|
||||||
Patch2: %{name}-%{version}-man.patch
|
Patch2: %{name}-3.17-man.patch
|
||||||
Patch3: %{name}-%{version}-warnquota.patch
|
Patch3: %{name}-3.17-warnquota.patch
|
||||||
Patch7: %{name}-%{version}-install_nld.patch
|
Patch7: %{name}-3.17-install_nld.patch
|
||||||
# PATCH-FIX-UPSTREAM fixed mountpoint scanning when NFS mountpoint is specified on command line
|
|
||||||
Patch8: %{name}-%{version}-nfs-mntpoint.patch
|
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
|
|
||||||
%description
|
%description
|
||||||
@ -82,7 +80,6 @@ Authors:
|
|||||||
%patch2
|
%patch2
|
||||||
%patch3
|
%patch3
|
||||||
%patch7
|
%patch7
|
||||||
%patch8
|
|
||||||
find -type d -name CVS -exec rm -rf {} \; -prune
|
find -type d -name CVS -exec rm -rf {} \; -prune
|
||||||
find -type d | xargs chmod 755
|
find -type d | xargs chmod 755
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user