sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

quota: update to version 4.03 

4.02 -> 4.03

a) Added PACKAGECONFIG for ldapmail
b) Added the following backported patches
        1. 0001-Fix-build-with-disabled-ldap.patch
        2. 0001-Do-not-accidentaly-override-commandline-passed-CFLAG.patch

c) Removed following patch due to changes in buildsystem
        1. config-tcpwrappers.patch
d) Added libnl and dbus in build-deps

(From OE-Core rev: ee2c3293dd2e4b23c81444e503a672f5883316ba)

Signed-off-by: Maxin B. John <maxin.john@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Maxin B. John 2016-02-09 19:48:50 +02:00 committed by Richard Purdie
parent 25d2956d97
commit 216e618a7f
4 changed files with 135 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
meta/recipes-extended/quota/quota/0001-Do-not-accidentaly-override-commandline-passed-CFLAG.patch Normal file
View File

@ -0,0 +1,33 @@
From 776757a23e9930588950c7fcbc7827ec7a3e51c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Mon, 4 Jan 2016 15:48:19 +0100
Subject: [PATCH] Do not accidentaly override commandline passed CFLAGS.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Upstream-Status: Backport
Signed-off-by: Tomáš Chvátal <tchvatal@suse.com>
Signed-off-by: Jan Kara <jack@suse.cz>
Signed-off-by: Maxin B. John <maxin.john@intel.com>
---
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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"],
--
2.4.0

93
meta/recipes-extended/quota/quota/0001-Fix-build-with-disabled-ldap.patch Normal file
View File

@ -0,0 +1,93 @@
From 39fd30ce57e3c34c3649866bf9345a71f0b78667 Mon Sep 17 00:00:00 2001
From: Jan Kara <jack@suse.cz>
Date: Mon, 4 Jan 2016 15:10:53 +0100
Subject: [PATCH] Fix build with disabled ldap
Upstream-Status: Backport
Reported-by: Tomas Chvatal <tchvatal@suse.com>
Signed-off-by: Jan Kara <jack@suse.cz>
Signed-off-by: Maxin B. John <maxin.john@intel.com>
---
warnquota.c | 36 ++++++++++++++++++------------------
1 file changed, 18 insertions(+), 18 deletions(-)
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"))
--
2.4.0

75
meta/recipes-extended/quota/quota/config-tcpwrappers.patch
View File

@ -1,75 +0,0 @@
Upstream-Status: Pending
--- quota-tools.orig/configure.in
+++ quota-tools/configure.in
@@ -151,33 +151,46 @@ AC_SUBST(QUOTA_NETLINK_PROG)
AC_SUBST(NETLINKLIBS)
AC_SEARCH_LIBS(gethostbyname, nsl)
-AC_MSG_CHECKING(for host_access in -lwrap)
-AC_CACHE_VAL(ac_cv_lib_wrap_main,
- saved_LIBS="$LIBS"
- LIBS="$LIBS -lwrap"
- [AC_LINK_IFELSE([AC_LANG_PROGRAM([[
- #include <stdio.h>
- #include <sys/types.h>
- #include <sys/socket.h>
- #include <netinet/in.h>
- #include <tcpd.h>
- struct request_info request;
- int deny_severity, allow_severity;]],[[hosts_access(&request);]])],
- dnl We always restore LIBS as we add -lwrap in the next check
- [ac_cv_lib_wrap_main=yes; LIBS="$saved_LIBS"; AC_MSG_RESULT(yes)],
- [ac_cv_lib_wrap_main=no; LIBS="$saved_LIBS"; AC_MSG_RESULT(no)])
- ])
-if test ${ac_cv_lib_wrap_main} = yes; then
- AC_CHECK_HEADER(tcpd.h,, [
- echo 'ERROR: could not find tcpd.h - missing TCP wrappers package'
- exit 1
- ])
- LIBS="$LIBS -lwrap"
- AC_DEFINE([HOSTS_ACCESS], 1, [Use hosts.allow and hosts.deny for access checking of rpc.rquotad])
- COMPILE_OPTS="$COMPILE_OPTS HOSTS_ACCESS"
+AC_ARG_WITH(tcpwrappers,
+ [ --with-tcpwrappers=[yes/no/try] Use hosts.allow and hosts.deny for access checking of rpc.rquota [default=yes, if available.]],
+ ,
+ with_tcpwrappers="try")
+
+if test "x$with_tcpwrappers" != xno; then
+ AC_MSG_CHECKING(for host_access in -lwrap)
+ AC_CACHE_VAL(ac_cv_lib_wrap_main,
+ saved_LIBS="$LIBS"
+ LIBS="$LIBS -lwrap"
+ [AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+ #include <stdio.h>
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <netinet/in.h>
+ #include <tcpd.h>
+ struct request_info request;
+ int deny_severity, allow_severity;]],[[hosts_access(&request);]])],
+ dnl We always restore LIBS as we add -lwrap in the next try
+ [ac_cv_lib_wrap_main=yes; LIBS="$saved_LIBS"; AC_MSG_RESULT(yes)],
+ [ac_cv_lib_wrap_main=no; LIBS="$saved_LIBS"; AC_MSG_RESULT(no)])
+ ])
+
+ if test "x$ac_cv_lib_wrap_main" = xyes; then
+ AC_CHECK_HEADER(tcpd.h,, [
+ if test "x$with_tcpwrappers" != xtry; then
+ AC_MSG_ERROR([could not find tcpd.h - missing TCP wrappers package])
+ fi
+ ])
+
+ LIBS="$LIBS -lwrap"
+ AC_DEFINE([HOSTS_ACCESS], 1, [Use hosts.allow and hosts.deny for access checking of rpc.rquotad])
+ COMPILE_OPTS="$COMPILE_OPTS HOSTS_ACCESS"
+ elif test "x$with_tcpwrappers" != xtry; then
+ AC_MSG_ERROR([could not find libwrap - missing TCP wrappers package])
+ fi
fi
+
dnl Checks for typedefs, structures, and compiler characteristics.
AC_C_CONST
AC_C_INLINE

23
meta/recipes-extended/quota/quota_4.02.bb → meta/recipes-extended/quota/quota_4.03.bb
View File

@ -8,36 +8,31 @@ LIC_FILES_CHKSUM = "file://quota.c;beginline=1;endline=33;md5=331c7d77744bfe0ad2
file://svc_socket.c;beginline=1;endline=17;md5=24d5a8792da45910786eeac750be8ceb"
SRC_URI = "${SOURCEFORGE_MIRROR}/project/linuxquota/quota-tools/${PV}/quota-${PV}.tar.gz \
file://config-tcpwrappers.patch \
file://0001-Fix-build-with-disabled-ldap.patch \
file://0001-Do-not-accidentaly-override-commandline-passed-CFLAG.patch \
file://fcntl.patch \
file://remove_non_posix_types.patch \
"
"
SRC_URI_append_libc-musl = " file://replace_getrpcbynumber_r.patch"
SRC_URI[md5sum] = "a8a5df262261e659716ccad2a5d6df0d"
SRC_URI[sha256sum] = "f4c2f48abf94bbdc396df33d276f2e9d19af58c232cb85eef9c174a747c33795"
SRC_URI[md5sum] = "6b09f9c93515c25a528be5754cdfb6f5"
SRC_URI[sha256sum] = "9c6c4d9ae7bf30506dd2aa3d8056c4ff2f8d087930d7c721616f5c093bdc674b"
UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/linuxquota/files/quota-tools/"
UPSTREAM_CHECK_REGEX = "/quota-tools/(?P<pver>(\d+[\.\-_]*)+)/"
S = "${WORKDIR}/quota-tools"
DEPENDS = "gettext-native e2fsprogs"
DEPENDS = "gettext-native e2fsprogs libnl dbus"
inherit autotools-brokensep gettext pkgconfig
CFLAGS += "-I${STAGING_INCDIR}/tirpc"
LDFLAGS += "-ltirpc"
ASNEEDED = ""
EXTRA_OEMAKE += 'STRIP=""'
PACKAGECONFIG ??= "tcp-wrappers rpc bsd"
PACKAGECONFIG_libc-musl = "tcp-wrappers rpc"
PACKAGECONFIG[tcp-wrappers] = "--with-tcpwrappers,--without-tcpwrappers,tcp-wrappers"
PACKAGECONFIG[rpc] = "--enable-rpc=yes,--enable-rpc=no,libtirpc"
PACKAGECONFIG[tcp-wrappers] = "--enable-libwrap,--disable-libwrap,tcp-wrappers"
PACKAGECONFIG[rpc] = "--enable-rpc,--disable-rpc,libtirpc"
PACKAGECONFIG[bsd] = "--enable-bsd_behaviour=yes,--enable-bsd_behaviour=no,"
do_install() {
oe_runmake ROOTDIR=${D} install
}
PACKAGECONFIG[ldapmail] = "--enable-ldapmail,--disable-ldapmail,openldap"