Accepting request 178905 from home:rudi_m

- last changes are ompatible again with openSUSE < 12.3 - update to 4.01 To review only the harmless portability changes only you could compare osc rdiff -r32:6 Base:System/quota home:rudi_m/quota and osc rdiff -r27:6 Base:System/quota home:rudi_m/quota (if rdiff would work at all) OBS-URL: https://build.opensuse.org/request/show/178905 OBS-URL: https://build.opensuse.org/package/show/Base:System/quota?expand=0&rev=33
2013-06-14 12:11:53 +00:00 · 2013-06-14 12:11:53 +00:00 · 908ece3114
commit 908ece3114
parent 9b87663ccc
5 changed files with 69 additions and 10 deletions
--- a/quota-4.00.tar.gz
+++ b/quota-4.00.tar.gz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:eb2b045f58b98299edc568b8607b95b10735b4a131fa5196f41c89b51fb409ba
-size 310827
--- a/quota-4.01-warnquota.patch
+++ b/quota-4.01-warnquota.patch
@ -1,6 +1,6 @@
 --- ./warnquota.conf.orig
 +++ ./warnquota.conf
-@@ -1,55 +1,116 @@
+@@ -1,56 +1,116 @@
 -# this is an example warnquota.conf
 +###################################################################
 +# Configuration file for the warnquota utility
@ -19,7 +19,8 @@
 +###################################################################
 
 -# 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@example.com"
 -# but they don't have to be:
 -SUBJECT 	= Hey, user, clean up your account!
@ -148,7 +149,7 @@
 # if binddn and bindpw are blank or left out, an anonymous bind is used
 # 
 # LDAP_MAIL = false # or true if you want to use it
-@@ -64,6 +125,5 @@
+@@ -65,6 +125,5 @@
 # LDAP_SEARCH_ATTRIBUTE = uid
 # LDAP_MAIL_ATTRIBUTE = mailLocalAddress
 # LDAP_DEFAULT_MAIL_DOMAIN = YourDefaultMailDomain.com
--- a/quota-4.01.tar.gz
+++ b/quota-4.01.tar.gz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a36300bbc126b79b745bf937245092808b4585aa3309ef3335d4ab9d873cd206
+size 458123
--- a/quota.changes
+++ b/quota.changes
@ -1,7 +1,35 @@
+-------------------------------------------------------------------
+Thu Jun 13 20:22:56 UTC 2013 - sweet_f_a@gmx.de
+
+- last changes are compatible again with openSUSE < 12.3
+- update to 4.01
+- Changes in quota-tools from 4.00 to 4.01:
+  * fix compilation failure with --enable-bsd_behaviour=no
+  * fix quota(1) for NFS mountpoints
+  * fix reporting of huge quota limits over rpc
+  * fix repquota to report all users on XFS
+  * fixed edquota(8) for more users (Jan Kara)
+  * remove fixed limit on number of autofs mount points
+  * add quota type names to message catalogue
+  * typo fixes, message changes for easier i18n
+  * created Czech translation
+  * store PID of quota_nld into lock file
+  * warnquota: Fix manpage formatting
+  * warnquota: Allow specifying of filesystems to check
+  * add support for quotas on ext4 in system files
+  * quotaon: Remove duplicated check for hasquota()
+  * quotacheck: Fix warning about journaled quota for 3.0 and newer
+    kernels
+  * edquota: Fix localication of time units (Jan Kara)
+  * rip out ALTFORMAT config option (Jan Kara)
+  * add support for dynamic RPC block to support larger quotas
+  * check set limits fit into the range supported by RPC transport
+  * do not report missing utmp record to syslog
+
 -------------------------------------------------------------------
 Tue May 14 01:45:49 UTC 2013 - crrodriguez@opensuse.org

- portmap --> rpcbind  
+- portmap --> rpcbind

 -------------------------------------------------------------------
 Wed Oct 31 15:39:22 UTC 2012 - crrodriguez@opensuse.org
@ -10,7 +38,7 @@ Wed Oct 31 15:39:22 UTC 2012 - crrodriguez@opensuse.org
  http://www.freedesktop.org/software/systemd/man/systemd-quotacheck.service.html

 - rpc.quota daemon will be migrated to systemd later after investigation
-  on a saner approach. 
+  on a saner approach.

 -------------------------------------------------------------------
 Mon Jun  4 09:42:56 UTC 2012 - sweet_f_a@gmx.de
--- a/quota.spec
+++ b/quota.spec
@ -19,10 +19,14 @@
 Name:           quota
 BuildRequires:  dbus-1-devel
 BuildRequires:  e2fsprogs-devel
+%if 0%{?suse_version} > 1140
 BuildRequires:  libnl-1_1-devel
+%else
+BuildRequires:  libnl-devel
+%endif
 BuildRequires:  pkg-config
 BuildRequires:  tcpd-devel
-Version:        4.00
+Version:        4.01
 Release:        0
 PreReq:         %insserv_prereq %fillup_prereq
 Url:            http://sourceforge.net/projects/linuxquota/
@ -32,7 +36,7 @@ Group:          System/Filesystems
 Source:         %{name}-%{version}.tar.gz
 Source1:        %{name}-SUSE.tar.bz2
 Patch1:         %{name}-4.00-makefile.patch
-Patch2:         %{name}-4.00-warnquota.patch
+Patch2:         %{name}-4.01-warnquota.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

 %description
@ -56,7 +60,11 @@ Requires:       quota = %version
 PreReq:         %insserv_prereq %fillup_prereq
 # Require the services needed to be present for quotad service: portmap, nfsserver, network
 Requires:       nfs-kernel-server
+%if 0%{?suse_version} >= 1230
 Requires:       rpcbind
+%else
+Requires:       portmap
+%endif
 Requires:       sysconfig
 # Split provides
 Provides:       quota:/etc/init.d/quotad
@ -95,7 +103,11 @@ ln -s %{_sbindir}/{quotacheck,quotaon,quotaoff} ${RPM_BUILD_ROOT}/sbin/
 #installing ldap-scripts
 install -m 755 ldap-scripts/*pl ${RPM_BUILD_ROOT}/usr/sbin/
 install -m 755 ldap-scripts/edquota_editor ${RPM_BUILD_ROOT}/usr/sbin/
+%if 0%{?suse_version} >= 1230
 cp SUSE/quotad ${RPM_BUILD_ROOT}/etc/init.d
+%else
+cp SUSE/{quotad,boot.quota} ${RPM_BUILD_ROOT}/etc/init.d
+%endif
 ln -s ../../etc/init.d/quotad ${RPM_BUILD_ROOT}/usr/sbin/rcquotad
 %find_lang %{name}
 cp SUSE/sysconfig.nfs-quota $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.nfs-quota
@ -103,18 +115,36 @@ cp SUSE/sysconfig.nfs-quota $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.n
 %clean
 rm -rf $RPM_BUILD_ROOT

+%if 0%{?suse_version} < 1230
+%post
+%{fillup_and_insserv -f -y boot.quota} 
+%endif
+
 %post nfs
 %{fillup_only -an nfs}

+%if 0%{?suse_version} < 1230
+%preun
+%stop_on_removal boot.quota
+%endif
+
 %preun nfs
 %stop_on_removal quotad

+%if 0%{?suse_version} < 1230
+%postun
+%{insserv_cleanup}
+%endif
+
 %postun nfs
 %{insserv_cleanup}

 %files -f %{name}.lang
 %defattr(-,root,root)
 %config /etc/quotagrpadmins
+%if 0%{?suse_version} < 1230
+%config /etc/init.d/boot.quota
+%endif
 %config /etc/quotatab
 %config /etc/warnquota.conf
 %doc SUSE/README.SUSE README.* doc