Commit 57dc3714 by Gabriel C

quota-tools-4.04-1-x86_64

* Version bump
* removed patches , all are upstream now
parent 14046974
......@@ -2,8 +2,8 @@
# Maintainer: Miklos Vajna <vmiklos@frugalware.org>
pkgname=quota-tools
pkgver=4.03
pkgrel=2
pkgver=4.04
pkgrel=1
pkgdesc="Linux disk quota utilities"
depends=('e2fsprogs>=1.42.13-4')
rodepends=('systemd>=231-7')
......@@ -16,13 +16,9 @@ _F_archive_grepv="pre"
Finclude sourceforge
backup=('etc/warnquota.conf' 'etc/quotatab' 'etc/quotagrpadmins')
url="http://sourceforge.net/projects/linuxquota/"
source=($source README.Frugalware \
quota-4.03-fix_build_without_ldap.patch \
quota-4.03-dont_override_cflags.patch)
sha1sums=('a8898331870459f73018043d139514b040125bdb' \
'5c16336dce569446d9df7ce7a70c951f2b9a2af4' \
'603ac878e8b6d4d51674926fa548088ae91511e8' \
'65d65935c543495db4cf1bcac571a24893b87127')
source+=(README.Frugalware)
sha1sums=('38e6cc7538d504891a8454bbdabef058bd1adc11' \
'5c16336dce569446d9df7ce7a70c951f2b9a2af4')
build()
{
......
commit 776757a23e9930588950c7fcbc7827ec7a3e51c4
Author: Tomáš Chvátal <tchvatal@suse.com>
Date: Mon Jan 4 15:48:19 2016 +0100
Do not accidentaly override commandline passed CFLAGS.
Signed-off-by: Tomáš Chvátal <tchvatal@suse.com>
Signed-off-by: Jan Kara <jack@suse.cz>
diff --git a/configure.ac b/configure.ac
index 3ba1386..1552c15 100644
--- a/configure.ac
+++ b/configure.ac
@@ -53,7 +53,7 @@ AS_IF([test "x${prefix}" = "xNONE"], [
# ================
# Check for cflags
# ================
-CFLAGS="-D_GNU_SOURCE -Wall -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64"
+CFLAGS="$CFLAGS -D_GNU_SOURCE -Wall -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64"
AC_ARG_ENABLE([werror],
[AS_HELP_STRING([--enable-werror], [Treat all warnings as errors, useful for development])],
[enable_werror="$enableval"],
commit 39fd30ce57e3c34c3649866bf9345a71f0b78667
Author: Jan Kara <jack@suse.cz>
Date: Mon Jan 4 15:10:53 2016 +0100
Fix build with disabled ldap
Reported-by: Tomas Chvatal <tchvatal@suse.com>
Signed-off-by: Jan Kara <jack@suse.cz>
diff --git a/warnquota.c b/warnquota.c
index 3734f0e..e9868c1 100644
--- a/warnquota.c
+++ b/warnquota.c
@@ -109,13 +109,13 @@ struct configparams {
char *user_signature;
char *group_message;
char *group_signature;
+ time_t cc_before;
+#ifdef USE_LDAP_MAIL_LOOKUP
int use_ldap_mail; /* 0 */
+ int ldap_is_setup; /* 0 */
int ldap_starttls; /* 0 */
int ldap_tls; /* LDAP_OPT_X_TLS_NEVER */
int ldap_vers; /* LDAP_VERSION3 */
- time_t cc_before;
-#ifdef USE_LDAP_MAIL_LOOKUP
- int ldap_is_setup; /* 0 */
char ldap_host[CNF_BUFFER];
int ldap_port;
char ldap_uri[CNF_BUFFER];
@@ -729,13 +729,13 @@ static int readconfigfile(const char *filename, struct configparams *config)
}
maildev[0] = 0;
config->user_signature = config->user_message = config->group_signature = config->group_message = NULL;
+ config->cc_before = -1;
+
+#ifdef USE_LDAP_MAIL_LOOKUP
config->use_ldap_mail = 0;
config->ldap_starttls = 0;
config->ldap_tls = LDAP_OPT_X_TLS_NEVER;
config->ldap_vers = LDAP_VERSION3;
- config->cc_before = -1;
-
-#ifdef USE_LDAP_MAIL_LOOKUP
config->ldap_port = config->ldap_is_setup = 0;
config->ldap_host[0] = 0;
config->ldap_uri[0] = 0;
@@ -820,6 +820,18 @@ static int readconfigfile(const char *filename, struct configparams *config)
create_eoln(config->group_signature);
verify_format(config->group_signature, "GROUP_SIGNATURE");
}
+ else if (!strcmp(var, "CC_BEFORE")) {
+ int num;
+ char unit[10];
+
+ if (sscanf(value, "%d%s", &num, unit) != 2)
+ goto cc_parse_err;
+ if (str2timeunits(num, unit, &config->cc_before) < 0) {
+cc_parse_err:
+ die(1, _("Cannot parse time at CC_BEFORE variable (line %d).\n"), line);
+ }
+ }
+#ifdef USE_LDAP_MAIL_LOOKUP
else if (!strcmp(var, "LDAP_MAIL")) {
if(strcasecmp(value, "true") == 0)
config->use_ldap_mail = 1;
@@ -846,18 +858,6 @@ static int readconfigfile(const char *filename, struct configparams *config)
else
config->ldap_starttls = 0;
}
- else if (!strcmp(var, "CC_BEFORE")) {
- int num;
- char unit[10];
-
- if (sscanf(value, "%d%s", &num, unit) != 2)
- goto cc_parse_err;
- if (str2timeunits(num, unit, &config->cc_before) < 0) {
-cc_parse_err:
- die(1, _("Cannot parse time at CC_BEFORE variable (line %d).\n"), line);
- }
- }
-#ifdef USE_LDAP_MAIL_LOOKUP
else if (!strcmp(var, "LDAP_HOST"))
sstrncpy(config->ldap_host, value, CNF_BUFFER);
else if (!strcmp(var, "LDAP_PORT"))
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment