[quota] 4.02 bump
Petr Pisar
ppisar at fedoraproject.org
Wed Nov 26 12:47:44 UTC 2014
commit c75f5e0a4fe9bbd42c7910ea0f4f5bb0a52febf4
Author: Petr Písař <ppisar at redhat.com>
Date: Wed Nov 26 13:46:59 2014 +0100
4.02 bump
.gitignore | 1 +
quota-3.06-pie.patch | 32 ---
quota-4.01-Add-quotagrpadmins-5-manual-page.patch | 96 --------
quota-4.01-Add-quotasync-1-manual-page.patch | 96 --------
quota-4.01-Add-quotatab-5-manual-page.patch | 78 -------
quota-4.01-Add-warnquota.conf-5-manual-page.patch | 231 -------------------
quota-4.01-Close-FILE-handles-on-error.patch | 101 --------
quota-4.01-Complete-quotasync-usage.patch | 47 ----
quota-4.01-Correct-quotasync-exit-code.patch | 102 --------
...ot-fiddle-with-quota-files-on-XFS-and-GFS.patch | 45 ----
quota-4.01-Fix-various-usage-mistakes.patch | 72 ------
quota-4.01-Improve-rcp.rquota-8-manual-page.patch | 241 --------------------
...-Make-group-warning-message-more-official.patch | 29 ---
...om-grace-period-overflow-in-RPC-transport.patch | 167 --------------
...lock-limit-units-on-setquota-standard-inp.patch | 74 ------
...ecognize-units-at-block-limits-by-edquota.patch | 89 -------
...cognize-units-at-block-limits-by-setquota.patch | 151 ------------
...ecognize-units-at-inode-limits-by-edquota.patch | 105 ---------
...cognize-units-at-inode-limits-by-setquota.patch | 177 --------------
...e-installation-of-manpages-into-section-2.patch | 41 ----
quota-4.01-define_charset_in_mail.patch | 79 -------
...Make-sure-d-provides-at-least-as-much-inf.patch | 63 -----
quota-4.02-Build-rpc.rquotad-as-PIE.patch | 49 ++++
...1-warnquota.patch => quota-4.02-warnquota.patch | 21 +-
quota.spec | 91 +-------
sources | 2 +-
26 files changed, 74 insertions(+), 2206 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a031184..6903535 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ quota-3.17.tar.gz
/quota-4.00-pre1.tar.gz
/quota-4.00.tar.gz
/quota-4.01.tar.gz
+/quota-4.02.tar.gz
diff --git a/quota-4.02-Build-rpc.rquotad-as-PIE.patch b/quota-4.02-Build-rpc.rquotad-as-PIE.patch
new file mode 100644
index 0000000..c612f34
--- /dev/null
+++ b/quota-4.02-Build-rpc.rquotad-as-PIE.patch
@@ -0,0 +1,49 @@
+From f9e56db59fde6e6eccd4c51c5c158ce4eed3b922 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar at redhat.com>
+Date: Wed, 26 Nov 2014 13:00:18 +0100
+Subject: [PATCH] Build rpc.rquotad as PIE
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Petr Písař <ppisar at redhat.com>
+---
+ Makefile.in | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 7d25930..25f1203 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -48,6 +48,9 @@ LIBOBJS += @LIBMALLOC@
+
+ all: $(PROGS)
+
++svc_socket.o rquota_server.o rquota_svc.o $(filter-out rquota_xdr.o,$(LIBOBJS)): %.o: %.c
++ $(CC) $(CFLAGS) -fpie -c $<
++
+ clean:
+ -rm -f core *.o .*.d
+
+@@ -141,7 +144,8 @@ convertquota: convertquota.o $(LIBOBJS)
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
+
+ rpc.rquotad: rquota_server.o rquota_svc.o svc_socket.o $(LIBOBJS)
+- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
++ $(CC) $(CFLAGS) -pie $(LDFLAGS) -o $@ $^ $(LIBS)
++ @if readelf -d $@|fgrep -q TEXTREL; then echo "*** Text relocation"; false; else true; fi
+
+ ifneq ($(NETLINKLIBS),)
+ quota_nld: quota_nld.o $(LIBOBJS)
+@@ -157,7 +161,7 @@ rquota_xdr.c: rquota.x
+ $(RPCGEN) -c -o $@ $<
+
+ rquota_xdr.o: rquota_xdr.c rquota.h
+- $(CC) $(CFLAGS) -Wno-unused -c $<
++ $(CC) $(CFLAGS) -Wno-unused -fpie -c $<
+
+ rquota_clnt.c: rquota.x
+ $(RPCGEN) -l -o $@ $<
+--
+1.9.3
+
diff --git a/quota-4.01-warnquota.patch b/quota-4.02-warnquota.patch
similarity index 84%
rename from quota-4.01-warnquota.patch
rename to quota-4.02-warnquota.patch
index a713ce9..f61db3f 100644
--- a/quota-4.01-warnquota.patch
+++ b/quota-4.02-warnquota.patch
@@ -1,31 +1,36 @@
-From d2f7a6be1526a6f46cbf37aa27587a51e4d5990f Mon Sep 17 00:00:00 2001
+From b3df689acc31c91dbfbfdc0b03a357e6b0eda2ac 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
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
Rest of changes (378a64006bb1e818e84a1c77808563b802b028fa) not
accepted by upstream (we had root at ... addresses and more enterprise
wordings usually there).
+
+Signed-off-by: Petr Písař <ppisar at redhat.com>
---
warnquota.c | 2 +-
warnquota.conf | 17 ++++++++---------
2 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/warnquota.c b/warnquota.c
-index 08827f2..c7ca6f2 100644
+index 009d9e9..93ed1ff 100644
--- a/warnquota.c
+++ b/warnquota.c
-@@ -806,7 +806,7 @@ static int readconfigfile(const char *filename, struct configparams *config)
+@@ -825,7 +825,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)
++ 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 2a72b78..77f6a75 100644
+index 59d4f5f..aee2fca 100644
--- a/warnquota.conf
+++ b/warnquota.conf
@@ -4,17 +4,16 @@
@@ -64,8 +69,8 @@ index 2a72b78..77f6a75 100644
-SIGNATURE = See you!| Your admin of %h|
+SIGNATURE = root at example.com
# 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:|
+ GROUP_MESSAGE = Hello,|\
+ your group %i is using too much disk space at %h.|\
--
-1.7.11.4
+1.9.3
diff --git a/quota.spec b/quota.spec
index 5cb7a09..8f64943 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.01
-Release: 14%{?dist}
+Version: 4.02
+Release: 1%{?dist}
# quota_nld.c, quotaio_xfs.h: GPLv2
# bylabel.c copied from util-linux: GPLv2+
# svc_socket.c copied from glibc: LGPLv2+
@@ -25,50 +25,9 @@ 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.01-warnquota.patch
-Patch2: quota-3.06-pie.patch
-Patch3: quota-3.13-wrong-ports.patch
-# Submitted to upstream, SF#3571486
-Patch4: quota-4.01-Make-group-warning-message-more-official.patch
-# In upstream after 4.01, SF#3571589
-Patch5: quota-4.01-define_charset_in_mail.patch
-# In upstream after 4.01, SF#3602786, bug #846296
-Patch6: quota-4.01-Do-not-fiddle-with-quota-files-on-XFS-and-GFS.patch
-# In upstream after 4.01, SF#3602777
-Patch7: quota-4.01-quotacheck-Make-sure-d-provides-at-least-as-much-inf.patch
-# In upstream after 4.01, SF#3607034
-Patch8: quota-4.01-Add-quotasync-1-manual-page.patch
-# In upstream after 4.01, SF#3607034
-Patch9: quota-4.01-Complete-quotasync-usage.patch
-# In upstream after 4.01, SF#3607034
-Patch10: quota-4.01-Correct-quotasync-exit-code.patch
-# In upstream after 4.01, SF#3607038
-Patch11: quota-4.01-Fix-various-usage-mistakes.patch
-# In upstream after 4.01, SF#3600120
-Patch12: quota-4.01-Recognize-units-at-block-limits-by-setquota.patch
-# In upstream after 4.01, SF#3600120
-Patch13: quota-4.01-Recognize-block-limit-units-on-setquota-standard-inp.patch
-# In upstream after 4.01, SF#3600120
-Patch14: quota-4.01-Recognize-units-at-block-limits-by-edquota.patch
-# In upstream after 4.01, SF#3600120
-Patch15: quota-4.01-Recognize-units-at-inode-limits-by-setquota.patch
-# In upstream after 4.01, SF#3600120
-Patch16: quota-4.01-Recognize-units-at-inode-limits-by-edquota.patch
-# In upstream after 4.01
-Patch17: quota-4.01-Close-FILE-handles-on-error.patch
-# In upstream after 4.01
-Patch18: quota-4.01-Remove-installation-of-manpages-into-section-2.patch
-# In upstream after 4.01, <https://sourceforge.net/p/linuxquota/patches/39/>
-Patch19: quota-4.01-Add-quotagrpadmins-5-manual-page.patch
-# In upstream after 4.01, <https://sourceforge.net/p/linuxquota/patches/39/>
-Patch20: quota-4.01-Add-quotatab-5-manual-page.patch
-# In upstream after 4.01, <https://sourceforge.net/p/linuxquota/patches/39/>
-Patch21: quota-4.01-Add-warnquota.conf-5-manual-page.patch
-# In upstream after 4.01, <https://sourceforge.net/p/linuxquota/patches/39/>
-Patch22: quota-4.01-Improve-rcp.rquota-8-manual-page.patch
-# In upstream after 4.01, <https://sourceforge.net/p/linuxquota/bugs/115/>,
-# bug #1072769
-Patch23: quota-4.01-Prevent-from-grace-period-overflow-in-RPC-transport.patch
+Patch0: quota-4.02-warnquota.patch
+Patch1: quota-4.02-Build-rpc.rquotad-as-PIE.patch
+Patch2: quota-3.13-wrong-ports.patch
%description
The quota package contains system administration tools for monitoring
@@ -140,42 +99,9 @@ Linux/UNIX environment.
%setup -q -n quota-tools
%patch0 -p1
%ifnarch ppc ppc64
-%patch2 -p1
+%patch1 -p1
%endif
-%patch3 -p1
-%patch4 -p1 -b .group_warning
-%patch5 -p1 -b .charset_in_mail
-%patch6 -p1 -b .gfs_files
-%patch7 -p1 -b .quotackeck_debug
-%patch8 -p1 -b .quotasync_manual
-%patch9 -p1 -b .quotasync_usage
-%patch10 -p1 -b .quotasync_exit
-%patch11 -p1 -b .usage
-%patch12 -p1 -b .setquota_block_units
-%patch13 -p1 -b .setquota_block_units_stdin
-%patch14 -p1 -b .edquota_block_units
-%patch15 -p1 -b .setquota_inode_units
-%patch16 -p1 -b .edquota_inode_units
-%patch17 -p1 -b .close_file_handles
-%patch18 -p1 -b .remove_man2
-%patch19 -p1 -b .doc_quotagrpadmins
-%patch20 -p1 -b .doc_quotatab
-%patch21 -p1 -b .doc_warnquota
-%patch22 -p1 -b .doc_rquota
-%patch23 -p1 -b .rpc_time
-
-#fix typos/mistakes in localized documentation
-for pofile in $(find ./po/*.p*)
-do
- sed -i 's/editting/editing/' "$pofile"
-done
-
-# Fix charset
-for F in Changelog; do
- iconv -f latin1 -t utf-8 <"$F" >"${F}.utf8"
- touch -r "$F"{,.utf8}
- mv "$F"{.utf8,}
-done
+%patch2 -p1
%build
@@ -259,6 +185,9 @@ install -p -m644 -D %{SOURCE2} \
%changelog
+* Wed Nov 26 2014 Petr Pisar <ppisar at redhat.com> - 1:4.02-1
+- 4.02 bump
+
* Sun Aug 17 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:4.01-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
diff --git a/sources b/sources
index 50c2880..f8d0b4e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5c2c31e321d2e1322ce12d69ae5c66d6 quota-4.01.tar.gz
+a8a5df262261e659716ccad2a5d6df0d quota-4.02.tar.gz
More information about the scm-commits
mailing list