summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta/recipes-extended/quota/quota/0001-Do-not-accidentaly-override-commandline-passed-CFLAG.patch33
-rw-r--r--meta/recipes-extended/quota/quota/0001-Fix-build-with-disabled-ldap.patch93
-rw-r--r--meta/recipes-extended/quota/quota/config-tcpwrappers.patch75
-rw-r--r--meta/recipes-extended/quota/quota_4.03.bb (renamed from meta/recipes-extended/quota/quota_4.02.bb)23
4 files changed, 135 insertions, 89 deletions
diff --git a/meta/recipes-extended/quota/quota/0001-Do-not-accidentaly-override-commandline-passed-CFLAG.patch b/meta/recipes-extended/quota/quota/0001-Do-not-accidentaly-override-commandline-passed-CFLAG.patch
new file mode 100644
index 0000000000..6add4708ae
--- /dev/null
+++ b/meta/recipes-extended/quota/quota/0001-Do-not-accidentaly-override-commandline-passed-CFLAG.patch
@@ -0,0 +1,33 @@
1From 776757a23e9930588950c7fcbc7827ec7a3e51c4 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
3Date: Mon, 4 Jan 2016 15:48:19 +0100
4Subject: [PATCH] Do not accidentaly override commandline passed CFLAGS.
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9Upstream-Status: Backport
10
11Signed-off-by: Tomáš Chvátal <tchvatal@suse.com>
12Signed-off-by: Jan Kara <jack@suse.cz>
13Signed-off-by: Maxin B. John <maxin.john@intel.com>
14---
15 configure.ac | 2 +-
16 1 file changed, 1 insertion(+), 1 deletion(-)
17
18diff --git a/configure.ac b/configure.ac
19index 3ba1386..1552c15 100644
20--- a/configure.ac
21+++ b/configure.ac
22@@ -53,7 +53,7 @@ AS_IF([test "x${prefix}" = "xNONE"], [
23 # ================
24 # Check for cflags
25 # ================
26-CFLAGS="-D_GNU_SOURCE -Wall -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64"
27+CFLAGS="$CFLAGS -D_GNU_SOURCE -Wall -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64"
28 AC_ARG_ENABLE([werror],
29 [AS_HELP_STRING([--enable-werror], [Treat all warnings as errors, useful for development])],
30 [enable_werror="$enableval"],
31--
322.4.0
33
diff --git a/meta/recipes-extended/quota/quota/0001-Fix-build-with-disabled-ldap.patch b/meta/recipes-extended/quota/quota/0001-Fix-build-with-disabled-ldap.patch
new file mode 100644
index 0000000000..a79e477968
--- /dev/null
+++ b/meta/recipes-extended/quota/quota/0001-Fix-build-with-disabled-ldap.patch
@@ -0,0 +1,93 @@
1From 39fd30ce57e3c34c3649866bf9345a71f0b78667 Mon Sep 17 00:00:00 2001
2From: Jan Kara <jack@suse.cz>
3Date: Mon, 4 Jan 2016 15:10:53 +0100
4Subject: [PATCH] Fix build with disabled ldap
5
6Upstream-Status: Backport
7
8Reported-by: Tomas Chvatal <tchvatal@suse.com>
9Signed-off-by: Jan Kara <jack@suse.cz>
10Signed-off-by: Maxin B. John <maxin.john@intel.com>
11---
12 warnquota.c | 36 ++++++++++++++++++------------------
13 1 file changed, 18 insertions(+), 18 deletions(-)
14
15diff --git a/warnquota.c b/warnquota.c
16index 3734f0e..e9868c1 100644
17--- a/warnquota.c
18+++ b/warnquota.c
19@@ -109,13 +109,13 @@ struct configparams {
20 char *user_signature;
21 char *group_message;
22 char *group_signature;
23+ time_t cc_before;
24+#ifdef USE_LDAP_MAIL_LOOKUP
25 int use_ldap_mail; /* 0 */
26+ int ldap_is_setup; /* 0 */
27 int ldap_starttls; /* 0 */
28 int ldap_tls; /* LDAP_OPT_X_TLS_NEVER */
29 int ldap_vers; /* LDAP_VERSION3 */
30- time_t cc_before;
31-#ifdef USE_LDAP_MAIL_LOOKUP
32- int ldap_is_setup; /* 0 */
33 char ldap_host[CNF_BUFFER];
34 int ldap_port;
35 char ldap_uri[CNF_BUFFER];
36@@ -729,13 +729,13 @@ static int readconfigfile(const char *filename, struct configparams *config)
37 }
38 maildev[0] = 0;
39 config->user_signature = config->user_message = config->group_signature = config->group_message = NULL;
40+ config->cc_before = -1;
41+
42+#ifdef USE_LDAP_MAIL_LOOKUP
43 config->use_ldap_mail = 0;
44 config->ldap_starttls = 0;
45 config->ldap_tls = LDAP_OPT_X_TLS_NEVER;
46 config->ldap_vers = LDAP_VERSION3;
47- config->cc_before = -1;
48-
49-#ifdef USE_LDAP_MAIL_LOOKUP
50 config->ldap_port = config->ldap_is_setup = 0;
51 config->ldap_host[0] = 0;
52 config->ldap_uri[0] = 0;
53@@ -820,6 +820,18 @@ static int readconfigfile(const char *filename, struct configparams *config)
54 create_eoln(config->group_signature);
55 verify_format(config->group_signature, "GROUP_SIGNATURE");
56 }
57+ else if (!strcmp(var, "CC_BEFORE")) {
58+ int num;
59+ char unit[10];
60+
61+ if (sscanf(value, "%d%s", &num, unit) != 2)
62+ goto cc_parse_err;
63+ if (str2timeunits(num, unit, &config->cc_before) < 0) {
64+cc_parse_err:
65+ die(1, _("Cannot parse time at CC_BEFORE variable (line %d).\n"), line);
66+ }
67+ }
68+#ifdef USE_LDAP_MAIL_LOOKUP
69 else if (!strcmp(var, "LDAP_MAIL")) {
70 if(strcasecmp(value, "true") == 0)
71 config->use_ldap_mail = 1;
72@@ -846,18 +858,6 @@ static int readconfigfile(const char *filename, struct configparams *config)
73 else
74 config->ldap_starttls = 0;
75 }
76- else if (!strcmp(var, "CC_BEFORE")) {
77- int num;
78- char unit[10];
79-
80- if (sscanf(value, "%d%s", &num, unit) != 2)
81- goto cc_parse_err;
82- if (str2timeunits(num, unit, &config->cc_before) < 0) {
83-cc_parse_err:
84- die(1, _("Cannot parse time at CC_BEFORE variable (line %d).\n"), line);
85- }
86- }
87-#ifdef USE_LDAP_MAIL_LOOKUP
88 else if (!strcmp(var, "LDAP_HOST"))
89 sstrncpy(config->ldap_host, value, CNF_BUFFER);
90 else if (!strcmp(var, "LDAP_PORT"))
91--
922.4.0
93
diff --git a/meta/recipes-extended/quota/quota/config-tcpwrappers.patch b/meta/recipes-extended/quota/quota/config-tcpwrappers.patch
deleted file mode 100644
index 5f47fbd183..0000000000
--- a/meta/recipes-extended/quota/quota/config-tcpwrappers.patch
+++ /dev/null
@@ -1,75 +0,0 @@
1Upstream-Status: Pending
2
3--- quota-tools.orig/configure.in
4+++ quota-tools/configure.in
5@@ -151,33 +151,46 @@ AC_SUBST(QUOTA_NETLINK_PROG)
6 AC_SUBST(NETLINKLIBS)
7
8 AC_SEARCH_LIBS(gethostbyname, nsl)
9-AC_MSG_CHECKING(for host_access in -lwrap)
10-AC_CACHE_VAL(ac_cv_lib_wrap_main,
11- saved_LIBS="$LIBS"
12- LIBS="$LIBS -lwrap"
13- [AC_LINK_IFELSE([AC_LANG_PROGRAM([[
14- #include <stdio.h>
15- #include <sys/types.h>
16- #include <sys/socket.h>
17- #include <netinet/in.h>
18- #include <tcpd.h>
19- struct request_info request;
20- int deny_severity, allow_severity;]],[[hosts_access(&request);]])],
21- dnl We always restore LIBS as we add -lwrap in the next check
22- [ac_cv_lib_wrap_main=yes; LIBS="$saved_LIBS"; AC_MSG_RESULT(yes)],
23- [ac_cv_lib_wrap_main=no; LIBS="$saved_LIBS"; AC_MSG_RESULT(no)])
24- ])
25
26-if test ${ac_cv_lib_wrap_main} = yes; then
27- AC_CHECK_HEADER(tcpd.h,, [
28- echo 'ERROR: could not find tcpd.h - missing TCP wrappers package'
29- exit 1
30- ])
31- LIBS="$LIBS -lwrap"
32- AC_DEFINE([HOSTS_ACCESS], 1, [Use hosts.allow and hosts.deny for access checking of rpc.rquotad])
33- COMPILE_OPTS="$COMPILE_OPTS HOSTS_ACCESS"
34+AC_ARG_WITH(tcpwrappers,
35+ [ --with-tcpwrappers=[yes/no/try] Use hosts.allow and hosts.deny for access checking of rpc.rquota [default=yes, if available.]],
36+ ,
37+ with_tcpwrappers="try")
38+
39+if test "x$with_tcpwrappers" != xno; then
40+ AC_MSG_CHECKING(for host_access in -lwrap)
41+ AC_CACHE_VAL(ac_cv_lib_wrap_main,
42+ saved_LIBS="$LIBS"
43+ LIBS="$LIBS -lwrap"
44+ [AC_LINK_IFELSE([AC_LANG_PROGRAM([[
45+ #include <stdio.h>
46+ #include <sys/types.h>
47+ #include <sys/socket.h>
48+ #include <netinet/in.h>
49+ #include <tcpd.h>
50+ struct request_info request;
51+ int deny_severity, allow_severity;]],[[hosts_access(&request);]])],
52+ dnl We always restore LIBS as we add -lwrap in the next try
53+ [ac_cv_lib_wrap_main=yes; LIBS="$saved_LIBS"; AC_MSG_RESULT(yes)],
54+ [ac_cv_lib_wrap_main=no; LIBS="$saved_LIBS"; AC_MSG_RESULT(no)])
55+ ])
56+
57+ if test "x$ac_cv_lib_wrap_main" = xyes; then
58+ AC_CHECK_HEADER(tcpd.h,, [
59+ if test "x$with_tcpwrappers" != xtry; then
60+ AC_MSG_ERROR([could not find tcpd.h - missing TCP wrappers package])
61+ fi
62+ ])
63+
64+ LIBS="$LIBS -lwrap"
65+ AC_DEFINE([HOSTS_ACCESS], 1, [Use hosts.allow and hosts.deny for access checking of rpc.rquotad])
66+ COMPILE_OPTS="$COMPILE_OPTS HOSTS_ACCESS"
67+ elif test "x$with_tcpwrappers" != xtry; then
68+ AC_MSG_ERROR([could not find libwrap - missing TCP wrappers package])
69+ fi
70 fi
71
72+
73 dnl Checks for typedefs, structures, and compiler characteristics.
74 AC_C_CONST
75 AC_C_INLINE
diff --git a/meta/recipes-extended/quota/quota_4.02.bb b/meta/recipes-extended/quota/quota_4.03.bb
index 319a088d5c..4a980464b1 100644
--- a/meta/recipes-extended/quota/quota_4.02.bb
+++ b/meta/recipes-extended/quota/quota_4.03.bb
@@ -8,36 +8,31 @@ LIC_FILES_CHKSUM = "file://quota.c;beginline=1;endline=33;md5=331c7d77744bfe0ad2
8 file://svc_socket.c;beginline=1;endline=17;md5=24d5a8792da45910786eeac750be8ceb" 8 file://svc_socket.c;beginline=1;endline=17;md5=24d5a8792da45910786eeac750be8ceb"
9 9
10SRC_URI = "${SOURCEFORGE_MIRROR}/project/linuxquota/quota-tools/${PV}/quota-${PV}.tar.gz \ 10SRC_URI = "${SOURCEFORGE_MIRROR}/project/linuxquota/quota-tools/${PV}/quota-${PV}.tar.gz \
11 file://config-tcpwrappers.patch \ 11 file://0001-Fix-build-with-disabled-ldap.patch \
12 file://0001-Do-not-accidentaly-override-commandline-passed-CFLAG.patch \
12 file://fcntl.patch \ 13 file://fcntl.patch \
13 file://remove_non_posix_types.patch \ 14 file://remove_non_posix_types.patch \
14 " 15 "
15SRC_URI_append_libc-musl = " file://replace_getrpcbynumber_r.patch" 16SRC_URI_append_libc-musl = " file://replace_getrpcbynumber_r.patch"
16 17
17SRC_URI[md5sum] = "a8a5df262261e659716ccad2a5d6df0d" 18SRC_URI[md5sum] = "6b09f9c93515c25a528be5754cdfb6f5"
18SRC_URI[sha256sum] = "f4c2f48abf94bbdc396df33d276f2e9d19af58c232cb85eef9c174a747c33795" 19SRC_URI[sha256sum] = "9c6c4d9ae7bf30506dd2aa3d8056c4ff2f8d087930d7c721616f5c093bdc674b"
19 20
20UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/linuxquota/files/quota-tools/" 21UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/linuxquota/files/quota-tools/"
21UPSTREAM_CHECK_REGEX = "/quota-tools/(?P<pver>(\d+[\.\-_]*)+)/" 22UPSTREAM_CHECK_REGEX = "/quota-tools/(?P<pver>(\d+[\.\-_]*)+)/"
22 23
23S = "${WORKDIR}/quota-tools" 24DEPENDS = "gettext-native e2fsprogs libnl dbus"
24
25DEPENDS = "gettext-native e2fsprogs"
26 25
27inherit autotools-brokensep gettext pkgconfig 26inherit autotools-brokensep gettext pkgconfig
28 27
29CFLAGS += "-I${STAGING_INCDIR}/tirpc" 28CFLAGS += "-I${STAGING_INCDIR}/tirpc"
30LDFLAGS += "-ltirpc" 29LDFLAGS += "-ltirpc"
31ASNEEDED = "" 30ASNEEDED = ""
32EXTRA_OEMAKE += 'STRIP=""'
33 31
34PACKAGECONFIG ??= "tcp-wrappers rpc bsd" 32PACKAGECONFIG ??= "tcp-wrappers rpc bsd"
35PACKAGECONFIG_libc-musl = "tcp-wrappers rpc" 33PACKAGECONFIG_libc-musl = "tcp-wrappers rpc"
36 34
37PACKAGECONFIG[tcp-wrappers] = "--with-tcpwrappers,--without-tcpwrappers,tcp-wrappers" 35PACKAGECONFIG[tcp-wrappers] = "--enable-libwrap,--disable-libwrap,tcp-wrappers"
38PACKAGECONFIG[rpc] = "--enable-rpc=yes,--enable-rpc=no,libtirpc" 36PACKAGECONFIG[rpc] = "--enable-rpc,--disable-rpc,libtirpc"
39PACKAGECONFIG[bsd] = "--enable-bsd_behaviour=yes,--enable-bsd_behaviour=no," 37PACKAGECONFIG[bsd] = "--enable-bsd_behaviour=yes,--enable-bsd_behaviour=no,"
40 38PACKAGECONFIG[ldapmail] = "--enable-ldapmail,--disable-ldapmail,openldap"
41do_install() {
42 oe_runmake ROOTDIR=${D} install
43}
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-13 19:56:48 +0000