[quota] 4.01 bump
Petr Pisar
ppisar at fedoraproject.org
Fri Sep 7 12:36:48 UTC 2012
commit 442211bda2dd44bdb55018897b04cdf78229002f
Author: Petr Písař <ppisar at redhat.com>
Date: Fri Sep 7 14:35:38 2012 +0200
4.01 bump
.gitignore | 1 +
.rpmlint | 3 +
...-not-report-missing-utmp-record-to-syslog.patch | 36 ------
...a-4.00-edquota-Fix-editting-of-more-users.patch | 35 ------
quota-4.00-repquota-Fix-reporting-for-XFS.patch | 35 ------
...imits-fit-into-the-range-supported-by-RPC.patch | 85 --------------
...a-4.00_pre1-Make-RPC-block-factor-dynamic.patch | 82 -------------
quota-4.00_pre1-Store-PID-of-quota_nld.patch | 121 --------------------
...0-warnquota.patch => quota-4.01-warnquota.patch | 21 ++--
quota.spec | 27 +----
sources | 2 +-
11 files changed, 22 insertions(+), 426 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 801481b..a031184 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
quota-3.17.tar.gz
/quota-4.00-pre1.tar.gz
/quota-4.00.tar.gz
+/quota-4.01.tar.gz
diff --git a/.rpmlint b/.rpmlint
new file mode 100644
index 0000000..c260786
--- /dev/null
+++ b/.rpmlint
@@ -0,0 +1,3 @@
+from Config import *
+addFilter("summary-not-capitalized C quota_nld");
+addFilter("spelling-error .* (cron|netlink)");
diff --git a/quota-4.00-warnquota.patch b/quota-4.01-warnquota.patch
similarity index 86%
rename from quota-4.00-warnquota.patch
rename to quota-4.01-warnquota.patch
index 3bf5d29..a713ce9 100644
--- a/quota-4.00-warnquota.patch
+++ b/quota-4.01-warnquota.patch
@@ -1,4 +1,4 @@
-From 500d609f7ed11ed385651d09c2e3f56b092f4ef2 Mon Sep 17 00:00:00 2001
+From d2f7a6be1526a6f46cbf37aa27587a51e4d5990f 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
@@ -7,12 +7,12 @@ Rest of changes (378a64006bb1e818e84a1c77808563b802b028fa) not
accepted by upstream (we had root at ... addresses and more enterprise
wordings usually there).
---
- warnquota.c | 2 +-
- warnquota.conf | 16 ++++++++--------
- 2 files changed, 9 insertions(+), 9 deletions(-)
+ warnquota.c | 2 +-
+ warnquota.conf | 17 ++++++++---------
+ 2 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/warnquota.c b/warnquota.c
-index 2ca286f..3b78647 100644
+index 08827f2..c7ca6f2 100644
--- a/warnquota.c
+++ b/warnquota.c
@@ -806,7 +806,7 @@ static int readconfigfile(const char *filename, struct configparams *config)
@@ -25,14 +25,15 @@ index 2ca286f..3b78647 100644
else
config->use_ldap_mail = 0;
diff --git a/warnquota.conf b/warnquota.conf
-index 8801a88..77f6a75 100644
+index 2a72b78..77f6a75 100644
--- a/warnquota.conf
+++ b/warnquota.conf
-@@ -4,16 +4,16 @@
+@@ -4,17 +4,16 @@
# and even blank lines
# values can be quoted:
--MAIL_CMD = "/usr/my/sendmail/instead/sendmail -t"
+-#MAIL_CMD = "/usr/my/sendmail/instead/sendmail -t"
+-MAIL_CMD = "/bin/echo"
-FROM = "bas at example.com"
+MAIL_CMD = "/usr/sbin/sendmail -t"
+FROM = "root at example.com"
@@ -50,7 +51,7 @@ index 8801a88..77f6a75 100644
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-4444"
+@@ -22,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.
@@ -66,5 +67,5 @@ index 8801a88..77f6a75 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.6
+1.7.11.4
diff --git a/quota.spec b/quota.spec
index f8fac9f..c78f279 100644
--- a/quota.spec
+++ b/quota.spec
@@ -4,8 +4,8 @@
Name: quota
Summary: System administration tools for monitoring users' disk usage
Epoch: 1
-Version: 4.00
-Release: 6%{?dist}
+Version: 4.01
+Release: 1%{?dist}
License: BSD and GPLv2+
URL: http://sourceforge.net/projects/linuxquota/
Group: System Environment/Base
@@ -20,22 +20,10 @@ Source1: quota_nld.service
Source2: quota_nld.sysconfig
# Not accepted changes (378a64006bb1e818e84a1c77808563b802b028fa)
# Some of the lines have been superseded by other commits probably.
-Patch0: quota-4.00-warnquota.patch
+Patch0: quota-4.01-warnquota.patch
Patch1: quota-3.06-man-page.patch
Patch2: quota-3.06-pie.patch
Patch3: quota-3.13-wrong-ports.patch
-# Bug #667757, in upstream after 4.00 (SF#3152423)
-Patch4: quota-4.00_pre1-Make-RPC-block-factor-dynamic.patch
-# Bug #668691, in upstream after 4.00 (SF#3152423)
-Patch5: quota-4.00_pre1-Check-set-limits-fit-into-the-range-supported-by-RPC.patch
-# Bug #634137, in upstream after 4.00 (SF#3171791)
-Patch6: quota-4.00_pre1-Store-PID-of-quota_nld.patch
-# In upstream after 4.00 (SF#3393151), bug #731622
-Patch7: quota-4.00-Do-not-report-missing-utmp-record-to-syslog.patch
-# In upstream after 4.00
-Patch8: quota-4.00-edquota-Fix-editting-of-more-users.patch
-# Bug #837341, in upstream after 4.00
-Patch9: quota-4.00-repquota-Fix-reporting-for-XFS.patch
%description
@@ -111,12 +99,6 @@ Linux/UNIX environment.
%patch2 -p1
%endif
%patch3 -p1
-%patch4 -p1 -b .rpc_block_factor_dynamic
-%patch5 -p1 -b .check_set_limits_rpc
-%patch6 -p1 -b .store_pid
-%patch7 -p1 -b .suppress_missing_utmp
-%patch8 -p1 -b .edquota_more_users
-%patch9 -p1 -b .repqouta_xfs
#fix typos/mistakes in localized documentation
for pofile in $(find ./po/*.p*)
@@ -231,6 +213,9 @@ echo ' systemd-sysv-convert --apply quota_nld'
%changelog
+* Fri Sep 07 2012 Petr Pisar <ppisar at redhat.com> - 1:4.01-1
+- 4.01 bump
+
* Wed Aug 22 2012 Petr Pisar <ppisar at redhat.com> - 1:4.00-6
- Modernize systemd scriptlets (bug #850288)
diff --git a/sources b/sources
index c62d265..50c2880 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-975f587ff761a60ac25dbe6c00865925 quota-4.00.tar.gz
+5c2c31e321d2e1322ce12d69ae5c66d6 quota-4.01.tar.gz
More information about the scm-commits
mailing list