diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/quota/Manifest b/sdk_container/src/third_party/portage-stable/sys-fs/quota/Manifest index 7e49bf9984..ebd4c38e43 100644 --- a/sdk_container/src/third_party/portage-stable/sys-fs/quota/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-fs/quota/Manifest @@ -1,2 +1 @@ -DIST quota-4.03.tar.gz 564352 BLAKE2B b474be79576fd2db7ad5f7c4e93d665fca19004727f4ff12e960da3251091b026c1458adecc0ed3a803da3bfcef6c857f612c44c7800ecc53c9ae53450d10338 SHA512 9603940048dcc0c4db6d6e14173769c815641ebc78a0cc457a0622dbfc597319bae1eaad4ef3281c52757995d47424b96dc66426ce540a8b538b996eea2dc5f8 -DIST quota-4.04.tar.gz 577303 BLAKE2B 8ee1e8f99b70f626ec051e4e9afe53c788b625a29f26afbe075039cf88dde9f6641c39e0ccfdbfcc6981fabe35e8fd15e7203989e9bbbdd1f1772949566531f6 SHA512 adc33863d2a966b4c46983fa3926e6b6ba75e260ed21bdff646584237840e6beb0dcfbfd2f655969aa5675c3c398ac2e483afb933f03f983756ebb3352d0eaad +DIST quota-4.06.tar.gz 520448 BLAKE2B 2cbadeade228d0154f3a8d455cc1aa6e85c9ad7854007e3188c9035abe4d5fdbdf97985fd2fa6308f486ffbe60461e0fe1139f1ec0ca415ce08292d74e0ddde1 SHA512 cece46b8e3a82e8afcf8bfc9f6b310ec91afe034102cebc031bc7d7e04287fdbffb21ab1d3e6e1825175cffa4bad0a4ecbefec0efee028d961b14ac626d5c871 diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/quota/files/ldap-scripts/applySystemQuotas.pl b/sdk_container/src/third_party/portage-stable/sys-fs/quota/files/ldap-scripts/applySystemQuotas.pl old mode 100755 new mode 100644 diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/quota/files/ldap-scripts/edquota_editor b/sdk_container/src/third_party/portage-stable/sys-fs/quota/files/ldap-scripts/edquota_editor old mode 100755 new mode 100644 diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/quota/files/ldap-scripts/setSystemQuotas.pl b/sdk_container/src/third_party/portage-stable/sys-fs/quota/files/ldap-scripts/setSystemQuotas.pl old mode 100755 new mode 100644 diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/quota/files/quota-4.03-default_fpic_fpie.patch b/sdk_container/src/third_party/portage-stable/sys-fs/quota/files/quota-4.03-default_fpic_fpie.patch deleted file mode 100644 index 2ff519f2b8..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-fs/quota/files/quota-4.03-default_fpic_fpie.patch +++ /dev/null @@ -1,32 +0,0 @@ -commit cd9dff0b5b53279442458360003831b6c14adc22 -Author: Tomáš Chvátal -Date: Tue Jan 5 11:20:52 2016 +0100 - - Set -fPIC and -pie as default params when building - - Signed-off-by: Tomáš Chvátal - Signed-off-by: Jan Kara - -diff --git a/Makefile.am b/Makefile.am -index 7c7a866..77f8400 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -1,4 +1,5 @@ - ACLOCAL_AMFLAGS = -I m4 -+AM_LDFLAGS = -pie - - BUILT_SOURCES = rquota.h rquota.c rquota_clnt.c - -diff --git a/configure.ac b/configure.ac -index 1552c15..68d5924 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -53,7 +53,7 @@ AS_IF([test "x${prefix}" = "xNONE"], [ - # ================ - # Check for cflags - # ================ --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 -fPIC" - AC_ARG_ENABLE([werror], - [AS_HELP_STRING([--enable-werror], [Treat all warnings as errors, useful for development])], - [enable_werror="$enableval"], diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/quota/files/quota-4.03-distribute_ldap-scripts.patch b/sdk_container/src/third_party/portage-stable/sys-fs/quota/files/quota-4.03-distribute_ldap-scripts.patch deleted file mode 100644 index 83339159e0..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-fs/quota/files/quota-4.03-distribute_ldap-scripts.patch +++ /dev/null @@ -1,23 +0,0 @@ -commit 861154efb90ed049e0473cc36935b8d03c78a869 -Author: Tomáš Chvátal -Date: Mon Jan 4 13:01:36 2016 +0100 - - Distribute ldap-scripts directory too - - Signed-off-by: Tomáš Chvátal - Signed-off-by: Jan Kara - -diff --git a/Makefile.am b/Makefile.am -index eb62617..a880ebe 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -52,7 +52,8 @@ EXTRA_DIST = \ - $(man_MANS) \ - $(rpcsvc_DATA) \ - autogen.sh \ -- Changelog -+ Changelog \ -+ ldap-scripts - - noinst_LIBRARIES = \ - libquota.a \ diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/quota/files/quota-4.03-dont_override_cflags.patch b/sdk_container/src/third_party/portage-stable/sys-fs/quota/files/quota-4.03-dont_override_cflags.patch deleted file mode 100644 index e59341a702..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-fs/quota/files/quota-4.03-dont_override_cflags.patch +++ /dev/null @@ -1,22 +0,0 @@ -commit 776757a23e9930588950c7fcbc7827ec7a3e51c4 -Author: Tomáš Chvátal -Date: Mon Jan 4 15:48:19 2016 +0100 - - Do not accidentaly override commandline passed CFLAGS. - - Signed-off-by: Tomáš Chvátal - Signed-off-by: Jan Kara - -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"], diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/quota/files/quota-4.03-explicitely_print_disabled_options.patch b/sdk_container/src/third_party/portage-stable/sys-fs/quota/files/quota-4.03-explicitely_print_disabled_options.patch deleted file mode 100644 index 29627c03ab..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-fs/quota/files/quota-4.03-explicitely_print_disabled_options.patch +++ /dev/null @@ -1,69 +0,0 @@ -commit 6ccb66159a9eee6ca114b11b70eb06f4ac6900d7 -Author: Jan Kara -Date: Mon Jan 4 15:36:27 2016 +0100 - - Print explicitely disabled options properly - - Currently we printed only an empty string when some build option was - disabled explicitely via --disable-foo. Print 'no' in that case as well. - - Signed-off-by: Jan Kara - -diff --git a/configure.ac b/configure.ac -index 39631c4..3ba1386 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -74,7 +74,7 @@ AC_ARG_ENABLE([ldapmail], - AS_IF([test "x$enable_ldapmail" != "xno"], [ - build_ldap="yes" - AC_CHECK_LIB([ldap], [ldap_initialize], [], [ -- build_ldap=no -+ build_ldap="no" - AS_IF([test "x$enable_ldapmail" = "xyes"], [ - AC_MSG_ERROR([LDAP support required but library not found.]); - ]) -@@ -84,6 +84,8 @@ AS_IF([test "x$enable_ldapmail" != "xno"], [ - AC_DEFINE([USE_LDAP_MAIL_LOOKUP], 1, [Lookup email address using LDAP]) - COMPILE_OPTS="$COMPILE_OPTS USE_LDAP_MAIL_LOOKUP" - ]) -+], [ -+ build_ldap="no" - ]) - AC_SUBST(LDAP_LIBS) - -@@ -113,6 +115,8 @@ AS_IF([test "x$enable_ext2direct" != "xno"], [ - AC_DEFINE([EXT2_DIRECT], 1, [Scanning of ext? filesystems using e2fslib]) - COMPILE_OPTS="$COMPILE_OPTS EXT2_DIRECT" - ]) -+], [ -+ build_ext2direct="no" - ]) - AC_SUBST(EXT2FS_CFLAGS) - AC_SUBST(EXT2FS_LIBS) -@@ -141,6 +145,8 @@ AS_IF([test "x$enable_netlink" != "xno"], [ - AC_MSG_ERROR([Required libnl3 libraries for quota netlink daemon not found.]) - ]) - ]) -+], [ -+ build_netlink="no" - ]) - AM_CONDITIONAL([WITH_NETLINK], [test "x$build_netlink" != "xno"]) - AC_SUBST(DBUS_CFLAGS) -@@ -171,6 +177,8 @@ AS_IF([test "x$enable_libwrap" != "xno"], [ - AC_DEFINE([HOSTS_ACCESS], 1, [Use hosts.allow and hosts.deny for access checking of rpc.rquotad]) - COMPILE_OPTS="$COMPILE_OPTS HOSTS_ACCESS" - ]) -+], [ -+ build_libwrap="no" - ]) - AC_SUBST(WRAP_LIBS) - -@@ -199,6 +207,8 @@ AS_IF([test x"$enable_rpc" != "xno"], [ - AC_DEFINE([RPC], 1, [Support for RPC]) - COMPILE_OPTS="$COMPILE_OPTS RPC" - ]) -+], [ -+ build_rpc="no" - ]) - AM_CONDITIONAL([WITH_RPC], [test x"$build_rpc" != "xno"]) - diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/quota/files/quota-4.03-fix_build_without_ldap.patch b/sdk_container/src/third_party/portage-stable/sys-fs/quota/files/quota-4.03-fix_build_without_ldap.patch deleted file mode 100644 index ba838bfe28..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-fs/quota/files/quota-4.03-fix_build_without_ldap.patch +++ /dev/null @@ -1,85 +0,0 @@ -commit 39fd30ce57e3c34c3649866bf9345a71f0b78667 -Author: Jan Kara -Date: Mon Jan 4 15:10:53 2016 +0100 - - Fix build with disabled ldap - - Reported-by: Tomas Chvatal - Signed-off-by: Jan Kara - -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")) diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/quota/files/quota-4.03-no_rpc.patch b/sdk_container/src/third_party/portage-stable/sys-fs/quota/files/quota-4.03-no_rpc.patch deleted file mode 100644 index c4f5007fca..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-fs/quota/files/quota-4.03-no_rpc.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 07ec5c783ac16ed20735d6cb8ab167833f5877ee Mon Sep 17 00:00:00 2001 -From: Lars Wendler -Date: Mon, 15 Feb 2016 14:36:28 +0100 -Subject: [PATCH] Don't build rpc.rquotad when --disable-rpc was requested. - -This fixes a buch of undefined references: - -x86_64-pc-linux-gnu-gcc -march=native -mtune=native -O2 -pipe -D_GNU_SOURCE -Wa -ll -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -fPIC -pie -Wl,-O1 -Wl,--hash-st -yle=gnu -Wl,--sort-common -Wl,--as-needed -o rpc.rquotad rquota_server.o rquota_ -svc.o svc_socket.o libquota.a -rquota_svc.o: In function `rquotaprog_2': -rquota_svc.c:(.text+0x1d3): undefined reference to `xdr_setquota_rslt' -rquota_svc.c:(.text+0x1da): undefined reference to `xdr_ext_setquota_args' -rquota_svc.c:(.text+0x2b2): undefined reference to `xdr_setquota_rslt' -rquota_svc.c:(.text+0x2b9): undefined reference to `xdr_ext_setquota_args' -rquota_svc.c:(.text+0x2ff): undefined reference to `xdr_getquota_rslt' -rquota_svc.c:(.text+0x306): undefined reference to `xdr_ext_getquota_args' -rquota_svc.c:(.text+0x31a): undefined reference to `xdr_getquota_rslt' -rquota_svc.c:(.text+0x321): undefined reference to `xdr_ext_getquota_args' -rquota_svc.o: In function `rquotaprog_1': -rquota_svc.c:(.text+0x3f3): undefined reference to `xdr_setquota_rslt' -rquota_svc.c:(.text+0x3fa): undefined reference to `xdr_setquota_args' -rquota_svc.c:(.text+0x4d2): undefined reference to `xdr_setquota_rslt' -rquota_svc.c:(.text+0x4d9): undefined reference to `xdr_setquota_args' -rquota_svc.c:(.text+0x51f): undefined reference to `xdr_getquota_rslt' -rquota_svc.c:(.text+0x526): undefined reference to `xdr_getquota_args' -rquota_svc.c:(.text+0x53a): undefined reference to `xdr_getquota_rslt' -rquota_svc.c:(.text+0x541): undefined reference to `xdr_getquota_args' -collect2: error: ld returned 1 exit status -Makefile:901: recipe for target 'rpc.rquotad' failed - -Signed-off-by: Lars Wendler ---- - Makefile.am | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/Makefile.am b/Makefile.am -index 77f8400..6d7ea0e 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -116,8 +116,11 @@ sbin_PROGRAMS = \ - xqmstats \ - edquota \ - setquota \ -- convertquota \ -+ convertquota -+if WITH_RPC -+sbin_PROGRAMS += \ - rpc.rquotad -+endif - if WITH_NETLINK - sbin_PROGRAMS += \ - quota_nld --- -2.7.1 - diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/quota/files/quota-4.03-noldap_linking.patch b/sdk_container/src/third_party/portage-stable/sys-fs/quota/files/quota-4.03-noldap_linking.patch deleted file mode 100644 index dbaca69bb7..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-fs/quota/files/quota-4.03-noldap_linking.patch +++ /dev/null @@ -1,75 +0,0 @@ -commit 1d9542df5d2ae5c21a1e96d100f899b3d7b2f27c -Author: Jan Kara -Date: Tue Jan 19 11:40:15 2016 +0100 - - Don't link all binaries with ldap library - - The default action-if-found of AC_CHECK_LIB() is to append checked - library to LIBS. Thus check for ldap library resulted in unwanted - addition of -lldap to LIBS as [] is an empty string in M4 and the - default action is used. - - Fix the problem by providing proper action-if-found which was currently - just hidden behind the check. Also do similar cleanup for - AC_CHECK_HEADER check although there it didn't have any undesired - side-effect. - - Reported-by: Petr Písař - Signed-off-by: Jan Kara - -diff --git a/configure.ac b/configure.ac -index 68d5924..d17b18c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -72,18 +72,17 @@ AC_ARG_ENABLE([ldapmail], - [enable_ldapmail=auto] - ) - AS_IF([test "x$enable_ldapmail" != "xno"], [ -- build_ldap="yes" -- AC_CHECK_LIB([ldap], [ldap_initialize], [], [ -+ AC_CHECK_LIB([ldap], [ldap_initialize], [ -+ build_ldap="yes" -+ LDAP_LIBS="-lldap -llber" -+ AC_DEFINE([USE_LDAP_MAIL_LOOKUP], 1, [Lookup email address using LDAP]) -+ COMPILE_OPTS="$COMPILE_OPTS USE_LDAP_MAIL_LOOKUP" -+ ], [ - build_ldap="no" - AS_IF([test "x$enable_ldapmail" = "xyes"], [ - AC_MSG_ERROR([LDAP support required but library not found.]); - ]) - ]) -- AS_IF([test "x$build_ldap" = "xyes"], [ -- LDAP_LIBS="-lldap -llber" -- AC_DEFINE([USE_LDAP_MAIL_LOOKUP], 1, [Lookup email address using LDAP]) -- COMPILE_OPTS="$COMPILE_OPTS USE_LDAP_MAIL_LOOKUP" -- ]) - ], [ - build_ldap="no" - ]) -@@ -163,8 +162,12 @@ AC_ARG_ENABLE([libwrap], - [enable_libwrap=auto] - ) - AS_IF([test "x$enable_libwrap" != "xno"], [ -- build_libwrap="yes" -- AC_CHECK_HEADER([tcpd.h],[], [ -+ AC_CHECK_HEADER([tcpd.h], [ -+ build_libwrap="yes" -+ WRAP_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" -+ ], [ - build_libwrap="no" - AS_IF([test "x$enable_libwrap" = "xyes"] , [ - AC_MSG_ERROR([tcpd.h not found and requested]) -@@ -172,11 +175,6 @@ AS_IF([test "x$enable_libwrap" != "xno"], [ - AC_MSG_WARN([tcpd.h not found]) - ]) - ]) -- AS_IF([test "x$build_libwrap" != "xno"], [ -- WRAP_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" -- ]) - ], [ - build_libwrap="no" - ]) diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/quota/files/quota-4.03-repqouta_F_option_arg.patch b/sdk_container/src/third_party/portage-stable/sys-fs/quota/files/quota-4.03-repqouta_F_option_arg.patch deleted file mode 100644 index d4fffd4f03..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-fs/quota/files/quota-4.03-repqouta_F_option_arg.patch +++ /dev/null @@ -1,27 +0,0 @@ -commit ab2bf5b51a1ca14cef63e8a7a88b039f173a210a -Author: Eric Sandeen -Date: Mon Jan 18 20:11:01 2016 -0600 - - repquota: -F option takes an arg - - Commit a5876145 added a new -O option which takes an - argument, but in the process lost the argument specifier - for "F". As a result, the use of "-F" segfaults when NULL - is sent to name2fmt() instead of the provided argument. - - Signed-off-by: Eric Sandeen - Signed-off-by: Jan Kara - -diff --git a/repquota.c b/repquota.c -index 744af70..6fe9f0c 100644 ---- a/repquota.c -+++ b/repquota.c -@@ -90,7 +90,7 @@ static void parse_options(int argcnt, char **argstr) - { NULL, 0, NULL, 0 } - }; - -- while ((ret = getopt_long(argcnt, argstr, "VavughtspncCiFO:", long_opts, NULL)) != -1) { -+ while ((ret = getopt_long(argcnt, argstr, "VavughtspncCiF:O:", long_opts, NULL)) != -1) { - switch (ret) { - case '?': - case 'h': diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/quota/files/quota-4.03-respect_docdir.patch b/sdk_container/src/third_party/portage-stable/sys-fs/quota/files/quota-4.03-respect_docdir.patch deleted file mode 100644 index 214b3ad1f1..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-fs/quota/files/quota-4.03-respect_docdir.patch +++ /dev/null @@ -1,21 +0,0 @@ -commit cac9a60c29106763cc6abd6f372f25f97d4122a3 -Author: Tomáš Chvátal -Date: Mon Jan 4 15:26:36 2016 +0100 - - Respect the docdir declaration and do not override. - - Signed-off-by: Tomáš Chvátal - Signed-off-by: Jan Kara - -diff --git a/Makefile.am b/Makefile.am -index a880ebe..7c7a866 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -2,7 +2,6 @@ ACLOCAL_AMFLAGS = -I m4 - - BUILT_SOURCES = rquota.h rquota.c rquota_clnt.c - --docdir = $(datadir)/doc/@PACKAGE@ - doc_DATA = \ - README.mailserver \ - README.ldap-support \ diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/quota/files/quota-4.04-glibc226.patch b/sdk_container/src/third_party/portage-stable/sys-fs/quota/files/quota-4.04-glibc226.patch deleted file mode 100644 index 5f63cde7d4..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-fs/quota/files/quota-4.04-glibc226.patch +++ /dev/null @@ -1,43 +0,0 @@ -From bbb8819fc0f6ed379a05d635a61bcf9c8986079f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= -Date: Sat, 16 Sep 2017 13:09:43 +0200 -Subject: [PATCH] Add $(TIRPC_CFLAGS) globally to CFLAGS for RPC support, - needed for libc 2.26 - ---- - Makefile.am | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 8d80bee..278290a 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -51,6 +51,8 @@ EXTRA_DIST = \ - noinst_LIBRARIES = libquota.a - - if WITH_RPC -+CFLAGS += $(TIRPC_CFLAGS) -+ - rpcsvcdir = $(includedir)/rpcsvc - rpcsvc_DATA = \ - rquota.h \ -@@ -100,8 +102,6 @@ libquota_a_SOURCES = \ - mntopt.h \ - pot.c \ - pot.h --libquota_a_CFLAGS = \ -- $(TIRPC_CFLAGS) - libquota_a_LIBADD = \ - $(RPCLIBS) - -@@ -235,7 +235,6 @@ rpc_rquotad_SOURCES = \ - rquota_server.c \ - rquota_svc.c \ - svc_socket.c --rpc_rquotad_CFLAGS = $(TIRPC_CFLAGS) - rpc_rquotad_LDADD = \ - libquota.a \ - $(WRAP_LIBS) \ --- -2.14.1 - diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/quota/files/quota-4.06-musl-cdefs.patch b/sdk_container/src/third_party/portage-stable/sys-fs/quota/files/quota-4.06-musl-cdefs.patch new file mode 100644 index 0000000000..286fc481b6 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-fs/quota/files/quota-4.06-musl-cdefs.patch @@ -0,0 +1,20 @@ +https://sourceforge.net/p/linuxquota/code/ci/1959f3768a284315250acd4d17a9f5ef0b8ea189/tree/quota.h?diff=43b6e31f39edbe7de4f4feeef4d0cf6be093e021 +https://bugs.gentoo.org/713390 +--- a/quota.h ++++ b/quota.h +@@ -1,7 +1,6 @@ + #ifndef GUARD_QUOTA_H + #define GUARD_QUOTA_H + +-#include + #include + #include + +@@ -182,6 +181,6 @@ + #endif + #endif + +-long quotactl __P((int, const char *, qid_t, caddr_t)); ++long quotactl(int, const char *, qid_t, caddr_t); + + #endif /* _QUOTA_ */ diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/quota/metadata.xml b/sdk_container/src/third_party/portage-stable/sys-fs/quota/metadata.xml index 3787c4c41e..0ba12bb30b 100644 --- a/sdk_container/src/third_party/portage-stable/sys-fs/quota/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/sys-fs/quota/metadata.xml @@ -1,5 +1,5 @@ - + base-system@gentoo.org diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/quota/quota-4.03.ebuild b/sdk_container/src/third_party/portage-stable/sys-fs/quota/quota-4.03.ebuild deleted file mode 100644 index 2bab377c69..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-fs/quota/quota-4.03.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit autotools eutils - -DESCRIPTION="Linux quota tools" -HOMEPAGE="https://sourceforge.net/projects/linuxquota/" -SRC_URI="mirror://sourceforge/linuxquota/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 sparc x86" -IUSE="ldap netlink nls rpc tcpd" - -RDEPEND="ldap? ( >=net-nds/openldap-2.3.35 ) - netlink? ( - sys-apps/dbus - dev-libs/libnl:3 - ) - rpc? ( net-nds/rpcbind ) - tcpd? ( sys-apps/tcp-wrappers )" -DEPEND="${RDEPEND} - nls? ( sys-devel/gettext )" - -PATCHES=( - # Patches from upstream - "${FILESDIR}/${P}-fix_build_without_ldap.patch" - "${FILESDIR}/${P}-distribute_ldap-scripts.patch" - "${FILESDIR}/${P}-explicitely_print_disabled_options.patch" - "${FILESDIR}/${P}-respect_docdir.patch" - "${FILESDIR}/${P}-dont_override_cflags.patch" - "${FILESDIR}/${P}-default_fpic_fpie.patch" - "${FILESDIR}/${P}-repqouta_F_option_arg.patch" - "${FILESDIR}/${P}-noldap_linking.patch" - - # Patches not (yet) upstreamed - "${FILESDIR}/${P}-no_rpc.patch" -) - -src_prepare() { - epatch "${PATCHES[@]}" - - eautoreconf -} - -src_configure() { - econf \ - --docdir="${EPREFIX}/usr/share/doc/${PF}" \ - $(use_enable nls) \ - $(use_enable ldap ldapmail) \ - $(use_enable netlink) \ - $(use_enable rpc) \ - $(use_enable rpc rpcsetquota) -} - -src_install() { - emake DESTDIR="${D}" install - dodoc doc/* README.* Changelog - rm -r "${ED}"/usr/include || die #70938 - - insinto /etc - insopts -m0644 - doins warnquota.conf quotatab - - newinitd "${FILESDIR}"/quota.rc7 quota - newconfd "${FILESDIR}"/quota.confd quota - - if use rpc ; then - newinitd "${FILESDIR}"/rpc.rquotad.initd rpc.rquotad - fi - - if use ldap ; then - insinto /etc/openldap/schema - insopts -m0644 - doins "${FILESDIR}"/ldap-scripts/quota.schema - - exeinto /usr/share/quota/ldap-scripts - doexe "${FILESDIR}"/ldap-scripts/*.pl - doexe "${FILESDIR}"/ldap-scripts/edquota_editor - fi -} diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/quota/quota-4.04-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-fs/quota/quota-4.06.ebuild similarity index 80% rename from sdk_container/src/third_party/portage-stable/sys-fs/quota/quota-4.04-r1.ebuild rename to sdk_container/src/third_party/portage-stable/sys-fs/quota/quota-4.06.ebuild index 9b5fdbca44..1c4cd2de92 100644 --- a/sdk_container/src/third_party/portage-stable/sys-fs/quota/quota-4.04-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-fs/quota/quota-4.06.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit autotools @@ -11,46 +11,47 @@ SRC_URI="mirror://sourceforge/linuxquota/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86" IUSE="ldap netlink nls rpc tcpd" RDEPEND=" + sys-fs/e2fsprogs ldap? ( >=net-nds/openldap-2.3.35 ) netlink? ( sys-apps/dbus dev-libs/libnl:3 ) rpc? ( - net-nds/rpcbind elibc_glibc? ( sys-libs/glibc[-rpc(-)] ) - net-libs/libtirpc + net-libs/libtirpc:= net-libs/rpcsvc-proto ) tcpd? ( sys-apps/tcp-wrappers ) " -DEPEND=" - ${RDEPEND} - nls? ( sys-devel/gettext ) -" +DEPEND="${RDEPEND}" +BDEPEND="nls? ( sys-devel/gettext )" +PDEPEND="rpc? ( net-nds/rpcbind )" PATCHES=( - "${FILESDIR}/${P}-glibc226.patch" + "${FILESDIR}"/${P}-musl-cdefs.patch ) src_prepare() { default + eautoreconf } src_configure() { local myeconfargs=( - --docdir="${EPREFIX%/}/usr/share/doc/${PF}" + --enable-ext2direct $(use_enable nls) $(use_enable ldap ldapmail) $(use_enable netlink) $(use_enable rpc) $(use_enable rpc rpcsetquota) ) + econf "${myeconfargs[@]}" }