[quota] 4.00 bump
Petr Pisar
ppisar at fedoraproject.org
Tue Aug 23 15:50:40 UTC 2011
commit 4b1641c35339e0ba7a2341ea968b4d44269635ee
Author: Petr Písař <ppisar at redhat.com>
Date: Tue Aug 23 15:20:03 2011 +0200
4.00 bump
.gitignore | 1 +
quota-3.16-helpoption.patch | 58 ------
quota-3.16-quotaoffhelp.patch | 22 --
...not-use-real-domains-in-warnquota-example.patch | 10 +-
...tripping.patch => quota-4.00-no-stripping.patch | 28 ++-
...6-warnquota.patch => quota-4.00-warnquota.patch | 72 ++++---
...re1-Add-always-resolve-to-quota.1-manpage.patch | 28 ---
quota-4.00_pre1-Add-quotasync-tool.patch | 182 -----------------
...-reference-to-setquota-to-quota-1-manpage.patch | 35 ----
...er-set-limits-fit-into-the-range-supporte.patch | 159 ---------------
...-Correct-no-mixed-pathnames-documentation.patch | 57 ------
...nt-always-resolve-at-edquota-and-setquota.patch | 45 ----
...ning-of-the-second-column-in-repquota-out.patch | 48 -----
quota-4.00_pre1-Fix-ddquot-buffer-leak.patch | 41 ----
...s-and-properly-report-errors-during-remot.patch | 85 --------
...0_pre1-Forbid-grace-time-setting-over-RPC.patch | 95 ---------
...a-4.00_pre1-Implement-quotacheck-for-GFS2.patch | 213 --------------------
...e1-Initialize-v2r1-ddquot-padding-in-dump.patch | 30 ---
...vfsold-block-and-inode-value-boundries-fo.patch | 32 ---
...PC-handle-properly-host-names-with-colons.patch | 91 ---------
quota-4.00_pre1-Make-dirname-static.patch | 28 ---
...Report-quotacheck-failures-by-return-code.patch | 203 -------------------
quota-4.00_pre1-Reverse-setgrace-condition.patch | 28 ---
...t-pass-NULL-to-XGETQSTAT-quotactl-since-k.patch | 25 ---
quota-4.00_pre1-add-gfs2-support.patch | 153 --------------
...-repquota-to-get-latest-quota-info-header.patch | 67 ------
quota-4.00_pre1-fixup-typos-in-manpages.patch | 48 -----
quota-4.00_pre1-quotactl_null_corruption.patch | 29 ---
quota.spec | 93 +--------
sources | 2 +-
30 files changed, 78 insertions(+), 1930 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1eaea8e..801481b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
quota-3.17.tar.gz
/quota-4.00-pre1.tar.gz
+/quota-4.00.tar.gz
diff --git a/quota-4.00_pre1-Do-not-use-real-domains-in-warnquota-example.patch b/quota-4.00-Do-not-use-real-domains-in-warnquota-example.patch
similarity index 91%
rename from quota-4.00_pre1-Do-not-use-real-domains-in-warnquota-example.patch
rename to quota-4.00-Do-not-use-real-domains-in-warnquota-example.patch
index 5c95400..53c3a10 100644
--- a/quota-4.00_pre1-Do-not-use-real-domains-in-warnquota-example.patch
+++ b/quota-4.00-Do-not-use-real-domains-in-warnquota-example.patch
@@ -1,6 +1,6 @@
-From 85cb5b094c8e6a352df4c5bdbbfd6af4c47a7ae7 Mon Sep 17 00:00:00 2001
+From c00ee2d477c3f464d81c6ec597b409829aa2b5f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar at redhat.com>
-Date: Mon, 28 Feb 2011 14:16:59 +0100
+Date: Tue, 23 Aug 2011 14:50:30 +0200
Subject: [PATCH] Do not use real domains in warnquota example
Providing private domain names in default warnquota.conf can tend
@@ -10,14 +10,14 @@ some users to reply. Owners of that domain could get mad.
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/warnquota.conf b/warnquota.conf
-index 153b3f2..e70eedf 100644
+index bc95e2c..e70eedf 100644
--- a/warnquota.conf
+++ b/warnquota.conf
@@ -5,15 +5,15 @@
# values can be quoted:
MAIL_CMD = "/usr/sbin/sendmail -t"
--FROM =
+-FROM =
+FROM = root at example.com
# but they don't have to be:
SUBJECT = NOTE: You are exceeding your allocated disk space limits
@@ -42,5 +42,5 @@ index 153b3f2..e70eedf 100644
GROUP_MESSAGE = Hello, a group '%i' you're member of use too much space at %h.|\
I chose you to do the cleanup.|Delete group files on the following filesystems:|
--
-1.7.4
+1.7.6
diff --git a/quota-3.06-no-stripping.patch b/quota-4.00-no-stripping.patch
similarity index 65%
rename from quota-3.06-no-stripping.patch
rename to quota-4.00-no-stripping.patch
index 68d6319..6228f22 100644
--- a/quota-3.06-no-stripping.patch
+++ b/quota-4.00-no-stripping.patch
@@ -1,6 +1,17 @@
---- quota-tools/Makefile.in.orig 2002-07-17 17:07:14.000000000 -0400
-+++ quota-tools/Makefile.in 2002-07-17 18:08:39.000000000 -0400
-@@ -23,8 +23,8 @@ SUPER_OWNER = root
+From e7747ee537e604102606caf5af9f26d7eee1ede9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar at redhat.com>
+Date: Tue, 23 Aug 2011 14:10:46 +0200
+Subject: [PATCH] Do not strip binaries chmod them to 0755
+
+---
+ Makefile.in | 14 +++++++-------
+ 1 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 0b343a3..0f10472 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -17,8 +17,8 @@ SUPER_OWNER = root
BIN_OWNER = bin
BIN_GROUP = bin
DEF_SUID_MODE = 4511
@@ -11,7 +22,7 @@
DEF_MAN_MODE = 444
DEF_CONF_MODE = 644
RPCGEN = rpcgen
-@@ -87,10 +87,10 @@ install: all @INSTMO@
+@@ -78,10 +78,10 @@ install: all @INSTMO@
-mkdir -p $(ROOTDIR)$(sbindir)
-mkdir -p $(ROOTDIR)$(bindir)
-mkdir -p $(ROOTDIR)$(root_sbindir)
@@ -24,13 +35,13 @@
edquota repquota warnquota quotastats setquota quot xqmstats \
convertquota $(ROOTDIR)$(sbindir)
-mkdir -p $(ROOTDIR)$(sysconfdir)
-@@ -99,10 +99,10 @@
+@@ -94,10 +94,10 @@ install: all @INSTMO@
-mkdir -p $(ROOTDIR)$(mandir)/man8
-$(INSTALL) -m 755 -d $(ROOTDIR)$(includedir)/rpcsvc
-$(INSTALL) -m 644 rquota.h rquota.x $(ROOTDIR)$(includedir)/rpcsvc
-- -$(INSTALL) $(STRIP) -m $(DEF_SBIN_MODE) quota $(ROOTDIR)$(bindir)
+- -$(INSTALL) $(STRIP) -m $(DEF_SBIN_MODE) quota quotasync $(ROOTDIR)$(bindir)
- -$(INSTALL) $(STRIP) -m $(DEF_SBIN_MODE) rpc.rquotad $(ROOTDIR)$(sbindir)
-+ -$(INSTALL) -m $(DEF_SBIN_MODE) quota $(ROOTDIR)$(bindir)
++ -$(INSTALL) -m $(DEF_SBIN_MODE) quota quotasync $(ROOTDIR)$(bindir)
+ -$(INSTALL) -m $(DEF_SBIN_MODE) rpc.rquotad $(ROOTDIR)$(sbindir)
ifneq ($(NETLINKLIBS),)
- -$(INSTALL) $(STRIP) -m $(DEF_SBIN_MODE) quota_nld $(ROOTDIR)$(sbindir)
@@ -38,3 +49,6 @@
endif
-$(INSTALL) -m $(DEF_MAN_MODE) *.1 $(ROOTDIR)$(mandir)/man1
-$(INSTALL) -m $(DEF_MAN_MODE) *.2 $(ROOTDIR)$(mandir)/man2
+--
+1.7.6
+
diff --git a/quota-3.06-warnquota.patch b/quota-4.00-warnquota.patch
similarity index 60%
rename from quota-3.06-warnquota.patch
rename to quota-4.00-warnquota.patch
index e93d521..112bd6d 100644
--- a/quota-3.06-warnquota.patch
+++ b/quota-4.00-warnquota.patch
@@ -1,28 +1,57 @@
---- quota-tools/warnquota.conf.orig 2005-07-19 11:51:07.000000000 -0400
-+++ quota-tools/warnquota.conf 2007-02-15 14:58:38.000000000 -0500
+From aaec5ef140322b9b4220ce49be3b2a89754f736c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar at redhat.com>
+Date: Tue, 23 Aug 2011 13:45:15 +0200
+Subject: [PATCH] warnquota configuration tunes
+
+Rest of changes (378a64006bb1e818e84a1c77808563b802b028fa) not
+accepted by upstream.
+
+Some of the lines have been superseeded by other commits probably.
+---
+ warnquota.c | 2 +-
+ warnquota.conf | 16 ++++++++--------
+ 2 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/warnquota.c b/warnquota.c
+index 2ca286f..3b78647 100644
+--- a/warnquota.c
++++ b/warnquota.c
+@@ -806,7 +806,7 @@ static int readconfigfile(const char *filename, struct configparams *config)
+ verify_format(config->group_signature, "GROUP_SIGNATURE");
+ }
+ else if (!strcmp(var, "LDAP_MAIL")) {
+- if(strcasecmp(value, "true") == 0)
++ if(strncasecmp(value, "true", 4) == 0)
+ config->use_ldap_mail = 1;
+ else
+ config->use_ldap_mail = 0;
+diff --git a/warnquota.conf b/warnquota.conf
+index 8801a88..bc95e2c 100644
+--- a/warnquota.conf
++++ b/warnquota.conf
@@ -4,16 +4,16 @@
# and even blank lines
# values can be quoted:
-MAIL_CMD = "/usr/my/sendmail/instead/sendmail -t"
--FROM = "bas at localhost"
+-FROM = "bas at example.com"
+MAIL_CMD = "/usr/sbin/sendmail -t"
-+FROM =
++FROM =
# but they don't have to be:
-SUBJECT = Hey, user, clean up your account!
--CC_TO = "sysadm at localhost"
+-CC_TO = "sysadm at example.com"
+SUBJECT = NOTE: You are exceeding your allocated disk space limits
+CC_TO = "root at localhost"
# If you set this variable CC will be used only when user has less than
# specified grace time left (examples of possible times: 5 seconds, 1 minute,
# 12 hours, 5 days)
# CC_BEFORE = 2 days
--SUPPORT = "support at myhost.com"
+-SUPPORT = "support at example.com"
+SUPPORT = "root at myhost.com"
PHONE = "(123) 456-1111 or (222) 333-4444"
# Text in the beginning of the mail (if not specified, default text is used)
# This way text can be split to more lines
-@@ -21,11 +21,11 @@ PHONE = "(123) 456-1111 or (222) 333-4
+@@ -21,11 +21,11 @@ PHONE = "(123) 456-1111 or (222) 333-4444"
# The expressions %i, %h, %d, and %% are substituted for user/group name,
# host name, domain name, and '%' respectively. For backward compatibility
# %s behaves as %i but is deprecated.
@@ -37,29 +66,6 @@
# Following text is used for mails about group exceeding quotas
GROUP_MESSAGE = Hello, a group '%i' you're member of use too much space at %h.|\
I chose you to do the cleanup.|Delete group files on the following filesystems:|
-@@ -52,10 +52,10 @@ GROUP_SIGNATURE = See you!| Your admin
- # if the attribute isn't found
- # if binddn and bindpw are blank or left out, an anonymous bind is used
- #
--# LDAP_MAIL = false # or false if you don't want to use it
--# If you have at least LDAP 2.3 installed, you can use LDAP_URI
-+# LDAP_MAIL = false # or true if you want to use it
-+# If you have at least LDAP 2.3 installed, you should use LDAP_URI
- # LDAP_URI = ldaps://my.server:389
--# Otherwise you can specify LDAP_HOST and LDAP_PORT
-+# Otherwise you should specify LDAP_HOST and LDAP_PORT
- # LDAP_HOST = ldap
- # LDAP_PORT = 389
- # LDAP_BINDDN = uid=ReadOnlyUser,o=YourOrg
-diff -urNp quota-tools-orig/warnquota.c quota-tools/warnquota.c
---- quota-tools-orig/warnquota.c 2008-10-13 19:29:18.000000000 +0200
-+++ quota-tools/warnquota.c 2009-03-13 14:26:33.000000000 +0100
-@@ -806,7 +806,7 @@ static int readconfigfile(const char *fi
- verify_format(config->group_signature, "GROUP_SIGNATURE");
- }
- else if (!strcmp(var, "LDAP_MAIL")) {
-- if(strcasecmp(value, "true") == 0)
-+ if(strncasecmp(value, "true", 4) == 0)
- config->use_ldap_mail = 1;
- else
- config->use_ldap_mail = 0;
+--
+1.7.6
+
diff --git a/quota.spec b/quota.spec
index b96ecae..dc9ecb1 100644
--- a/quota.spec
+++ b/quota.spec
@@ -5,7 +5,7 @@ Name: quota
Summary: System administration tools for monitoring users' disk usage
Epoch: 1
Version: 4.00
-Release: 0.17.pre1%{?dist}
+Release: 1%{?dist}
License: BSD and GPLv2+
URL: http://sourceforge.net/projects/linuxquota/
Group: System Environment/Base
@@ -14,77 +14,28 @@ Requires: quota-nls = %{epoch}:%{version}-%{release}
Conflicts: kernel < 2.4
BuildRequires: e2fsprogs-devel gettext tcp_wrappers-devel nss-devel
BuildRequires: openldap-devel openssl-devel dbus-devel libnl-devel
-Source0: http://downloads.sourceforge.net/linuxquota/%{name}-%{version}-pre1.tar.gz
+Source0: http://downloads.sourceforge.net/linuxquota/%{name}-%{version}.tar.gz
Source1: quota_nld.init
Source2: quota_nld.sysconfig
-# Part (LDAP comments) accepted into quota-4.00_pre2
-# (378a64006bb1e818e84a1c77808563b802b028fa)
-Patch0: quota-3.06-warnquota.patch
+# Not accepted changes (378a64006bb1e818e84a1c77808563b802b028fa)
+# Some of the lines have been superseded by other commits probably.
+Patch0: quota-4.00-warnquota.patch
# 4.00_pre2 provides --enable-strip-binaries configure option defulting to yes
# TODO: Use the option instead of the patch
-Patch1: quota-3.06-no-stripping.patch
+Patch1: quota-4.00-no-stripping.patch
Patch2: quota-3.06-man-page.patch
Patch3: quota-3.06-pie.patch
Patch4: quota-3.13-wrong-ports.patch
-# Included in upstream 4.00_pre2
-Patch5: quota-3.16-helpoption.patch
-# Included in upstream 4.00_pre2
-Patch6: quota-3.16-quotaoffhelp.patch
Patch8: quota-3.17-ftbfs.patch
-# Bug #528581, remove in upstream 4.00
-Patch9: quota-4.00_pre1-quotactl_null_corruption.patch
-# Included in upstream 4.00_pre2
-Patch10: quota-4.00_pre1-add-gfs2-support.patch
-# In upstream 4.00_pre2
-Patch11: quota-4.00_pre1-Add-always-resolve-to-quota.1-manpage.patch
-# In upstream 4.00_pre2
-Patch12: quota-4.00_pre1-Document-always-resolve-at-edquota-and-setquota.patch
# Bug #667757
Patch13: quota-4.00_pre1-Make-RPC-block-factor-dynamic.patch
-# Bug #668688, included in upstream 4.00_pre2
-Patch14: quota-4.00_pre1-Check-whether-set-limits-fit-into-the-range-supporte.patch
# Bug #668691
Patch15: quota-4.00_pre1-Check-set-limits-fit-into-the-range-supported-by-RPC.patch
-# In upstream 4.00_pre2
-Patch16: quota-4.00_pre1-fixup-typos-in-manpages.patch
-# In upstream 4.00_pre2
-Patch17: quota-4.00_pre1-Added-reference-to-setquota-to-quota-1-manpage.patch
-# In upstream 4.00_pre2
-Patch18: quota-4.00_pre1-Correct-no-mixed-pathnames-documentation.patch
# Bug #634137, submitted to upstream
Patch19: quota-4.00_pre1-Store-PID-of-quota_nld.patch
-# Bug #596794, in upstream 4.00_pre2
-Patch20: quota-4.00_pre1-Add-quotasync-tool.patch
-# Bug #596794, in upstream 4.00_pre2
-Patch21: quota-4.00_pre1-Implement-quotacheck-for-GFS2.patch
-# Bug 668688, in upstream 4.00_pre2
-Patch22: quota-4.00_pre1-Initialize-vfsold-block-and-inode-value-boundries-fo.patch
-# In upstream 4.00_pre2
-Patch23: quota-4.00_pre1-Explain-meaning-of-the-second-column-in-repquota-out.patch
-# In upstream 4.00_pre2
-Patch24: quota-4.00_pre1-Make-RPC-handle-properly-host-names-with-colons.patch
# In upstream 4.00_pre2, SF#3195046
-Patch25: quota-4.00_pre1-Do-not-use-real-domains-in-warnquota-example.patch
-# In upstream 4.00_pre2, SF#3202953
-Patch26: quota-4.00_pre1-Fix-synopsis-and-properly-report-errors-during-remot.patch
-# In upstream 4.00_pre2, SF#3202953
-Patch27: quota-4.00_pre1-Forbid-grace-time-setting-over-RPC.patch
-# In upstream 4.00_pre2, SF#3202953
-Patch28: quota-4.00_pre1-Reverse-setgrace-condition.patch
-# In upstream 4.00_pre2, SF#3206267
-Patch29: quota-4.00_pre1-Fix-ddquot-buffer-leak.patch
-# In upstream 4.00_pre2, bug #689458
-Patch30: quota-4.00_pre1-fix-repquota-to-get-latest-quota-info-header.patch
-# In upstream 4.00_pre2, bug #695409
-Patch31: quota-4.00_pre1-Initialize-v2r1-ddquot-padding-in-dump.patch
-# In upstream 4.00_pre2
-Patch32: quota-4.00_pre1-We-shouldn-t-pass-NULL-to-XGETQSTAT-quotactl-since-k.patch
-# In upstream 4.00_pre2 (SF#3300978), bug #703567
-Patch33: quota-4.00_pre1-Make-dirname-static.patch
-# In upstream 4.00_pre2 (SF#3347047), bug #717982
-Patch34: quota-4.00_pre1-Report-quotacheck-failures-by-return-code.patch
-# In upstream 4.00_pre2 (SF#3347047), bug #717982
-Patch35: quota-4.00_pre1-get_qf_name-does-not-check-quota-file-presence.patch
+# Can be squashed with quota-4.00-warnquota.patch
+Patch25: quota-4.00-Do-not-use-real-domains-in-warnquota-example.patch
# In upstream after 4.00 (SF#3393151), bug #731622
Patch36: quota-4.00-Do-not-report-missing-utmp-record-to-syslog.patch
@@ -163,36 +114,11 @@ Linux/UNIX environment.
%patch3 -p1
%endif
%patch4 -p1
-%patch5 -p1
-%patch6 -p1 -b .usage
%patch8 -p1
-%patch9 -p1 -b .quotactl_null_corruption
-%patch10 -p1 -b .gfs2
-%patch11 -p1 -b .document_always_resolve_quota
-%patch12 -p1 -b .document_always_resolve_setquota
%patch13 -p1 -b .rpc_block_factor_dynamic
-%patch14 -p1 -b .check_set_limits
%patch15 -p1 -b .check_set_limits_rpc
-%patch16 -p1 -b .typos_in_manpages
-%patch17 -p1 -b .reference_to_setquota_doc
-%patch18 -p1 -b .mixed_pathnames_doc
%patch19 -p1 -b .store_pid
-%patch20 -p1 -b .add_quotasync
-%patch21 -p1 -b .gfs2_quotacheck
-%patch22 -p1 -b .inizialize_vfsold_boundries
-%patch23 -p1 -b .explain_second_column_of_repquota
-%patch24 -p1 -b .hostnames_with_columns
%patch25 -p1 -b .warnquota_domains
-%patch26 -p1 -b .fix_grace_synopsis
-%patch27 -p1 -b .forbid_rpc_grace_time
-%patch28 -p1 -b .reverse_setgrace_condition
-%patch29 -p1 -b .fix_ddquot_leak
-%patch30 -p1 -b .repquota_latest_info
-%patch31 -p1 -b .initizalize_ddquot_paddding
-%patch32 -p1 -b .do_not_pass_null_to_XGETQSTAT
-%patch33 -p1 -b .static_dirname
-%patch34 -p1 -b .report_quotacheck_failures
-%patch35 -p1 -b .improve_quotacheck_message
%patch36 -p1 -b .suppress_missing_utmp
# quotactl(2) moved into `man-pages' package (bug #640590)
rm -f quotactl.2
@@ -305,6 +231,9 @@ fi
%changelog
+* Tue Aug 23 2011 Petr Pisar <ppisar at redhat.com> - 1:4.00-1
+- 4.00 bump
+
* Thu Aug 18 2011 Petr Pisar <ppisar at redhat.com> - 1:4.00-0.17.pre1
- Do not report missing utmp record to syslog (bug #731622)
diff --git a/sources b/sources
index 1c8b5e5..c62d265 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ef9d66e8a968ecffd2d9df648fa8ada2 quota-4.00-pre1.tar.gz
+975f587ff761a60ac25dbe6c00865925 quota-4.00.tar.gz
More information about the scm-commits
mailing list