commit quota for openSUSE:Factory

2019-08-16 Thread root
Hello community,

here is the log from the commit of package quota for openSUSE:Factory checked 
in at 2019-08-16 15:44:08

Comparing /work/SRC/openSUSE:Factory/quota (Old)
 and  /work/SRC/openSUSE:Factory/.quota.new.22127 (New)


Package is "quota"

Fri Aug 16 15:44:08 2019 rev:57 rq:723505 version:4.05

Changes:

--- /work/SRC/openSUSE:Factory/quota/quota.changes  2019-08-13 
13:25:23.705353165 +0200
+++ /work/SRC/openSUSE:Factory/.quota.new.22127/quota.changes   2019-08-16 
15:44:12.413724490 +0200
@@ -1,0 +2,6 @@
+Thu Aug 15 09:40:56 UTC 2019 - Tomáš Chvátal 
+
+- Add patch from git to stop config processing on errors bsc#1144265:
+  * 0001-warnquota-Do-not-ignore-errors-in-config-file.patch
+
+---

New:

  0001-warnquota-Do-not-ignore-errors-in-config-file.patch



Other differences:
--
++ quota.spec ++
--- /var/tmp/diff_new_pack.Cv21KR/_old  2019-08-16 15:44:14.029724020 +0200
+++ /var/tmp/diff_new_pack.Cv21KR/_new  2019-08-16 15:44:14.069724008 +0200
@@ -32,6 +32,7 @@
 Source2:quotad.service
 Source3:quotad_env.sh
 Patch2: %{name}-4.01-warnquota.patch
+Patch3: 0001-warnquota-Do-not-ignore-errors-in-config-file.patch
 BuildRequires:  e2fsprogs-devel
 BuildRequires:  openldap2-devel
 BuildRequires:  pkgconfig
@@ -66,6 +67,7 @@
 %prep
 %setup -q
 %patch2 -p1
+%patch3 -p1
 
 %build
 %configure \

++ 0001-warnquota-Do-not-ignore-errors-in-config-file.patch ++
>From 6e631074330aa6ea210b05dae3a2dcf5223b311f Mon Sep 17 00:00:00 2001
From: Jan Kara 
Date: Thu, 15 Aug 2019 11:19:20 +0200
Subject: [PATCH] warnquota: Do not ignore errors in config file

Currently warnquota ignores unknown variables, or lines we cannot parse
in the config file. This is potentially dangerous as that may result
in errors being missed and warnquota operating differently than
administrator intended. Change warnquota to abort on errors in config
file and provide -I option for ignoring errors for backward
compatibility.

Signed-off-by: Jan Kara 
---
 common.c| 13 ++---
 common.h|  4 +++
 warnquota.c | 82 ++---
 3 files changed, 85 insertions(+), 14 deletions(-)

Index: quota-4.05/common.c
===
--- quota-4.05.orig/common.c
+++ quota-4.05/common.c
@@ -61,17 +61,22 @@ void die(int ret, char *fmtstr, ...)
exit(ret);
 }
 
-void errstr(char *fmtstr, ...)
+void errstrv(char *fmtstr, va_list args)
 {
-   va_list args;
-
-   va_start(args, fmtstr);
if (enable_syslog)
do_syslog(LOG_ERR, fmtstr, args);
else {
fprintf(stderr, "%s: ", progname);
vfprintf(stderr, fmtstr, args);
}
+}
+
+void errstr(char *fmtstr, ...)
+{
+   va_list args;
+
+   va_start(args, fmtstr);
+   errstrv(fmtstr, args);
va_end(args);
 }
 
Index: quota-4.05/common.h
===
--- quota-4.05.orig/common.h
+++ quota-4.05/common.h
@@ -8,6 +8,7 @@
 #define GUARD_COMMON_H
 
 #include 
+#include 
 
 #ifndef __attribute__
 # if !defined __GNUC__ || __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 
8) || __STRICT_ANSI__
@@ -21,6 +22,9 @@ extern char *progname;
 /* Finish programs being */
 void __attribute ((noreturn)) die(int, char *, ...) __attribute__ ((__format__ 
(__printf__, 2, 3)));
 
+/* Print error from va_list */
+void errstrv(char *, va_list);
+
 /* Print an error */
 void errstr(char *, ...) __attribute__ ((__format__ (__printf__, 1, 2)));
 
Index: quota-4.05/warnquota.c
===
--- quota-4.05.orig/warnquota.c
+++ quota-4.05/warnquota.c
@@ -24,6 +24,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -87,6 +88,7 @@
 #define FL_GROUP 2
 #define FL_NOAUTOFS 4
 #define FL_NODETAILS 16
+#define FL_IGNORE_CFG_ERR 32
 
 struct usage {
char *devicename;
@@ -707,6 +709,22 @@ Unrecognized expression %%%c.\n"), varna
}
 }
 
+static void print_cfg_err(char *fmt, ...)
+{
+   va_list args;
+
+   va_start(args, fmt);
+   errstrv(fmt, args);
+   va_end(args);
+   if (flags & FL_IGNORE_CFG_ERR) {
+   errstr(_("Ignoring error in config file.\n"));
+   } else {
+   errstr(_("Aborting. Use option -I if you want warnquota to "
+   "ignore errors in the config file as it used to in "
+   "older versions.\n"));
+   }
+}
+
 /*
  * Reads config parameters from configfile
  * uses default values if errstr occurs
@@ -771,9 +789,18 @@ static int readconfigfile

commit quota for openSUSE:Factory

2019-08-13 Thread root
Hello community,

here is the log from the commit of package quota for openSUSE:Factory checked 
in at 2019-08-13 13:25:19

Comparing /work/SRC/openSUSE:Factory/quota (Old)
 and  /work/SRC/openSUSE:Factory/.quota.new.9556 (New)


Package is "quota"

Tue Aug 13 13:25:19 2019 rev:56 rq:722815 version:4.05

Changes:

--- /work/SRC/openSUSE:Factory/quota/quota.changes  2019-04-03 
09:28:00.459815030 +0200
+++ /work/SRC/openSUSE:Factory/.quota.new.9556/quota.changes2019-08-13 
13:25:23.705353165 +0200
@@ -1,0 +2,6 @@
+Mon Aug 12 14:58:32 UTC 2019 - Tomáš Chvátal 
+
+- Update patch quota-4.01-warnquota.patch to match up the git
+  version that was integrated bsc#1144265
+
+---



Other differences:
--
++ quota.spec ++
--- /var/tmp/diff_new_pack.9HNCsH/_old  2019-08-13 13:25:24.265353017 +0200
+++ /var/tmp/diff_new_pack.9HNCsH/_new  2019-08-13 13:25:24.269353016 +0200
@@ -65,7 +65,7 @@
 
 %prep
 %setup -q
-%patch2
+%patch2 -p1
 
 %build
 %configure \

++ quota-4.01-warnquota.patch ++
--- /var/tmp/diff_new_pack.9HNCsH/_old  2019-08-13 13:25:24.289353011 +0200
+++ /var/tmp/diff_new_pack.9HNCsH/_new  2019-08-13 13:25:24.289353011 +0200
@@ -1,7 +1,17 @@
-Index: warnquota.conf
-===
 warnquota.conf.orig
-+++ warnquota.conf
+From 0efb2331f1c39c9665fb6e92e83c7d080b877de1 Mon Sep 17 00:00:00 2001
+From: Jan Kara 
+Date: Mon, 1 Apr 2019 17:28:34 +0200
+Subject: [PATCH] warnquota: Improve examples in warnquota.conf
+
+Signed-off-by: Jan Kara 
+---
+ warnquota.conf | 104 ++---
+ 1 file changed, 72 insertions(+), 32 deletions(-)
+
+diff --git a/warnquota.conf b/warnquota.conf
+index b06f81f..60b0672 100644
+--- a/warnquota.conf
 b/warnquota.conf
 @@ -1,21 +1,37 @@
 -# this is an example warnquota.conf
 +###
@@ -19,15 +29,10 @@
 +
 +#
 +# Comment this out or remove it once you have edited this config file
-+#
-+FAIL= "configure /etc/warnquota.conf before running warnquota"
-+
  #
 -; ; and # type comments are allowed
 -# and even blank lines
-+# command used for sending mails
-+#
-+MAIL_CMD ▷⋅= "/usr/lib/sendmail -t"
++FAIL= "configure /etc/warnquota.conf before running warnquota"
  
 -# values can be quoted:
 -#MAIL_CMD = "/usr/my/sendmail/instead/sendmail -t"
@@ -37,6 +42,11 @@
 -SUBJECT   = Hey, user, clean up your account!
 -CC_TO = "sys...@example.com"
 +#
++# command used for sending mails
++#
++MAIL_CMD = "/usr/lib/sendmail -t"
++
++#
 +# Standard mail fields
 +FROM= "root@localhost"
 +SUBJECT   = "Your account quota has exceeded!"
@@ -52,7 +62,7 @@
  # Text in the beginning of the mail (if not specified, default text is used)
  # This way text can be split to more lines
  # Line breaks are done by '|' character
-@@ -45,33 +61,27 @@ GROUP_SIGNATURE= See you!| Your 
admin
+@@ -45,33 +61,57 @@ GROUP_SIGNATURE= See you!| Your 
admin|
  #
  #Here you can set a charset for emails sent by warnquota (e.g. UTF-8)
  #CHARSET  = 
@@ -70,27 +80,19 @@
 -# 
 -# LDAP_MAIL = false # or true if you want to use it
 -# If you have at least LDAP 2.3 installed, you should use LDAP_URI
--# LDAP_URI = ldaps://my.server:389
--# Otherwise you should specify LDAP_HOST and LDAP_PORT
--# LDAP_HOST = ldap
--# LDAP_PORT = 389
--# LDAP_TLS = false (false|never|allow|try|demand) use StarTLS
--#   false - don't use starTLS
--#   never - don't ask for a certificate
--#   allow - request certificate, proceed even if not verified
--#   try - request certificate, terminate if bad, proceed if not sent
--#   demand - request certificate, proceed only if verified
--# LDAP_BINDDN = uid=ReadOnlyUser,o=YourOrg
--# LDAP_BINDPW = YourReadOnlyUserPassword
--# LDAP_BASEDN = YourSearchBase
--# LDAP_SEARCH_ATTRIBUTE = uid
--# LDAP_MAIL_ATTRIBUTE = mailLocalAddress
--# LDAP_DEFAULT_MAIL_DOMAIN = YourDefaultMailDomain.com
 +##
 +# Your search base dn
 +#
 +# LDAP_BASEDN
 +
++# Your search bind dn
++#
++# LDAP_BINDDN
++
++# Your search bind password
++#
++# LDAP_BINDPW
++
 +# The attr for the value you are looking for
 +#
 +# LDAP_SEARCH_ATTRIBUTE
@@ -103,6 +105,41 @@
 +#
 +# LDAP_DEFAULT_MAIL_DOMAIN
 +
++# Whether LDAP support should be used
++#
++# LDAP_MAIL = false
++
++# Ldap server. For LDAP >= 2.3 use
++#
+ # LDAP_URI = ldaps://my.server:389
+-# Otherwise you should specify LDAP_HOST and LDAP_PORT
+-# LDAP_HOST = ldap
++#
++# For older LDAP libraries use
++#
++# LDAP_HOST = my.server
+ # LDAP_PORT = 3

commit quota for openSUSE:Factory

2019-04-03 Thread root
Hello community,

here is the log from the commit of package quota for openSUSE:Factory checked 
in at 2019-04-03 09:27:59

Comparing /work/SRC/openSUSE:Factory/quota (Old)
 and  /work/SRC/openSUSE:Factory/.quota.new.25356 (New)


Package is "quota"

Wed Apr  3 09:27:59 2019 rev:55 rq:690619 version:4.05

Changes:

--- /work/SRC/openSUSE:Factory/quota/quota.changes  2019-03-22 
15:12:20.789291737 +0100
+++ /work/SRC/openSUSE:Factory/.quota.new.25356/quota.changes   2019-04-03 
09:28:00.459815030 +0200
@@ -1,0 +2,17 @@
+Tue Apr  2 10:25:33 UTC 2019 - Tomáš Chvátal 
+
+- Install the license
+
+---
+Mon Apr  1 09:15:59 UTC 2019 - Tomáš Chvátal 
+
+- Update to 4.05 release jsc#SLE-5734:
+  * This release includes mostly various smaller cleanups and fixes
+in various areas.
+  * Most visible changes are addition of f2fs and exfs among recognized
+filesystems.
+- Drop merged patch quota-4.04-Listen-on-a-TCP-socket.patch
+- Remove quot binary functionality could be achieved by using
+  repquota instead
+
+---

Old:

  quota-4.04-Listen-on-a-TCP-socket.patch
  quota-4.04.tar.gz

New:

  quota-4.05.tar.gz



Other differences:
--
++ quota.spec ++
--- /var/tmp/diff_new_pack.ewaNLO/_old  2019-04-03 09:28:02.303815898 +0200
+++ /var/tmp/diff_new_pack.ewaNLO/_new  2019-04-03 09:28:02.343815917 +0200
@@ -21,17 +21,16 @@
   %define _fillupdir %{_localstatedir}/adm/fillup-templates
 %endif
 Name:   quota
-Version:4.04
+Version:4.05
 Release:0
 Summary:Disk Quota System
-License:GPL-2.0-only AND BSD-3-Clause
+License:GPL-2.0-only
 Group:  System/Filesystems
-Url:http://sourceforge.net/projects/linuxquota/
+URL:http://sourceforge.net/projects/linuxquota/
 Source0:
http://downloads.sourceforge.net/project/linuxquota/quota-tools/%{version}/%{name}-%{version}.tar.gz
 Source1:sysconfig.nfs-quota
 Source2:quotad.service
 Source3:quotad_env.sh
-Patch1: quota-4.04-Listen-on-a-TCP-socket.patch
 Patch2: %{name}-4.01-warnquota.patch
 BuildRequires:  e2fsprogs-devel
 BuildRequires:  openldap2-devel
@@ -66,7 +65,6 @@
 
 %prep
 %setup -q
-%patch1 -p1
 %patch2
 
 %build
@@ -111,6 +109,7 @@
 %service_del_postun quotad.service
 
 %files -f %{name}.lang
+%license COPYING
 %config %{_sysconfdir}/quotagrpadmins
 %config %{_sysconfdir}/quotatab
 %config %{_sysconfdir}/warnquota.conf
@@ -123,7 +122,6 @@
 %{_sbindir}/convertquota
 %{_sbindir}/edquota
 %{_sbindir}/edquota_editor
-%{_sbindir}/quot
 %{_sbindir}/quota_nld
 %{_sbindir}/quotacheck
 %{_sbindir}/quotaoff

++ quota-4.04.tar.gz -> quota-4.05.tar.gz ++
 16986 lines of diff (skipped)




commit quota for openSUSE:Factory

2019-03-22 Thread root
Hello community,

here is the log from the commit of package quota for openSUSE:Factory checked 
in at 2019-03-22 15:12:12

Comparing /work/SRC/openSUSE:Factory/quota (Old)
 and  /work/SRC/openSUSE:Factory/.quota.new.25356 (New)


Package is "quota"

Fri Mar 22 15:12:12 2019 rev:54 rq:687581 version:4.04

Changes:

--- /work/SRC/openSUSE:Factory/quota/quota.changes  2018-08-18 
00:02:58.278872537 +0200
+++ /work/SRC/openSUSE:Factory/.quota.new.25356/quota.changes   2019-03-22 
15:12:20.789291737 +0100
@@ -15 +15 @@
-- Version update to 4.04:
+- Version update to 4.04 jsc#SLE-5734:



Other differences:
--
++ quota.spec ++
--- /var/tmp/diff_new_pack.0JHHez/_old  2019-03-22 15:12:21.741291615 +0100
+++ /var/tmp/diff_new_pack.0JHHez/_new  2019-03-22 15:12:21.745291614 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package quota
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 




commit quota for openSUSE:Factory

2018-08-17 Thread root
Hello community,

here is the log from the commit of package quota for openSUSE:Factory checked 
in at 2018-08-18 00:02:31

Comparing /work/SRC/openSUSE:Factory/quota (Old)
 and  /work/SRC/openSUSE:Factory/.quota.new (New)


Package is "quota"

Sat Aug 18 00:02:31 2018 rev:53 rq:629380 version:4.04

Changes:

--- /work/SRC/openSUSE:Factory/quota/quota.changes  2018-03-13 
10:24:03.041744283 +0100
+++ /work/SRC/openSUSE:Factory/.quota.new/quota.changes 2018-08-18 
00:02:58.278872537 +0200
@@ -1,0 +2,6 @@
+Wed Aug 15 10:57:33 UTC 2018 - tchva...@suse.com
+
+- Add patch to fix high cpu load bsc#1104898:
+  * quota-4.04-Listen-on-a-TCP-socket.patch
+
+---

New:

  quota-4.04-Listen-on-a-TCP-socket.patch



Other differences:
--
++ quota.spec ++
--- /var/tmp/diff_new_pack.uDatGq/_old  2018-08-18 00:02:58.966874592 +0200
+++ /var/tmp/diff_new_pack.uDatGq/_new  2018-08-18 00:02:58.986874652 +0200
@@ -31,6 +31,7 @@
 Source1:sysconfig.nfs-quota
 Source2:quotad.service
 Source3:quotad_env.sh
+Patch1: quota-4.04-Listen-on-a-TCP-socket.patch
 Patch2: %{name}-4.01-warnquota.patch
 BuildRequires:  e2fsprogs-devel
 BuildRequires:  openldap2-devel
@@ -65,6 +66,7 @@
 
 %prep
 %setup -q
+%patch1 -p1
 %patch2
 
 %build

++ quota-4.04-Listen-on-a-TCP-socket.patch ++
>From 31ecd29b3b3f51145fd78f63087c10e9fcadf999 Mon Sep 17 00:00:00 2001
From: Steve Dickson 
Date: Tue, 22 May 2018 12:41:59 +0200
Subject: [PATCH] Listen on a TCP socket
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

rpc.rquotad spins in libtirpc's rendezvous_request() on accepting TCP
connections because the polled TCP socket is not listening:

poll([{fd=4, events=POLLIN|POLLPRI|POLLRDNORM|POLLRDBAND}, {fd=5,
  events=POLLIN|POLLPRI|POLLRDNORM|POLLRDBAND}, {fd=6,
  events=POLLIN|POLLPRI|POLLRDNORM|POLLRDBAND}, {fd=7,
  events=POLLIN|POLLPRI|POLLRDNORM|POLLRDBAND}], 4, -1) = 2 ([{fd=5,
  revents=POLLHUP}, {fd=7, revents=POLLHUP}])
accept(5, 0x7ffe61698700, [128])= -1 EINVAL (Invalid argument)
accept(7, 0x7ffe61698700, [128])= -1 EINVAL (Invalid argument)

The polled descriptors are:

rpc.rquot 21981 root4u  IPv4 80449159  0t0  UDP *:rquotad
rpc.rquot 21981 root5u  sock  0,9  0t0 80449162 protocol: TCP
rpc.rquot 21981 root6u  IPv6 80449165  0t0  UDP *:rquotad
rpc.rquot 21981 root7u  sock  0,9  0t0 80449168 protocol: TCPv6

That results into a high CPU usage just after staring rpc.rquotad
process.

This patch adds a listen() call to svc_create_sock()
routine which is needed with libtirpc version of svc_tli_create()
as well as a needed IPv6 setsockopt().

Signed-off-by: Petr Písař 
---
 svc_socket.c | 18 ++
 1 file changed, 18 insertions(+)

diff --git a/svc_socket.c b/svc_socket.c
index 8a44604..d2e3abf 100644
--- a/svc_socket.c
+++ b/svc_socket.c
@@ -118,6 +118,15 @@ static int svc_create_sock(struct addrinfo *ai)
return -1;
}
 
+   if (ai->ai_family == AF_INET6) {
+   if (setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY,
+   &optval, sizeof(optval)) < 0) {
+   errstr(_("Cannot set IPv6 socket options: %s\n"), 
strerror(errno));
+   close(fd);
+   return -1;
+   }
+   }
+
if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &optval, sizeof(optval)) < 
0) {
errstr(_("Cannot set socket options: %s\n"), strerror(errno));
close(fd);
@@ -129,6 +138,15 @@ static int svc_create_sock(struct addrinfo *ai)
close(fd);
return -1;
}
+
+   if (ai->ai_protocol == IPPROTO_TCP) {
+   if (listen(fd, SOMAXCONN) < 0) {
+   errstr(_("Cannot listen to address: %s\n"), 
strerror(errno));
+   close(fd);
+   return -1;
+   }
+   }
+
return fd;
 }
 
-- 
2.14.3




commit quota for openSUSE:Factory

2018-03-13 Thread root
Hello community,

here is the log from the commit of package quota for openSUSE:Factory checked 
in at 2018-03-13 10:23:53

Comparing /work/SRC/openSUSE:Factory/quota (Old)
 and  /work/SRC/openSUSE:Factory/.quota.new (New)


Package is "quota"

Tue Mar 13 10:23:53 2018 rev:52 rq:585814 version:4.04

Changes:

--- /work/SRC/openSUSE:Factory/quota/quota.changes  2017-11-24 
10:57:10.702351146 +0100
+++ /work/SRC/openSUSE:Factory/.quota.new/quota.changes 2018-03-13 
10:24:03.041744283 +0100
@@ -1,0 +2,16 @@
+Mon Mar 12 10:30:34 UTC 2018 - tchva...@suse.com
+
+- Add rpcgen to buildrequires
+
+---
+Sat Mar 10 10:22:03 UTC 2018 - tchva...@suse.com
+
+- Version update to 4.04:
+  * support for new kernel interface that allows for repquota(8) to work
+reliably also for XFS or ext4 with quota feature and generally other
+filesystem where quota files are not available to quota-tools
+  * IPv6 support for rpc.quotad and all other tools.
+  * Tons of various fixes
+- Drop merged patch 0001-Set-fPIC-and-pie-as-default-params-when-building.patch
+
+---

Old:

  0001-Set-fPIC-and-pie-as-default-params-when-building.patch
  quota-4.03.tar.gz

New:

  quota-4.04.tar.gz



Other differences:
--
++ quota.spec ++
--- /var/tmp/diff_new_pack.RI3REy/_old  2018-03-13 10:24:04.013709459 +0100
+++ /var/tmp/diff_new_pack.RI3REy/_new  2018-03-13 10:24:04.013709459 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package quota
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,34 +18,29 @@
 
 #Compat macro for new _fillupdir macro introduced in Nov 2017
 %if ! %{defined _fillupdir}
-  %define _fillupdir /var/adm/fillup-templates
+  %define _fillupdir %{_localstatedir}/adm/fillup-templates
 %endif
-
 Name:   quota
-Version:4.03
+Version:4.04
 Release:0
 Summary:Disk Quota System
-License:GPL-2.0 AND BSD-3-Clause
+License:GPL-2.0-only AND BSD-3-Clause
 Group:  System/Filesystems
 Url:http://sourceforge.net/projects/linuxquota/
-#Source0:
http://downloads.sourceforge.net/project/linuxquota/quota-tools/%{version}/%{name}-%{version}.tar.gz
-# Tarball repacked, missing subfolder, will be fixed in next release
-Source0:%{name}-%{version}.tar.gz
+Source0:
http://downloads.sourceforge.net/project/linuxquota/quota-tools/%{version}/%{name}-%{version}.tar.gz
 Source1:sysconfig.nfs-quota
 Source2:quotad.service
 Source3:quotad_env.sh
-# PATCH-FIX-UPSTREAM Add pic and pie hardening to build
-Patch1: 0001-Set-fPIC-and-pie-as-default-params-when-building.patch
 Patch2: %{name}-4.01-warnquota.patch
-# needed for Patch1
-BuildRequires:  automake
 BuildRequires:  e2fsprogs-devel
 BuildRequires:  openldap2-devel
 BuildRequires:  pkgconfig
+BuildRequires:  rpcgen
 BuildRequires:  tcpd-devel
 BuildRequires:  pkgconfig(dbus-1)
 BuildRequires:  pkgconfig(libnl-3.0) >= 3.1
 BuildRequires:  pkgconfig(libnl-genl-3.0)
+BuildRequires:  pkgconfig(libtirpc)
 BuildRequires:  pkgconfig(systemd)
 
 %description
@@ -70,15 +65,14 @@
 
 %prep
 %setup -q
-%patch1 -p1
 %patch2
 
 %build
-autoreconf -fvi
 %configure \
 --docdir=%{_docdir}/%{name} \
 --disable-silent-rules \
 --enable-ldapmail \
+--enable-rpc \
 --enable-rpcsetquota
 make %{?_smp_mflags}
 

++ quota-4.03.tar.gz -> quota-4.04.tar.gz ++
 23637 lines of diff (skipped)




commit quota for openSUSE:Factory

2017-11-24 Thread root
Hello community,

here is the log from the commit of package quota for openSUSE:Factory checked 
in at 2017-11-24 10:57:07

Comparing /work/SRC/openSUSE:Factory/quota (Old)
 and  /work/SRC/openSUSE:Factory/.quota.new (New)


Package is "quota"

Fri Nov 24 10:57:07 2017 rev:51 rq:545046 version:4.03

Changes:

--- /work/SRC/openSUSE:Factory/quota/quota.changes  2017-09-05 
15:16:48.239879615 +0200
+++ /work/SRC/openSUSE:Factory/.quota.new/quota.changes 2017-11-24 
10:57:10.702351146 +0100
@@ -1,0 +2,6 @@
+Thu Nov 23 13:41:35 UTC 2017 - rbr...@suse.com
+
+- Replace references to /var/adm/fillup-templates with new 
+  %_fillupdir macro (boo#1069468)
+
+---



Other differences:
--
++ quota.spec ++
--- /var/tmp/diff_new_pack.SQwC6K/_old  2017-11-24 10:57:12.118299434 +0100
+++ /var/tmp/diff_new_pack.SQwC6K/_new  2017-11-24 10:57:12.118299434 +0100
@@ -16,6 +16,11 @@
 #
 
 
+#Compat macro for new _fillupdir macro introduced in Nov 2017
+%if ! %{defined _fillupdir}
+  %define _fillupdir /var/adm/fillup-templates
+%endif
+
 Name:   quota
 Version:4.03
 Release:0
@@ -91,8 +96,8 @@
 install -d -m 755 %{buildroot}%{_unitdir}/../scripts/
 install -m 755 %{SOURCE3} %{buildroot}%{_unitdir}/../scripts/quotad_env.sh
 
-install -d -m 755 %{buildroot}%{_localstatedir}/adm/fillup-templates
-cp %{SOURCE1} 
%{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.nfs-quota
+install -d -m 755 %{buildroot}%{_fillupdir}
+cp %{SOURCE1} %{buildroot}%{_fillupdir}/sysconfig.nfs-quota
 
 %find_lang %{name}
 
@@ -141,7 +146,7 @@
 %{_unitdir}/quotad.service
 %{_unitdir}/../scripts
 %{_unitdir}/../scripts/quotad_env.sh
-%{_localstatedir}/adm/fillup-templates/sysconfig.nfs-quota
+%{_fillupdir}/sysconfig.nfs-quota
 # these files conflicts with glibc rpm
 %exclude %{_includedir}/rpcsvc/*
 




commit quota for openSUSE:Factory

2017-09-05 Thread root
Hello community,

here is the log from the commit of package quota for openSUSE:Factory checked 
in at 2017-09-05 15:16:47

Comparing /work/SRC/openSUSE:Factory/quota (Old)
 and  /work/SRC/openSUSE:Factory/.quota.new (New)


Package is "quota"

Tue Sep  5 15:16:47 2017 rev:50 rq:520639 version:4.03

Changes:

--- /work/SRC/openSUSE:Factory/quota/quota.changes  2016-01-07 
00:24:41.0 +0100
+++ /work/SRC/openSUSE:Factory/.quota.new/quota.changes 2017-09-05 
15:16:48.239879615 +0200
@@ -1,0 +2,5 @@
+Mon Sep  4 10:51:57 UTC 2017 - tchva...@suse.com
+
+- Enable ldapmail feature wrt bsc#1055450
+
+---



Other differences:
--
++ quota.spec ++
--- /var/tmp/diff_new_pack.S1vs9O/_old  2017-09-05 15:16:50.451568731 +0200
+++ /var/tmp/diff_new_pack.S1vs9O/_new  2017-09-05 15:16:50.455568169 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package quota
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -20,7 +20,7 @@
 Version:4.03
 Release:0
 Summary:Disk Quota System
-License:GPL-2.0 and BSD-3-Clause
+License:GPL-2.0 AND BSD-3-Clause
 Group:  System/Filesystems
 Url:http://sourceforge.net/projects/linuxquota/
 #Source0:
http://downloads.sourceforge.net/project/linuxquota/quota-tools/%{version}/%{name}-%{version}.tar.gz
@@ -34,14 +34,14 @@
 Patch2: %{name}-4.01-warnquota.patch
 # needed for Patch1
 BuildRequires:  automake
-BuildRequires:  dbus-1-devel
 BuildRequires:  e2fsprogs-devel
-BuildRequires:  pkg-config
+BuildRequires:  openldap2-devel
+BuildRequires:  pkgconfig
 BuildRequires:  tcpd-devel
+BuildRequires:  pkgconfig(dbus-1)
 BuildRequires:  pkgconfig(libnl-3.0) >= 3.1
 BuildRequires:  pkgconfig(libnl-genl-3.0)
 BuildRequires:  pkgconfig(systemd)
-BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 
 %description
 The quota subsystem allows a system administrator to set soft and hard
@@ -52,9 +52,9 @@
 %package nfs
 Summary:Disk Quota System on NFS
 Group:  System/Filesystems
-# Require the services needed to be present for quotad service: portmap, 
nfsserver, network
 Requires:   nfs-kernel-server
 Requires:   quota = %{version}
+# Require the services needed to be present for quotad service: portmap, 
nfsserver, network
 Requires:   rpcbind
 Requires:   sysconfig
 Requires(post): %fillup_prereq
@@ -73,7 +73,7 @@
 %configure \
 --docdir=%{_docdir}/%{name} \
 --disable-silent-rules \
---disable-ldapmail \
+--enable-ldapmail \
 --enable-rpcsetquota
 make %{?_smp_mflags}
 
@@ -110,7 +110,6 @@
 %service_del_postun quotad.service
 
 %files -f %{name}.lang
-%defattr(-,root,root)
 %config %{_sysconfdir}/quotagrpadmins
 %config %{_sysconfdir}/quotatab
 %config %{_sysconfdir}/warnquota.conf
@@ -137,7 +136,6 @@
 %{_sbindir}/xqmstats
 
 %files nfs
-%defattr(-,root,root)
 %{_sbindir}/rpc.rquotad
 %{_sbindir}/rcquotad
 %{_unitdir}/quotad.service




commit quota for openSUSE:Factory

2016-01-06 Thread h_root
Hello community,

here is the log from the commit of package quota for openSUSE:Factory checked 
in at 2016-01-07 00:24:38

Comparing /work/SRC/openSUSE:Factory/quota (Old)
 and  /work/SRC/openSUSE:Factory/.quota.new (New)


Package is "quota"

Changes:

--- /work/SRC/openSUSE:Factory/quota/quota.changes  2014-12-01 
14:00:52.0 +0100
+++ /work/SRC/openSUSE:Factory/.quota.new/quota.changes 2016-01-07 
00:24:41.0 +0100
@@ -1,0 +2,18 @@
+Tue Jan  5 10:23:28 UTC 2016 - tchva...@suse.com
+
+- Add patch to set variables upstream rather than in spec:
+  * 0001-Set-fPIC-and-pie-as-default-params-when-building.patch
+
+---
+Mon Jan  4 15:07:35 UTC 2016 - tchva...@suse.com
+
+- Version update to 4.03 release
+  * Various small updates and fixes
+  * Translations update
+  * autotools based buildsystem
+- Refresh patch:
+  * quota-4.01-warnquota.patch
+- Delete obsolete patch:
+  * quota-4.00-makefile.patch
+
+---

Old:

  quota-4.00-makefile.patch
  quota-4.02.tar.gz

New:

  0001-Set-fPIC-and-pie-as-default-params-when-building.patch
  quota-4.03.tar.gz



Other differences:
--
++ quota.spec ++
--- /var/tmp/diff_new_pack.hz5CGl/_old  2016-01-07 00:24:43.0 +0100
+++ /var/tmp/diff_new_pack.hz5CGl/_new  2016-01-07 00:24:43.0 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package quota
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,18 +17,22 @@
 
 
 Name:   quota
-Version:4.02
+Version:4.03
 Release:0
 Summary:Disk Quota System
 License:GPL-2.0 and BSD-3-Clause
 Group:  System/Filesystems
 Url:http://sourceforge.net/projects/linuxquota/
-Source0:
http://downloads.sourceforge.net/project/linuxquota/quota-tools/%{version}/%{name}-%{version}.tar.gz
+#Source0:
http://downloads.sourceforge.net/project/linuxquota/quota-tools/%{version}/%{name}-%{version}.tar.gz
+# Tarball repacked, missing subfolder, will be fixed in next release
+Source0:%{name}-%{version}.tar.gz
 Source1:sysconfig.nfs-quota
 Source2:quotad.service
 Source3:quotad_env.sh
-Patch1: %{name}-4.00-makefile.patch
+# PATCH-FIX-UPSTREAM Add pic and pie hardening to build
+Patch1: 0001-Set-fPIC-and-pie-as-default-params-when-building.patch
 Patch2: %{name}-4.01-warnquota.patch
+# needed for Patch1
 BuildRequires:  automake
 BuildRequires:  dbus-1-devel
 BuildRequires:  e2fsprogs-devel
@@ -54,27 +58,27 @@
 Requires:   rpcbind
 Requires:   sysconfig
 Requires(post): %fillup_prereq
-Provides:   quota:%{_initddir}/quotad
 %{?systemd_requires}
 
 %description nfs
 The quotad init script, which provides quota support on NFS mounts.
 
 %prep
-%setup -q -n quota-tools
-%patch1
+%setup -q
+%patch1 -p1
 %patch2
 
 %build
-autoreconf -fiv
+autoreconf -fvi
 %configure \
-   --sysconfdir=%{_sysconfdir} \
-   --enable-netlink \
-   --enable-strip-binaries=no
+--docdir=%{_docdir}/%{name} \
+--disable-silent-rules \
+--disable-ldapmail \
+--enable-rpcsetquota
 make %{?_smp_mflags}
 
 %install
-make install ROOTDIR=%{buildroot}
+%make_install
 
 #installing ldap-scripts
 install -m 755 ldap-scripts/*pl %{buildroot}%{_sbindir}/
@@ -110,8 +114,9 @@
 %config %{_sysconfdir}/quotagrpadmins
 %config %{_sysconfdir}/quotatab
 %config %{_sysconfdir}/warnquota.conf
-%doc README.* doc
-%doc %{_mandir}/man?/*
+%dir %{_docdir}/%{name}
+%{_docdir}/%{name}/*
+%{_mandir}/man?/*
 %{_bindir}/quota
 %{_bindir}/quotasync
 %{_sbindir}/applySystemQuotas.pl

++ 0001-Set-fPIC-and-pie-as-default-params-when-building.patch ++
>From add4f4954adc27ad7b2a698a1d3ac0fcd981602a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= 
Date: Tue, 5 Jan 2016 11:20:52 +0100
Subject: [PATCH] Set -fPIC and -pie as default params when building

---
 Makefile.am  | 1 +
 configure.ac | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index 7c7a866..77f8400 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,5 @@
 ACLOCAL_AMFLAGS = -I m4
+AM_LDFLAGS = -pie
 
 BUILT_SOURCES = rquota.h rquota.c rquota_clnt.c
 
diff --git a/configure.ac b/configure.ac
index cb33781..489c281 100644
--- a/configure.ac
+++ b/configure.ac
@@ -53,7 +53,7 @@ AS_IF([test "x${prefix}" = "xNONE"], [
 # 
 # Check for cflags
 # =

commit quota for openSUSE:Factory

2014-12-01 Thread h_root
Hello community,

here is the log from the commit of package quota for openSUSE:Factory checked 
in at 2014-12-01 14:00:45

Comparing /work/SRC/openSUSE:Factory/quota (Old)
 and  /work/SRC/openSUSE:Factory/.quota.new (New)


Package is "quota"

Changes:

--- /work/SRC/openSUSE:Factory/quota/quota.changes  2014-11-24 
11:08:56.0 +0100
+++ /work/SRC/openSUSE:Factory/.quota.new/quota.changes 2014-12-01 
14:00:52.0 +0100
@@ -1,0 +2,7 @@
+Fri Nov 28 10:19:05 UTC 2014 - tchva...@suse.com
+
+- Version bump to 4.02 release
+  * Mostly few trivial fixes.
+- Properly run all systemd calls on services
+
+---

Old:

  quota-4.01_git201405011753.tar.xz

New:

  quota-4.02.tar.gz



Other differences:
--
++ quota.spec ++
--- /var/tmp/diff_new_pack.z2bkKe/_old  2014-12-01 14:00:53.0 +0100
+++ /var/tmp/diff_new_pack.z2bkKe/_new  2014-12-01 14:00:53.0 +0100
@@ -17,13 +17,13 @@
 
 
 Name:   quota
-Version:4.01_git201405011753
+Version:4.02
 Release:0
 Summary:Disk Quota System
 License:GPL-2.0 and BSD-3-Clause
 Group:  System/Filesystems
 Url:http://sourceforge.net/projects/linuxquota/
-Source0:%{name}-%{version}.tar.xz
+Source0:
http://downloads.sourceforge.net/project/linuxquota/quota-tools/%{version}/%{name}-%{version}.tar.gz
 Source1:sysconfig.nfs-quota
 Source2:quotad.service
 Source3:quotad_env.sh
@@ -61,7 +61,7 @@
 The quotad init script, which provides quota support on NFS mounts.
 
 %prep
-%setup -q
+%setup -q -n quota-tools
 %patch1
 %patch2
 
@@ -92,6 +92,9 @@
 
 %find_lang %{name}
 
+%pre nfs
+%service_add_pre quotad.service
+
 %post nfs
 %{fillup_only -an nfs}
 %service_add_post quotad.service

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit quota for openSUSE:Factory

2014-11-24 Thread h_root
Hello community,

here is the log from the commit of package quota for openSUSE:Factory checked 
in at 2014-11-24 11:08:49

Comparing /work/SRC/openSUSE:Factory/quota (Old)
 and  /work/SRC/openSUSE:Factory/.quota.new (New)


Package is "quota"

Changes:

--- /work/SRC/openSUSE:Factory/quota/quota.changes  2014-06-16 
21:33:03.0 +0200
+++ /work/SRC/openSUSE:Factory/.quota.new/quota.changes 2014-11-24 
11:08:56.0 +0100
@@ -1,0 +2,5 @@
+Wed Nov 19 03:05:00 UTC 2014 - Led 
+
+- fix bashism in quotad_env.sh script
+
+---



Other differences:
--
++ quotad_env.sh ++
--- /var/tmp/diff_new_pack.WmRNWG/_old  2014-11-24 11:08:58.0 +0100
+++ /var/tmp/diff_new_pack.WmRNWG/_new  2014-11-24 11:08:58.0 +0100
@@ -2,7 +2,7 @@
 
 . /etc/sysconfig/nfs
 
-if [[ -n "${RQUOTAD_PORT}" ]]; then
+if [ -n "${RQUOTAD_PORT}" ]; then
RQUOTAD_PORT="-p ${RQUOTAD_PORT}"
 fi
 

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit quota for openSUSE:Factory

2014-06-16 Thread h_root
Hello community,

here is the log from the commit of package quota for openSUSE:Factory checked 
in at 2014-06-16 21:33:02

Comparing /work/SRC/openSUSE:Factory/quota (Old)
 and  /work/SRC/openSUSE:Factory/.quota.new (New)


Package is "quota"

Changes:

--- /work/SRC/openSUSE:Factory/quota/quota.changes  2014-05-20 
14:23:57.0 +0200
+++ /work/SRC/openSUSE:Factory/.quota.new/quota.changes 2014-06-16 
21:33:03.0 +0200
@@ -1,0 +2,9 @@
+Wed May 28 00:03:03 UTC 2014 - crrodrig...@opensuse.org
+
+- Update to current git 4.01_git201405011753
+* mostly bugfixes and documentation update
+* Most important reason for this update is to get rid of libnl1
+  from the Base installation as this is one of the few packages
+  that used to require it, now migrated to libnl3.
+
+---

Old:

  quota-4.01.tar.gz

New:

  quota-4.01_git201405011753.tar.xz



Other differences:
--
++ quota.spec ++
--- /var/tmp/diff_new_pack.kuZ10o/_old  2014-06-16 21:33:04.0 +0200
+++ /var/tmp/diff_new_pack.kuZ10o/_new  2014-06-16 21:33:04.0 +0200
@@ -17,24 +17,26 @@
 
 
 Name:   quota
-Version:4.01
+Version:4.01_git201405011753
 Release:0
 Summary:Disk Quota System
 License:GPL-2.0 and BSD-3-Clause
 Group:  System/Filesystems
 Url:http://sourceforge.net/projects/linuxquota/
-Source0:%{name}-%{version}.tar.gz
+Source0:%{name}-%{version}.tar.xz
 Source1:sysconfig.nfs-quota
 Source2:quotad.service
 Source3:quotad_env.sh
 Patch1: %{name}-4.00-makefile.patch
 Patch2: %{name}-4.01-warnquota.patch
+BuildRequires:  automake
 BuildRequires:  dbus-1-devel
 BuildRequires:  e2fsprogs-devel
-BuildRequires:  libnl-1_1-devel
 BuildRequires:  pkg-config
-BuildRequires:  systemd
 BuildRequires:  tcpd-devel
+BuildRequires:  pkgconfig(libnl-3.0) >= 3.1
+BuildRequires:  pkgconfig(libnl-genl-3.0)
+BuildRequires:  pkgconfig(systemd)
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -59,11 +61,12 @@
 The quotad init script, which provides quota support on NFS mounts.
 
 %prep
-%setup -q -n quota-tools
+%setup -q
 %patch1
 %patch2
 
 %build
+autoreconf -fiv
 %configure \
--sysconfdir=%{_sysconfdir} \
--enable-netlink \

++ quota-4.01-warnquota.patch ++
--- /var/tmp/diff_new_pack.kuZ10o/_old  2014-06-16 21:33:04.0 +0200
+++ /var/tmp/diff_new_pack.kuZ10o/_new  2014-06-16 21:33:04.0 +0200
@@ -1,12 +1,9 @@
 ./warnquota.conf.orig
-+++ ./warnquota.conf
-@@ -1,56 +1,116 @@
+--- warnquota.conf.orig
 warnquota.conf
+@@ -1,21 +1,37 @@
 -# this is an example warnquota.conf
 +###
 +# Configuration file for the warnquota utility
- #
--; ; and # type comments are allowed
--# and even blank lines
 +# File Format:
 +# 
 +# (1) lines begining with # or ; are comments
@@ -17,6 +14,18 @@
 +# on the next line
 +# (6) line breaks are marked with '|' character
 +###
++
++#
++# Comment this out or remove it once you have edited this config file
++#
++FAIL= "configure /etc/warnquota.conf before running warnquota"
++
++#
++# command used for sending mails
+ #
+-; ; and # type comments are allowed
+-# and even blank lines
++MAIL_CMD ▷⋅= "/usr/lib/sendmail -t"
  
 -# values can be quoted:
 -#MAIL_CMD = "/usr/my/sendmail/instead/sendmail -t"
@@ -26,111 +35,59 @@
 -SUBJECT   = Hey, user, clean up your account!
 -CC_TO = "sys...@example.com"
 +#
-+# Comment this out or remove it once you have edited this config file
-+#
-+FAIL  = "configure /etc/warnquota.conf before running warnquota"
-+
-+#
-+# command used for sending mails
-+#
-+MAIL_CMD  = "/usr/lib/sendmail -t"
-+
-+#
 +# Standard mail fields
-+#
-+FROM  = "root@localhost"
++FROM= "root@localhost"
 +SUBJECT   = "Your account quota has exceeded!"
 +CC_TO = "root@localhost"
-+
-+#
  # If you set this variable CC will be used only when user has less than
  # specified grace time left (examples of possible times: 5 seconds, 1 minute,
  # 12 hours, 5 days)
-+#
  # CC_BEFORE = 2 days
 -SUPPORT   = "supp...@example.com"
 -PHONE = "(123) 456- or (222) 333-"
-+
-+#
-+# These variables are used in the default signatures,
-+# provided SIGNATURE or GROUP_SIGNATURE is not specified (see below)
-+#
 +SUPPORT   = "root@localhost"
 +PHONE = "123 456 789"
-+
-+#
  # Text in the beginning of the mail (if not specified, default text is used)
--# This

commit quota for openSUSE:Factory

2014-05-20 Thread h_root
Hello community,

here is the log from the commit of package quota for openSUSE:Factory checked 
in at 2014-05-20 14:23:56

Comparing /work/SRC/openSUSE:Factory/quota (Old)
 and  /work/SRC/openSUSE:Factory/.quota.new (New)


Package is "quota"

Changes:

--- /work/SRC/openSUSE:Factory/quota/quota.changes  2013-06-18 
10:37:03.0 +0200
+++ /work/SRC/openSUSE:Factory/.quota.new/quota.changes 2014-05-20 
14:23:57.0 +0200
@@ -1,0 +2,10 @@
+Mon May 19 09:22:00 UTC 2014 - tchva...@suse.com
+
+- Cleanup with spec-cleaner
+- Remove the compat for the usrmerge
+- Use systemd service files instead of the initscript +
+  added extra workaround for argument parsing.
+- Remove extra SUSE traball with scripts as we reduced it down to
+  one script and unitfile.
+
+---

Old:

  quota-SUSE.tar.bz2

New:

  quotad.service
  quotad_env.sh
  sysconfig.nfs-quota



Other differences:
--
++ quota.spec ++
--- /var/tmp/diff_new_pack.130pHq/_old  2014-05-20 14:23:59.0 +0200
+++ /var/tmp/diff_new_pack.130pHq/_new  2014-05-20 14:23:59.0 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package quota
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,26 +17,24 @@
 
 
 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.01
 Release:0
-PreReq: %insserv_prereq %fillup_prereq
-Url:http://sourceforge.net/projects/linuxquota/
 Summary:Disk Quota System
 License:GPL-2.0 and BSD-3-Clause
 Group:  System/Filesystems
-Source: %{name}-%{version}.tar.gz
-Source1:%{name}-SUSE.tar.bz2
+Url:http://sourceforge.net/projects/linuxquota/
+Source0:%{name}-%{version}.tar.gz
+Source1:sysconfig.nfs-quota
+Source2:quotad.service
+Source3:quotad_env.sh
 Patch1: %{name}-4.00-makefile.patch
 Patch2: %{name}-4.01-warnquota.patch
+BuildRequires:  dbus-1-devel
+BuildRequires:  e2fsprogs-devel
+BuildRequires:  libnl-1_1-devel
+BuildRequires:  pkg-config
+BuildRequires:  systemd
+BuildRequires:  tcpd-devel
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -45,43 +43,23 @@
 groups. The kernel must be compiled with disk quota support enabled
 (SUSE kernels have this support).
 
-
-
-Authors:
-
-Marco van Wieringen 
-Johan Ekenberg 
-Jan Kara 
-
 %package nfs
 Summary:Disk Quota System on NFS
 Group:  System/Filesystems
-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:   quota = %{version}
 Requires:   rpcbind
-%else
-Requires:   portmap
-%endif
 Requires:   sysconfig
-# Split provides
-Provides:   quota:/etc/init.d/quotad
+Requires(post): %fillup_prereq
+Provides:   quota:%{_initddir}/quotad
+%{?systemd_requires}
 
 %description nfs
 The quotad init script, which provides quota support on NFS mounts.
 
-
-
-Authors:
-
-Marco van Wieringen 
-Johan Ekenberg 
-Jan Kara 
-
 %prep
-%setup -q -n quota-tools -a 1
+%setup -q -n quota-tools
 %patch1
 %patch2
 
@@ -90,70 +68,44 @@
--sysconfdir=%{_sysconfdir} \
--enable-netlink \
--enable-strip-binaries=no
-make
+make %{?_smp_mflags}
 
 %install
-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}
-#UsrMerge
-ln -s %{_sbindir}/{quotacheck,quotaon,quotaoff} ${RPM_BUILD_ROOT}/sbin/
-#EndUsrMerge
+make install ROOTDIR=%{buildroot}
+
 #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
+install -m 755 ldap-scripts/*pl %{bu

commit quota for openSUSE:Factory

2013-06-18 Thread h_root
Hello community,

here is the log from the commit of package quota for openSUSE:Factory checked 
in at 2013-06-18 10:37:01

Comparing /work/SRC/openSUSE:Factory/quota (Old)
 and  /work/SRC/openSUSE:Factory/.quota.new (New)


Package is "quota"

Changes:

--- /work/SRC/openSUSE:Factory/quota/quota.changes  2013-05-16 
11:30:28.0 +0200
+++ /work/SRC/openSUSE:Factory/.quota.new/quota.changes 2013-06-18 
10:37:03.0 +0200
@@ -1,0 +2,28 @@
+Thu Jun 13 20:22:56 UTC 2013 - sweet_...@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
+
+---

Old:

  quota-4.00-warnquota.patch
  quota-4.00.tar.gz

New:

  quota-4.01-warnquota.patch
  quota-4.01.tar.gz



Other differences:
--
++ quota.spec ++
--- /var/tmp/diff_new_pack.S9gkhr/_old  2013-06-18 10:37:04.0 +0200
+++ /var/tmp/diff_new_pack.S9gkhr/_new  2013-06-18 10:37:04.0 +0200
@@ -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 @@
 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 @@
 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 @@
 #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 @@
 %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

++ quota-4.00-warnquota.patch -> quota-4.01-warnquota.patch ++
--- /work/SRC/openSUSE:Factory/quota/quota-4.00-warnquota.patch 2012-06-10 
21:52:23.0 +0200
+++ /work/SRC/openSUSE:Factory/.quota.new/quota-4.01-warnquota.patch
2013-06-18 10:37:03.0 +0200
@@ -1,6 +1,6 @@
 --- ./warnquota.conf.orig
 +++ ./warnquota.conf
-@@ -1,55 +1,116 @@
+@@ -1,56 +1,116 @@
 -# this is an example warnquota.conf
 +###

commit quota for openSUSE:Factory

2013-05-16 Thread h_root
Hello community,

here is the log from the commit of package quota for openSUSE:Factory checked 
in at 2013-05-16 11:30:26

Comparing /work/SRC/openSUSE:Factory/quota (Old)
 and  /work/SRC/openSUSE:Factory/.quota.new (New)


Package is "quota"

Changes:

--- /work/SRC/openSUSE:Factory/quota/quota.changes  2012-11-05 
06:31:59.0 +0100
+++ /work/SRC/openSUSE:Factory/.quota.new/quota.changes 2013-05-16 
11:30:28.0 +0200
@@ -1,0 +2,5 @@
+Tue May 14 01:45:49 UTC 2013 - crrodrig...@opensuse.org
+
+- portmap --> rpcbind  
+
+---



Other differences:
--
++ quota.spec ++
--- /var/tmp/diff_new_pack.bGNT9H/_old  2013-05-16 11:30:29.0 +0200
+++ /var/tmp/diff_new_pack.bGNT9H/_new  2013-05-16 11:30:29.0 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package quota
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -56,7 +56,7 @@
 PreReq: %insserv_prereq %fillup_prereq
 # Require the services needed to be present for quotad service: portmap, 
nfsserver, network
 Requires:   nfs-kernel-server
-Requires:   portmap
+Requires:   rpcbind
 Requires:   sysconfig
 # Split provides
 Provides:   quota:/etc/init.d/quotad

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit quota for openSUSE:Factory

2012-11-04 Thread h_root
Hello community,

here is the log from the commit of package quota for openSUSE:Factory checked 
in at 2012-11-05 06:31:57

Comparing /work/SRC/openSUSE:Factory/quota (Old)
 and  /work/SRC/openSUSE:Factory/.quota.new (New)


Package is "quota", Maintainer is "dlova...@suse.com"

Changes:

--- /work/SRC/openSUSE:Factory/quota/quota.changes  2012-06-10 
21:52:23.0 +0200
+++ /work/SRC/openSUSE:Factory/.quota.new/quota.changes 2012-11-05 
06:31:59.0 +0100
@@ -1,0 +2,9 @@
+Wed Oct 31 15:39:22 UTC 2012 - crrodrig...@opensuse.org
+
+- boot.quota is obsoleted by systemd-quotacheck
+  
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. 
+
+---



Other differences:
--
++ quota.spec ++
--- /var/tmp/diff_new_pack.uxml3s/_old  2012-11-05 06:32:00.0 +0100
+++ /var/tmp/diff_new_pack.uxml3s/_new  2012-11-05 06:32:00.0 +0100
@@ -95,7 +95,7 @@
 #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/
-cp SUSE/{quotad,boot.quota} ${RPM_BUILD_ROOT}/etc/init.d
+cp SUSE/quotad ${RPM_BUILD_ROOT}/etc/init.d
 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,28 +103,18 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
-%{fillup_and_insserv -f -y boot.quota} 
-
 %post nfs
 %{fillup_only -an nfs}
 
-%preun
-%stop_on_removal boot.quota
-
 %preun nfs
 %stop_on_removal quotad
 
-%postun
-%{insserv_cleanup}
-
 %postun nfs
 %{insserv_cleanup}
 
 %files -f %{name}.lang
 %defattr(-,root,root)
 %config /etc/quotagrpadmins
-%config /etc/init.d/boot.quota
 %config /etc/quotatab
 %config /etc/warnquota.conf
 %doc SUSE/README.SUSE README.* doc

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit quota for openSUSE:Factory

2012-06-10 Thread h_root
Hello community,

here is the log from the commit of package quota for openSUSE:Factory checked 
in at 2012-06-10 20:19:22

Comparing /work/SRC/openSUSE:Factory/quota (Old)
 and  /work/SRC/openSUSE:Factory/.quota.new (New)


Package is "quota", Maintainer is "dlova...@suse.com"

Changes:

--- /work/SRC/openSUSE:Factory/quota/quota.changes  2012-06-05 
15:35:04.0 +0200
+++ /work/SRC/openSUSE:Factory/.quota.new/quota.changes 2012-06-10 
21:52:23.0 +0200
@@ -1,0 +2,48 @@
+Mon Jun  4 09:42:56 UTC 2012 - sweet_...@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)
+ 
+
+---

Old:

  quota-3.17-makefile.patch
  quota-3.17-warnquota.patch
  quota-4.00-pre1.tar.gz

New:

  quota-4.00-makefile.patch
  quota-4.00-warnquota.patch
  quota-4.00.tar.gz



Other differences:
--
++ quota.spec ++
--- /var/tmp/diff_new_pack.Wtl7v5/_old  2012-06-10 21:52:24.0 +0200
+++ /var/tmp/diff_new_pack.Wtl7v5/_new  2012-06-10 21:52:24.0 +0200
@@ -29,10 +29,10 @@
 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 @@
 %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}/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_RO

commit quota for openSUSE:Factory

2012-06-05 Thread h_root
Hello community,

here is the log from the commit of package quota for openSUSE:Factory checked 
in at 2012-06-05 15:35:00

Comparing /work/SRC/openSUSE:Factory/quota (Old)
 and  /work/SRC/openSUSE:Factory/.quota.new (New)


Package is "quota", Maintainer is "dlova...@suse.com"

Changes:

--- /work/SRC/openSUSE:Factory/quota/quota.changes  2012-01-04 
07:31:08.0 +0100
+++ /work/SRC/openSUSE:Factory/.quota.new/quota.changes 2012-06-05 
15:35:04.0 +0200
@@ -1,0 +2,8 @@
+Thu May 31 19:36:13 UTC 2012 - sweet_...@gmx.de
+
+- unroll binary file list
+- remove install_nld.patch, not needed since 4.00-pre1
+- remove automake dependency
+- prepare UsrMerge (UsrMerge project), this obsoletes man.patch
+
+---

Old:

  quota-3.17-install_nld.patch
  quota-3.17-man.patch



Other differences:
--
++ quota.spec ++
--- /var/tmp/diff_new_pack.aLjU0j/_old  2012-06-05 15:35:05.0 +0200
+++ /var/tmp/diff_new_pack.aLjU0j/_new  2012-06-05 15:35:05.0 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package quota
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,6 @@
 
 
 Name:   quota
-BuildRequires:  automake
 BuildRequires:  dbus-1-devel
 BuildRequires:  e2fsprogs-devel
 BuildRequires:  libnl-1_1-devel
@@ -33,9 +32,7 @@
 Source: %{name}-%{version}-pre1.tar.gz
 Source1:%{name}-SUSE.tar.bz2
 Patch1: %{name}-3.17-makefile.patch
-Patch2: %{name}-3.17-man.patch
 Patch3: %{name}-3.17-warnquota.patch
-Patch7: %{name}-3.17-install_nld.patch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -54,11 +51,12 @@
 
 %package nfs
 Summary:Disk Quota System on NFS
+Group:  System/Filesystems
 Requires:   quota = %version
 PreReq: %insserv_prereq %fillup_prereq
 # Require the services needed to be present for quotad service: portmap, 
nfsserver, network
-Requires:   portmap
 Requires:   nfs-kernel-server
+Requires:   portmap
 Requires:   sysconfig
 # Split provides
 Provides:   quota:/etc/init.d/quotad
@@ -77,15 +75,11 @@
 %prep
 %setup -q -n quota-tools -a 1
 %patch1
-%patch2
 %patch3
-%patch7
 find -type d -name CVS -exec rm -rf {} \; -prune
 find -type d | xargs chmod 755
 
 %build
-aclocal --force
-autoconf --force
 %configure \
--sysconfdir=%{_sysconfdir} \
--enable-netlink
@@ -98,13 +92,13 @@
 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.*
-mv ${RPM_BUILD_ROOT}%{_sbindir}/{quotacheck,quotaon,quotaoff} 
${RPM_BUILD_ROOT}/sbin/
+#UsrMerge
+ln -s %{_sbindir}/{quotacheck,quotaon,quotaoff} ${RPM_BUILD_ROOT}/sbin/
+#EndUsrMerge
 #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/
-#ln -sf ../../sbin/quotacheck ${RPM_BUILD_ROOT}/usr/sbin/quotacheck
 cp SUSE/{quotad,boot.quota} ${RPM_BUILD_ROOT}/etc/init.d
-#ln -s ../../etc/init.d/quota  ${RPM_BUILD_ROOT}/usr/sbin/rcquota
 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
@@ -138,11 +132,28 @@
 %config /etc/warnquota.conf
 %doc SUSE/README.SUSE README.* doc
 %doc %{_mandir}/man?/*
-/sbin/*
-%{_bindir}/*
-%{_sbindir}/*
-%exclude %{_sbindir}/rpc.rquotad
-%exclude %{_sbindir}/rcquotad
+#UsrMerge
+/sbin/quotacheck
+/sbin/quotaoff
+/sbin/quotaon
+#EndUsrMerge
+%{_bindir}/quota
+%{_sbindir}/applySystemQuotas.pl
+%{_sbindir}/convertquota
+%{_sbindir}/edquota
+%{_sbindir}/edquota_editor
+%{_sbindir}/quot
+%{_sbindir}/quota_nld
+%{_sbindir}/quotacheck
+%{_sbindir}/quotaoff
+%{_sbindir}/quotaon
+%{_sbindir}/quotastats
+%{_sbindir}/repquota
+%{_sbindir}/setSystemQuotas.pl
+%{_sbindir}/setquota
+%{_sbindir}/setquota-ldap.pl
+%{_sbindir}/warnquota
+%{_sbindir}/xqmstats
 
 %files nfs
 %defattr(-,root,root)

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit quota for openSUSE:Factory

2012-01-03 Thread h_root
Hello community,

here is the log from the commit of package quota for openSUSE:Factory checked 
in at 2012-01-04 07:31:06

Comparing /work/SRC/openSUSE:Factory/quota (Old)
 and  /work/SRC/openSUSE:Factory/.quota.new (New)


Package is "quota", Maintainer is "vci...@suse.com"

Changes:

--- /work/SRC/openSUSE:Factory/quota/quota.changes  2011-10-04 
18:14:40.0 +0200
+++ /work/SRC/openSUSE:Factory/.quota.new/quota.changes 2012-01-04 
07:31:08.0 +0100
@@ -1,0 +2,16 @@
+Wed Dec 21 10:31:45 UTC 2011 - co...@suse.com
+
+- remove call to suse_update_config (very old work around)
+
+---
+Fri Dec  2 08:52:52 UTC 2011 - cfarr...@suse.com
+
+- license update: GPL-2.0 and BSD-3-Clause
+  Package is dual licensed. Also, use SPDX format
+
+---
+Thu Dec  1 15:58:05 UTC 2011 - co...@suse.com
+
+- add automake as buildrequire to avoid implicit dependency
+
+---



Other differences:
--
++ quota.spec ++
--- /var/tmp/diff_new_pack.lIrkox/_old  2012-01-04 07:31:08.0 +0100
+++ /var/tmp/diff_new_pack.lIrkox/_new  2012-01-04 07:31:08.0 +0100
@@ -15,19 +15,21 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
-
 
 Name:   quota
-BuildRequires:  dbus-1-devel e2fsprogs-devel libnl-1_1-devel pkg-config 
tcpd-devel
+BuildRequires:  automake
+BuildRequires:  dbus-1-devel
+BuildRequires:  e2fsprogs-devel
+BuildRequires:  libnl-1_1-devel
+BuildRequires:  pkg-config
+BuildRequires:  tcpd-devel
 Version:4.00
-Release:1
+Release:0
 PreReq: %insserv_prereq %fillup_prereq
-AutoReqProv:on
-Group:  System/Filesystems
-License:GPLv2
 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
 Source1:%{name}-SUSE.tar.bz2
 Patch1: %{name}-3.17-makefile.patch
@@ -51,9 +53,7 @@
 Jan Kara 
 
 %package nfs
-License:GPLv2
 Summary:Disk Quota System on NFS
-Group:  System/Filesystems
 Requires:   quota = %version
 PreReq: %insserv_prereq %fillup_prereq
 # Require the services needed to be present for quotad service: portmap, 
nfsserver, network
@@ -84,7 +84,6 @@
 find -type d | xargs chmod 755
 
 %build
-%{suse_update_config -f}
 aclocal --force
 autoconf --force
 %configure \

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit quota for openSUSE:Factory

2011-10-04 Thread h_root

Hello community,

here is the log from the commit of package quota for openSUSE:Factory
checked in at Tue Oct 4 18:14:42 CEST 2011.




--- openSUSE:Factory/quota/quota.changes2011-09-23 12:44:02.0 
+0200
+++ /mounts/work_src_done/STABLE/quota/quota.changes2011-09-30 
18:02:00.0 +0200
@@ -1,0 +2,5 @@
+Fri Sep 30 16:01:22 UTC 2011 - u...@suse.com
+
+- cross-build fix: Mother Autoconf knows best, so don't interfere
+
+---

calling whatdependson for head-i586




Other differences:
--
++ quota.spec ++
--- /var/tmp/diff_new_pack.v9Y0JN/_old  2011-10-04 18:14:38.0 +0200
+++ /var/tmp/diff_new_pack.v9Y0JN/_new  2011-10-04 18:14:38.0 +0200
@@ -90,7 +90,7 @@
 %configure \
--sysconfdir=%{_sysconfdir} \
--enable-netlink
-make CC="gcc" 
+make
 
 %install
 install -d -m 755 ${RPM_BUILD_ROOT}/etc/init.d

continue with "q"...



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit quota for openSUSE:Factory

2011-09-23 Thread h_root

Hello community,

here is the log from the commit of package quota for openSUSE:Factory
checked in at Fri Sep 23 10:36:38 CEST 2011.




--- quota/quota.changes 2011-08-18 16:13:37.0 +0200
+++ /mounts/work_src_done/STABLE/quota/quota.changes2011-09-16 
14:21:44.0 +0200
@@ -1,0 +2,5 @@
+Fri Sep 16 12:02:37 UTC 2011 - jeng...@medozas.de
+
+- Select libnl-1_1-devel
+
+---

calling whatdependson for head-i586




Other differences:
--
++ quota.spec ++
--- /var/tmp/diff_new_pack.vrTNwY/_old  2011-09-23 10:36:32.0 +0200
+++ /var/tmp/diff_new_pack.vrTNwY/_new  2011-09-23 10:36:32.0 +0200
@@ -19,7 +19,7 @@
 
 
 Name:   quota
-BuildRequires:  dbus-1-devel e2fsprogs-devel libnl-devel pkg-config tcpd-devel
+BuildRequires:  dbus-1-devel e2fsprogs-devel libnl-1_1-devel pkg-config 
tcpd-devel
 Version:4.00
 Release:1
 PreReq: %insserv_prereq %fillup_prereq






Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit quota for openSUSE:Factory

2011-08-19 Thread h_root

Hello community,

here is the log from the commit of package quota for openSUSE:Factory
checked in at Fri Aug 19 09:55:50 CEST 2011.




--- quota/quota.changes 2011-02-18 11:48:31.0 +0100
+++ /mounts/work_src_done/STABLE/quota/quota.changes2011-08-18 
16:13:37.0 +0200
@@ -1,0 +2,21 @@
+Thu Aug 18 14:08:07 UTC 2011 - vci...@novell.com
+
+- update to 4.00-pre1
+- dropped nfs-mntpoint patch (merged upstream)
+- Changes in quota-tools from 3.17 to 4.00-pre1:
+  * don't try to set inode flags when getting them failed (Michalski Wojciech)
+  * added liblber to the list of libraries needed for LDAP support (Michael 
Meskes)
+  * Rewritten configuration script to create config.h (Jan Kara)
+  * Use /proc/mounts for mountpoint scanning (Jan Kara)
+  * Removed use of reserved identifiers (Jan Kara)
+  * Improved manpage of quota_nld (Eddie Eyles)
+  * Fixed long option handling of quota_nld (Jan Kara)
+  * Fixed error reporting when rpc format specified on command line (Jan Kara)
+  * Convert quota limits using rq_bsize from RPC request (Jan Kara)
+  * Added noreturn attribute to die to avoid false warnings (Jan Kara)
+  * 64-bit quota support, rewritten some code to allow clean integration (Jan 
Kara)
+  * Improved header of quota an repquota output when -s option is used (Jan 
Kara)
+  * Fixed mountpoint scanning when NFS mountpoint is specified on command line 
(Jan Kara)
+  * Updated manpage of quotactl(2) (Jan Kara)
+
+---

calling whatdependson for head-i586


Old:

  quota-3.17-nfs-mntpoint.patch
  quota-3.17.tar.bz2

New:

  quota-4.00-pre1.tar.gz



Other differences:
--
++ quota.spec ++
--- /var/tmp/diff_new_pack.j0rZFX/_old  2011-08-19 09:41:31.0 +0200
+++ /var/tmp/diff_new_pack.j0rZFX/_new  2011-08-19 09:41:31.0 +0200
@@ -20,22 +20,20 @@
 
 Name:   quota
 BuildRequires:  dbus-1-devel e2fsprogs-devel libnl-devel pkg-config tcpd-devel
-Version:3.17
-Release:14
+Version:4.00
+Release:1
 PreReq: %insserv_prereq %fillup_prereq
 AutoReqProv:on
 Group:  System/Filesystems
 License:GPLv2
 Url:http://sourceforge.net/projects/linuxquota/
 Summary:Disk Quota System
-Source: %{name}-%{version}.tar.bz2
+Source: %{name}-%{version}-pre1.tar.gz
 Source1:%{name}-SUSE.tar.bz2
-Patch1: %{name}-%{version}-makefile.patch
-Patch2: %{name}-%{version}-man.patch
-Patch3: %{name}-%{version}-warnquota.patch
-Patch7: %{name}-%{version}-install_nld.patch
-# PATCH-FIX-UPSTREAM fixed mountpoint scanning when NFS mountpoint is 
specified on command line
-Patch8: %{name}-%{version}-nfs-mntpoint.patch
+Patch1: %{name}-3.17-makefile.patch
+Patch2: %{name}-3.17-man.patch
+Patch3: %{name}-3.17-warnquota.patch
+Patch7: %{name}-3.17-install_nld.patch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -82,7 +80,6 @@
 %patch2
 %patch3
 %patch7
-%patch8
 find -type d -name CVS -exec rm -rf {} \; -prune
 find -type d | xargs chmod 755
 

++ quota-3.17-makefile.patch ++
--- /var/tmp/diff_new_pack.j0rZFX/_old  2011-08-19 09:41:31.0 +0200
+++ /var/tmp/diff_new_pack.j0rZFX/_new  2011-08-19 09:41:31.0 +0200
@@ -1,11 +1,13 @@
 Makefile.in
+Index: Makefile.in
+===
+--- Makefile.in.orig
 +++ Makefile.in
-@@ -16,16 +16,16 @@
- CFLAGS   += @HOSTS_ACCESS@
+@@ -10,16 +10,16 @@ LDFLAGS   = @LDFLAGS@
+ LDAPLIBS  = @LDAPLIBS@
  
  INSTALL   = @INSTALL@
 -STRIP = -s
-+STRIP = 
++STRIP =
  LN= ln -sf
  ROOTDIR   =
  SUPER_OWNER   = root






Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org