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.changes 2019-08-13 13:25:23.705353165 +0200 @@ -1,0 +2,6 @@ +Mon Aug 12 14:58:32 UTC 2019 - Tomáš Chvátal <tchva...@suse.com> + +- 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 <j...@suse.cz> +Date: Mon, 1 Apr 2019 17:28:34 +0200 +Subject: [PATCH] warnquota: Improve examples in warnquota.conf + +Signed-off-by: Jan Kara <j...@suse.cz> +--- + 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 = 389 +-# LDAP_TLS = false (false|never|allow|try|demand) use StarTLS +-# false - don't use starTLS ++ ++# TLS handling for the connection ++# ++# LDAP_TLS = (false|never|allow|try|demand) ++# false - don't use start TLS + # 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 ++ # # end of example warnquota.conf file # +-- +2.22.0 +
