diff --git a/quota-3.17-makefile.patch b/quota-4.00-makefile.patch similarity index 56% rename from quota-3.17-makefile.patch rename to quota-4.00-makefile.patch index f50c2ea..e12c02b 100644 --- a/quota-3.17-makefile.patch +++ b/quota-4.00-makefile.patch @@ -1,13 +1,6 @@ -Index: Makefile.in -=================================================================== ---- Makefile.in.orig -+++ Makefile.in -@@ -10,16 +10,16 @@ LDFLAGS = @LDFLAGS@ - LDAPLIBS = @LDAPLIBS@ - - INSTALL = @INSTALL@ --STRIP = -s -+STRIP = +--- Makefile.in.orig 2011-02-01 16:47:41.000000000 +0100 ++++ Makefile.in 2012-05-31 21:02:43.495728986 +0200 +@@ -14,12 +14,12 @@ STRIP = @STRIP@ LN = ln -sf ROOTDIR = SUPER_OWNER = root diff --git a/quota-4.00-pre1.tar.gz b/quota-4.00-pre1.tar.gz deleted file mode 100644 index fbeacc0..0000000 --- a/quota-4.00-pre1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:181a9b90b10bbffaaf9a18e7fef96a5752ab20f7b72d81c472166ab32e415994 -size 434724 diff --git a/quota-3.17-warnquota.patch b/quota-4.00-warnquota.patch similarity index 96% rename from quota-3.17-warnquota.patch rename to quota-4.00-warnquota.patch index bc1edf8..bb5efee 100644 --- a/quota-3.17-warnquota.patch +++ b/quota-4.00-warnquota.patch @@ -1,4 +1,4 @@ ---- ./warnquota.conf +--- ./warnquota.conf.orig +++ ./warnquota.conf @@ -1,55 +1,116 @@ -# this is an example warnquota.conf @@ -20,10 +20,10 @@ -# values can be quoted: -MAIL_CMD = "/usr/my/sendmail/instead/sendmail -t" --FROM = "bas@localhost" +-FROM = "bas@example.com" -# but they don't have to be: -SUBJECT = Hey, user, clean up your account! --CC_TO = "sysadm@localhost" +-CC_TO = "sysadm@example.com" +# +# Comment this out or remove it once you have edited this config file +# @@ -47,7 +47,7 @@ # 12 hours, 5 days) +# # CC_BEFORE = 2 days --SUPPORT = "support@myhost.com" +-SUPPORT = "support@example.com" -PHONE = "(123) 456-1111 or (222) 333-4444" + +# @@ -147,7 +147,7 @@ + # 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 + # LDAP_MAIL = false # or true if you want to use it @@ -64,6 +125,5 @@ # LDAP_SEARCH_ATTRIBUTE = uid # LDAP_MAIL_ATTRIBUTE = mailLocalAddress diff --git a/quota-4.00.tar.gz b/quota-4.00.tar.gz new file mode 100644 index 0000000..44f94e3 --- /dev/null +++ b/quota-4.00.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eb2b045f58b98299edc568b8607b95b10735b4a131fa5196f41c89b51fb409ba +size 310827 diff --git a/quota.changes b/quota.changes index 11170d9..0b4a80d 100644 --- a/quota.changes +++ b/quota.changes @@ -1,3 +1,51 @@ +------------------------------------------------------------------- +Mon Jun 4 09:42:56 UTC 2012 - sweet_f_a@gmx.de + +- update to 4.00 final +- Changes in quota-tools from 4.00-pre1 to 4.00: + * get_qf_name() does not check quota file presence (Petr Pisar) + * report quotacheck failures by return code (Petr Pisar) + * make global symbols static as possible (Petr Pisar) + * implement repquota for filesystems without quota files (Jan Kara) + * initialize v2r1 ddquot padding in dump (Jan Kara) + * fix ddquot buffer leak (Petr Pisar) + * fix check in setgraces() in setquota.c (Petr Pisar) + * forbid grace time setting over RPC (Jan Kara) + * fix synopsis and properly report errors during remote grace period setting (Jan Kara) + * do not use real domains in warnquota example (Petr Pisar) + * make RPC handle properly host names with colons (Jan Kara) + * explain meaning of the second column in repquota output (Jan Kara) + * initialize vfsold block and inode value boundaries for new quota file (Petr Pisar) + * setquota manpage typo fix (John Bradshaw) + * implement quotacheck for GFS2 (Abhijith Das) + * add quotasync tool (Abhijith Das) + * correct --no-mixed-pathnames documentation (Petr Pisar) + * allow admin to not strip quota binaries while installing them (Jan Kara) + * document --always-resolve at edquota and setquota (Petr Pisar) + * comment example quotatab to silent warnquota (Petr Pisar) + * improve comments in warnquota.conf (Ondrej Vasik) + * fix help text for quotaoff (Ondrej Vasik) + * make quota, setquota, and edquota recognize -h option (Ondrej Vasik) + * check whether set limits fit into range supported by quota format (Jan Kara) + * add next3 support (Amir G) + * remove checking of filesystem type from hasquota() (Jan Kara) + * create quota-nfs.sh script for nicer quota(1) output formatting on some NFS clients (Jan Kara) + * add options for quota(1) modifying formatting of filesystem identificaion (Jan Kara) + * minor updates of manpages (Jan Kara) + * quotactl manpage was moved to man-pages package (Jan Kara) + * fix quotaon to work properly with XFS filesystems (Eric Sandeen, Jan Kara) + * fix quotaon to print all informational messages only in verbose mode (Jan Kara) + * fix warnquota manpage to not speak about RPC (Jan Kara) + * fix repquota to get latest quota info header (Jan Kara) + * do not count system inodes into quota for ext[234] (Jan Kara) + * improve detection of XFS kernel quota interface (Jan Kara) + * support of GFS2 filesystem (Christoph Hellwig) + * avoid memory corruption of NULL address (Petr Pisar) + * fixup typos in manpages (Michael Meskes) + * added german translation (Michael Bunk) + * added --enable-static-link configure option (Jan Kara) + + ------------------------------------------------------------------- Thu May 31 19:36:13 UTC 2012 - sweet_f_a@gmx.de diff --git a/quota.spec b/quota.spec index 1077ab7..b1f42c9 100644 --- a/quota.spec +++ b/quota.spec @@ -29,10 +29,10 @@ Url: http://sourceforge.net/projects/linuxquota/ Summary: Disk Quota System License: GPL-2.0 and BSD-3-Clause Group: System/Filesystems -Source: %{name}-%{version}-pre1.tar.gz +Source: %{name}-%{version}.tar.gz Source1: %{name}-SUSE.tar.bz2 -Patch1: %{name}-3.17-makefile.patch -Patch3: %{name}-3.17-warnquota.patch +Patch1: %{name}-4.00-makefile.patch +Patch2: %{name}-4.00-warnquota.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -75,14 +75,13 @@ Authors: %prep %setup -q -n quota-tools -a 1 %patch1 -%patch3 -find -type d -name CVS -exec rm -rf {} \; -prune -find -type d | xargs chmod 755 +%patch2 %build %configure \ --sysconfdir=%{_sysconfdir} \ - --enable-netlink + --enable-netlink \ + --enable-strip-binaries=no make %install @@ -90,8 +89,6 @@ install -d -m 755 ${RPM_BUILD_ROOT}/etc/init.d install -d -m 755 ${RPM_BUILD_ROOT}/sbin install -d -m 755 ${RPM_BUILD_ROOT}/var/adm/fillup-templates make install ROOTDIR=${RPM_BUILD_ROOT} -#quotactl.2 manual page was moved from quota to man-pages[bnc#587393] -rm ${RPM_BUILD_ROOT}/%{_mandir}/man?/quotactl.* #UsrMerge ln -s %{_sbindir}/{quotacheck,quotaon,quotaoff} ${RPM_BUILD_ROOT}/sbin/ #EndUsrMerge @@ -138,6 +135,7 @@ rm -rf $RPM_BUILD_ROOT /sbin/quotaon #EndUsrMerge %{_bindir}/quota +%{_bindir}/quotasync %{_sbindir}/applySystemQuotas.pl %{_sbindir}/convertquota %{_sbindir}/edquota