Accepting request 236949 from Base:System

1 OBS-URL: https://build.opensuse.org/request/show/236949 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/quota?expand=0&rev=45
2014-06-16 19:33:02 +00:00 · 2014-06-16 19:33:02 +00:00 · 1bda06ba35
commit 1bda06ba35
parent 92f42a6d9e e7c08ba94f
5 changed files with 62 additions and 104 deletions
--- a/quota-4.01-warnquota.patch
+++ b/quota-4.01-warnquota.patch
@ -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 		= "sysadm@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 	= "support@example.com"
 -PHONE 		= "(123) 456-1111 or (222) 333-4444"
-+
-+#
-+# 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 way text can be split to more lines
-# Line breaks are done by '|' character
-+#
- # The expressions %i, %h, %d, and %% are substituted for user/group name,
- # host name, domain name, and '%' respectively. For backward compatibility
- # %s behaves as %i but is deprecated.
- MESSAGE         = Hello user %i, I've noticed you use too much space\
-  on my disk in %h.%d.|Delete your files on the following filesystems:|
-# Text in the end of the mail (if not specified, default text using SUPPORT and PHONE
-# is created)
-+
-+#
-+# Text in the end of the mail.
-+# If not specified, default text using SUPPORT and PHONE is created.
-+#
- SIGNATURE	= See you!|			Your admin of %h|
-# Following text is used for mails about group exceeding quotas
-+
-+#
-+# The 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:|
-# Text in the end of the mail to the group (if not specified, default text using SUPPORT
-# and PHONE is created).
-+
-+#
-+# Text in the end of the mail to the group.
-+# If not specified, default text using SUPPORT and PHONE is created.
-+#
- GROUP_SIGNATURE	= See you!|			Your admin|
-+
-+#
-+# If you are running warnquota on a mail server, and don't want bounces
-+# because clients can not receive mail setting this to "any" will cause
-+# warnquota to not send them mail for all devices.  If you set this to the
-+# device name (for example /dev/hdb1) then they will not be sent mail if they
-+# are overquota on that device only, and will be sent mail for all other
-+# devices.
+ # This way text can be split to more lines
+ # Line breaks are done by '|' character
+@@ -45,27 +61,31 @@ GROUP_SIGNATURE	= See you!|			Your admin
 #
-#If you are running warnquota on a mail server, and don't want bounces
-#because clients cannot receive mail setting this to "any" will cause
-#warnquota to not send them mail for all devices.  If you set this to the
-#device name (for example /dev/hdb1) then they will not be sent mail if they
-#are overquota on that device only, and will be sent mail for all other
-#devices.
- #MAILDEV        =
-+
-+#
-+# Here you can set a charset for emails sent by warnquota (e.g. UTF-8)
- #
-#Here you can set a charset for emails sent by warnquota (e.g. UTF-8)
+ #Here you can set a charset for emails sent by warnquota (e.g. UTF-8)
 #CHARSET	= 
 -# If you are using LDAP mail lookups.
-+
-+##############################################################
-+# Configuration for LDAP (if you are using LDAP mail lookups)
- # host, port, tls, binddn, and bindpw are straight forward.
+-# host, port, tls, binddn, and bindpw are straight forward.
 -# LDAP_BASEDN is your search base dn
 -# LDAP_SEARCH_ATTRIBUTE is the attr for the value you are looking for
 -# LDAP_MAIL_ATTRIBUTE is the attribute you want used for the mail address
 -# LDAP_DEFAULT_MAIL_DOMAIN is the default domain
 -#    if the attribute isn't found
+-# 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
+-# 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_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
+
+##############################################################
+# Configuration for LDAP (if you are using LDAP mail lookups)
+ # host, port, tls, binddn, and bindpw are straight forward.
 +##############################################################
 +
-+#
+ #
+-# end of example warnquota.conf file
 +# Your search base dn
 +#
 +# LDAP_BASEDN
 +
-+#
+ #
 +# The attr for the value you are looking for
 +#
 +# LDAP_SEARCH_ATTRIBUTE
@ -145,16 +102,5 @@
 +# The default domain if the attribute isn't found
 +#
 +# LDAP_DEFAULT_MAIL_DOMAIN
-+
- # 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
-@@ -65,6 +125,5 @@
- # LDAP_SEARCH_ATTRIBUTE = uid
- # LDAP_MAIL_ATTRIBUTE = mailLocalAddress
- # LDAP_DEFAULT_MAIL_DOMAIN = YourDefaultMailDomain.com
-#
-# end of example warnquota.conf file
-#
 +
 +# end of warnquota.conf file
--- a/quota-4.01.tar.gz
+++ b/quota-4.01.tar.gz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a36300bbc126b79b745bf937245092808b4585aa3309ef3335d4ab9d873cd206
-size 458123
--- a/quota-4.01_git201405011753.tar.xz
+++ b/quota-4.01_git201405011753.tar.xz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ccde4e989fb3a666f62fe6f139192bf5faab80a3b80beb67e326a3fe92ab3636
+size 211284
--- a/quota.changes
+++ b/quota.changes
@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Wed May 28 00:03:03 UTC 2014 - crrodriguez@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.
+
 -------------------------------------------------------------------
 Mon May 19 09:22:00 UTC 2014 - tchvatal@suse.com

--- a/quota.spec
+++ b/quota.spec
@ -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 @@ Provides:       quota:%{_initddir}/quotad
 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 \