quota-4.04-1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@11952 ec354946-7b23-47d6-9f5a-488ba84defc7

q/quota/quota-vl.spec

@@ -1,27 +1,64 @@
 Name: quota
 Summary: System administration tools for monitoring users' disk usage.
 Summary(ja): ユーザのディスク使用量をモニタするシステム管理ツール
-Version: 4.00
+Version: 4.04
 Release: 1%{?_dist_release}
 License: BSD
 Group: System Environment/Base
 URL: http://sourceforge.net/projects/linuxquota/
+
+Vendor: Project Vine
+Distribution: Vine Linux
+
 #Source0: http://downloads.sourceforge.net/linuxquota/quota-%{version}.tar.gz
 Source0: quota-%{version}.tar.gz
 Source1: quota_nld.init
 Source2: quota_nld.sysconfig
-Patch0:	quota-4.00-warnquota.patch
-Patch1: quota-3.06-man-page.patch
-Patch2: quota-3.06-pie.patch
-Patch3: quota-3.13-wrong-ports.patch
-# Bug #667757, submitted to upstream (SF#3152423)
-Patch4: quota-4.00_pre1-Make-RPC-block-factor-dynamic.patch
-# Bug #668691, submitted to upstream (SF#3152423)
-Patch5: quota-4.00_pre1-Check-set-limits-fit-into-the-range-supported-by-RPC.patch
-# Bug #634137, submitted to upstream (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
+
+# Not accepted changes (378a64006bb1e818e84a1c77808563b802b028fa)
+Patch0: quota-4.04-warnquota-configuration-tunes.patch
+Patch1: quota-4.03-Validate-upper-bound-of-RPC-port.patch
+# Install rquotad(3) only if RPC is enabled,
+# <https://sourceforge.net/p/linuxquota/patches/45/>, in upstream after 4.04
+Patch2: quota-4.04-Install-rquota-3-only-if-RPC-is-enabled.patch
+# Pass TIRPC header files location to all RPC compilation units,
+# <https://sourceforge.net/p/linuxquota/patches/46/>, in upstream after 4.04
+Patch3: quota-4.04-Add-TIRPC_CFLAGS-globally-to-CFLAGS-for-RPC-support-.patch
+# Do not iterate over negative UIDs in repquota,
+# <https://sourceforge.net/p/linuxquota/patches/47/>, in upstream after 4.04
+Patch4: quota-4.04-repquota-Fix-output-when-user-2-exists.patch
+# Fix snprintf overflows in warnquota,
+# <https://sourceforge.net/p/linuxquota/patches/48/>, in upstream after 4.04
+Patch5: quota-4.04-warnquota-Check-snprintf-for-overflows.patch
+# Fix user name search in utmp log,
+# <https://sourceforge.net/p/linuxquota/patches/48/>, in upstream after 4.04
+Patch6: quota-4.04-warnquota-Fix-comparing-user-name-to-non-null-termin.patch
+# Avoid questions in quotacheck non-interactive mode, in upstream after 4.04
+Patch7: quota-4.04-quotacheck-Avoid-question-in-non-interactive-mode.patch
+# Report an error when quotacheck fails to cache quota files,
+# in upstream after 4.04
+Patch8: quota-4.04-quotacheck-Report-error-when-caching-of-quota-file-f.patch
+# Report an error if quota file magic is invalid, in upstream after 4.04
+Patch9: quota-4.04-quotacheck-Fail-check-if-quota-file-magic-is-invalid.patch
+# Fix busy loop in rpc.rquotad, bug #1575956, in upstream after 4.04,
+# <https://sourceforge.net/p/linuxquota/feature-requests/16/>
+Patch10: quota-4.04-Listen-on-a-TCP-socket.patch
+# Fix current block usage limit in RPC client, in upstream after 4.04,
+# <https://sourceforge.net/p/linuxquota/bugs/127/>
+Patch11: quota-4.04-rpc-Fix-wrong-limit-for-space-usage.patch
+# Distinguish between none quota limits and no allocated resources in quota(1)
+# tool output, proposed to upstream,
+# <https://sourceforge.net/p/linuxquota/bugs/128/>
+Patch12: quota-4.04-quota-1-Distinguish-between-none-quota-limits-and-no.patch
+# Fix a descriptor leak, proposed to upstream,
+# <https://sourceforge.net/p/linuxquota/bugs/129/>
+Patch13: quota-4.04-convertquota-Fix-a-file-descriptor-leak-in-convert_e.patch
+# Fix a descriptor leak, proposed to upstream,
+# <https://sourceforge.net/p/linuxquota/bugs/129/>
+Patch14: quota-4.04-quotackeck-Fix-a-directory-descriptor-leak-in-scan_d.patch
+# Fix a descriptor leak, proposed to upstream,
+# <https://sourceforge.net/p/linuxquota/bugs/129/>
+Patch15: quota-4.04-xqmstats-Fix-a-file-descriptor-leak-in-main.patch
 
 BuildRoot: %{_tmppath}/%{name}-root
 Requires: kernel >= 2.4, initscripts >= 6.38
@@ -30,7 +67,7 @@ Requires(preun): chkconfig
 Conflicts: nfs-utils < 1.0.1
 BuildRequires: e2fsprogs-devel, gettext
 BuildRequires: tcp_wrappers, nss-devel
-BuildRequires: openldap-devel, openssl-devel, dbus-devel, libnl-devel
+BuildRequires: openldap-devel, openssl-devel, dbus-devel, libnl3-devel
 
 
 %description
@@ -46,30 +83,42 @@ quota パッケージには，ユーザやグループのディスク使用量
 
 
 %prep
-%setup -q -n quota-tools
+%setup -q
 %patch0 -p1
 %patch1 -p1
-%ifnarch ppc ppc64
 %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
-
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
+%patch13 -p1
+%patch14 -p1
+%patch15 -p1
+# Regenerate build scripts
+autoreconf -f -i
 
 %build
 %configure \
+    --enable-bsd-behaviour \
     --enable-ext2direct=yes \
     --enable-ldapmail=yes \
     --enable-netlink=yes \
     --enable-rootsbin=yes \
+    --enable-rpc=yes \
     --enable-rpcsetquota=yes \
-    --enable-strip-binaries=no
+    --enable-strip-binaries=no \
+    --enable-nls \
+    --disable-rpath \
+    --disable-silent-rules \
+    --disable-xfs-roothack
 make
 
-
 %install
 rm -fr %{buildroot}
 mkdir -p %{buildroot}/sbin
@@ -78,10 +127,11 @@ mkdir -p %{buildroot}%{_sbindir}
 mkdir -p %{buildroot}%{_bindir}
 mkdir -p %{buildroot}%{_mandir}/{man1,man3,man8}
 
-make install INSTALL='install -p' ROOTDIR=%{buildroot}
+make install DESTDIR=%{buildroot}
 
 install -m 644 warnquota.conf %{buildroot}%{_sysconfdir}
 
+mv %{buildroot}%{_sbindir}/quota{check,off,on} %{buildroot}/sbin/
 
 # we don't support XFS yet
 #
@@ -89,15 +139,13 @@ rm -f %{buildroot}%{_sbindir}/quot
 rm -f %{buildroot}%{_sbindir}/xqmstats
 rm -f %{buildroot}%{_mandir}/man8/quot.*
 rm -f %{buildroot}%{_mandir}/man8/xqmstats.*
-ln -s  quotaon.8.gz \
-  %{buildroot}%{_mandir}/man8/quotaoff.8
-ln -s rquotad.8.gz \
-  %{buildroot}%{_mandir}/man8/rpc.rquotad.8
 
 install -p -m755 -D %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/quota_nld
 install -p -m644 -D %{SOURCE2} \
     $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/quota_nld
 
+rm -rf %{buildroot}%{_datadir}/doc/%{name}
+
 %find_lang %{name}
 
 
@@ -116,22 +164,31 @@ fi
 
 %files -f %{name}.lang
 %defattr(-,root,root)
+%license COPYING
 %doc Changelog doc/ README*
 %config(noreplace) %{_sysconfdir}/warnquota.conf
 %config(noreplace) %{_sysconfdir}/quotagrpadmins
 %config(noreplace) %{_sysconfdir}/quotatab
 %config(noreplace) %attr(0644,root,root) %{_sysconfdir}/sysconfig/quota_nld
-%attr(0755,root,root) %{_initrddir}/quota_nld
-%attr(0755,root,root) /sbin/*
-%attr(0755,root,root) %{_bindir}/*
-%attr(0755,root,root) %{_sbindir}/*
+%{_initrddir}/quota_nld
+/sbin/*
+%{_bindir}/*
+%{_sbindir}/*
 %{_includedir}/rpcsvc/*
-%attr(0644,root,root) %{_mandir}/man1/*
-%attr(0644,root,root) %{_mandir}/man3/*
-%attr(0644,root,root) %{_mandir}/man8/*
+%{_mandir}/man1/*
+%{_mandir}/man3/*
+%{_mandir}/man5/*
+%{_mandir}/man8/*
 
 
 %changelog
+* Thu Nov 29 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.04-1
+- new upstram release.
+- dropped BR:libnl-devel.
+- added BR:libnl3-devel.
+- dropped all patches.
+- imported patched from rawhide.
+
 * Mon Mar 12 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 4.00-1
 - new upstram release
 - add BR: tcp_wrappers, nss-devel, openldap-devel,