From eab5731cdf11d4ae8cdf111461d46fd96c5bdd37 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 4 May 2019 12:02:00 +0100 Subject: gentoo resync : 04.05.2019 --- sys-fs/Manifest.gz | Bin 21931 -> 21933 bytes sys-fs/lvm2/Manifest | 2 +- sys-fs/lvm2/lvm2-2.02.183.ebuild | 2 +- sys-fs/ntfs3g/Manifest | 2 +- sys-fs/ntfs3g/ntfs3g-2017.3.23-r2.ebuild | 2 +- sys-fs/quota/Manifest | 14 +--- .../quota/files/quota-4.03-default_fpic_fpie.patch | 32 -------- .../files/quota-4.03-distribute_ldap-scripts.patch | 23 ------ .../files/quota-4.03-dont_override_cflags.patch | 22 ------ ...a-4.03-explicitely_print_disabled_options.patch | 69 ----------------- .../files/quota-4.03-fix_build_without_ldap.patch | 85 --------------------- sys-fs/quota/files/quota-4.03-no_rpc.patch | 57 -------------- sys-fs/quota/files/quota-4.03-noldap_linking.patch | 75 ------------------ .../files/quota-4.03-repqouta_F_option_arg.patch | 27 ------- sys-fs/quota/files/quota-4.03-respect_docdir.patch | 21 ----- sys-fs/quota/quota-4.03.ebuild | 83 -------------------- sys-fs/quota/quota-4.04-r1.ebuild | 81 -------------------- sys-fs/quota/quota-4.04-r2.ebuild | 2 +- 18 files changed, 6 insertions(+), 593 deletions(-) delete mode 100644 sys-fs/quota/files/quota-4.03-default_fpic_fpie.patch delete mode 100644 sys-fs/quota/files/quota-4.03-distribute_ldap-scripts.patch delete mode 100644 sys-fs/quota/files/quota-4.03-dont_override_cflags.patch delete mode 100644 sys-fs/quota/files/quota-4.03-explicitely_print_disabled_options.patch delete mode 100644 sys-fs/quota/files/quota-4.03-fix_build_without_ldap.patch delete mode 100644 sys-fs/quota/files/quota-4.03-no_rpc.patch delete mode 100644 sys-fs/quota/files/quota-4.03-noldap_linking.patch delete mode 100644 sys-fs/quota/files/quota-4.03-repqouta_F_option_arg.patch delete mode 100644 sys-fs/quota/files/quota-4.03-respect_docdir.patch delete mode 100644 sys-fs/quota/quota-4.03.ebuild delete mode 100644 sys-fs/quota/quota-4.04-r1.ebuild (limited to 'sys-fs') diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz index 864809878734..d4ec0cc1d2e9 100644 Binary files a/sys-fs/Manifest.gz and b/sys-fs/Manifest.gz differ diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest index a1c38ed29ff8..6742102f5ebb 100644 --- a/sys-fs/lvm2/Manifest +++ b/sys-fs/lvm2/Manifest @@ -41,7 +41,7 @@ DIST LVM2.2.02.183.tgz 2380574 BLAKE2B b1fe71b6cdb8ee20dd53d0ad3399c553487baafa1 DIST LVM2.2.02.184.tgz 2383698 BLAKE2B b6e308d76d541b9461dfcc6e82db256a175ccdabfae9c9d57d84eabd0d5ea50e3e09954b34741903e027412c2c26f72a5005fe934261576337a810738139deb8 SHA512 9db74f675e7c58f663a39afb79b6f33a33ad2cfbda63e9783ef5027f33977b4a1262a2e6754aa67c586eed083ee119a2e837c32a7746dcc53f13877c9d65c390 EBUILD lvm2-2.02.116.ebuild 8431 BLAKE2B 5b17d1ff4ee12c1e8ed040711eb2501a42ff72c371901ca4b9e4ec24a7eab71c8b71bcf52b27e5aeb2548d4aa6cfcab4278d92f5259e22c98190038b019948f6 SHA512 5e8655e7d70566a2b06ef50baa62339b1f26d20385b8a9fc261188bc0012af8d4ed4ab451305e4df5289a44bafe3e2a1252f6264439d6539ab1ae54cda1373f7 EBUILD lvm2-2.02.145-r2.ebuild 8627 BLAKE2B 63c09b396d802d131aaaa94442a26c4be8b75fc12f1bf097f07a0e52aeba28e4f3b406706ca0ef62a77d0557fc88d3f9d60963dc816026910ff6e90f2bd6439f SHA512 c4553842441409458c5bb339f5e22fa05f9b4bd34c865b907ed6b2396ff8c6fddbb78be1f480f7e189662e87141d7385a933e8f33850a7c6dcae7d611a7f37e9 -EBUILD lvm2-2.02.183.ebuild 8763 BLAKE2B 2885ee3d360cae58fc9dd6117a92209c26ffaa5305540496a476cfff7d129b2fc2c5a24a9858745a5abbee6e64c072bbbe62ded5410b90c63ad05cd5ed31792c SHA512 0e1682dad9834ea32a2351b9a4e71e8a27ce65cc0bfb1e0cb175d2098d8bfc4114f14a8eb8d3fba72fc7e5b87db4d0d1f12a35debec59f931ad256a1f0812d5c +EBUILD lvm2-2.02.183.ebuild 8761 BLAKE2B cdc1958b9af3fae4f19813a18316ce6166a17f1bca1442a926d672ef38c281c470354574609723290d1d28dc800763b2a8d760a5e9b43d13464195e56c05c38a SHA512 2ee5704d440ab63721dc2c330181f36b7e17303dea829415e9465d6bd4ed4c24e0c6c4dc5c1deb639f65c15b0413238e1d10eeb604b723abfb88dd0177f52ee8 EBUILD lvm2-2.02.184-r1.ebuild 8955 BLAKE2B caa7021e7703bf50529b42425a36c1662943504dff7fe8d857996f226a02119db2f6bad377a80f1fb7fb808f82962fadbd52a5b561f571c5592ceb4524efa825 SHA512 4b337fac136367fe009993e65b84f66e26c3fc6c5517ef6415734843b793ece2dd8411c639771e11a680a092965dc30b589fb26350b490fff28b190559b7e836 EBUILD lvm2-2.02.184-r2.ebuild 9014 BLAKE2B e016e38f56610bff72529ea22e7ad9de1c71cef034c028efe0d8641255d802c504c756899a1c319050cf780656f87e509fb50614adca39c3e14468d3ce503e55 SHA512 15567897f0448bb34980833b107b2e93d416b67df33c57d77269fa52b8fc0d2d6ffbeb19f7c9dccaa2845857dc8a9778d733f22792112fca74720df3f42e5f03 EBUILD lvm2-2.02.184.ebuild 8769 BLAKE2B 8ff55443aee773e87a78842021820822e8ba2283b61b510dee16423b1e3eb6f48a7ca0badd7776a266c14a8e3a458da889bd548685cc9adcc72a31bbbc25ddd1 SHA512 8fb5b8587580b59869b784434662d771e78378158233633c650e0a445f7c808fa06ab37f744182a25c1fd293f6e9fcf24653a160f59f56b6696249c22d8f2ea0 diff --git a/sys-fs/lvm2/lvm2-2.02.183.ebuild b/sys-fs/lvm2/lvm2-2.02.183.ebuild index eab4e163331f..a42fa720445f 100644 --- a/sys-fs/lvm2/lvm2-2.02.183.ebuild +++ b/sys-fs/lvm2/lvm2-2.02.183.ebuild @@ -11,7 +11,7 @@ SRC_URI="ftp://sourceware.org/pub/lvm2/${PN/lvm/LVM}.${PV}.tgz LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux" IUSE="readline static static-libs systemd lvm2create_initrd sanlock selinux +udev +thin device-mapper-only" REQUIRED_USE="device-mapper-only? ( !lvm2create_initrd !sanlock !thin ) systemd? ( udev )" diff --git a/sys-fs/ntfs3g/Manifest b/sys-fs/ntfs3g/Manifest index c35f9fc6f0d4..6121d8dc60a6 100644 --- a/sys-fs/ntfs3g/Manifest +++ b/sys-fs/ntfs3g/Manifest @@ -9,5 +9,5 @@ DIST ntfs-3g_ntfsprogs-2016.2.22.tgz 1264364 BLAKE2B 6028048d676372c062cda1cf9ee DIST ntfs-3g_ntfsprogs-2017.3.23.tgz 1259054 BLAKE2B 4f12a6061ef0c116f26225eb3fb5cb84e469b63710115fbfb54fa3802ea94192afa973a553742818ff6849b72919069ec92aca2d4d6f58d8cabca1b0fefa3abe SHA512 3a607f0d7be35204c992d8931de0404fbc52032c13b4240d2c5e6f285c318a28eb2a385d7cf5ac4cd445876aee5baa5753bb636ada0d870d84a9d3fdbce794ef EBUILD ntfs3g-2016.2.22-r2.ebuild 2450 BLAKE2B 8178b192162c011703272b7876b6b0b56a13698f2c673862789998b09f316c4cb06370a63a9cff9ab367562220284dfc38e614e80e27085a3e26615f4913cb14 SHA512 7a06505e8ca1d54b78bbe6da8975a69fcea297c36a74092bcd3259eacf3fd4cbaedceec5184c0b0e560f13141d6ca62692dc4a7a4e454090c844454a74adca0a EBUILD ntfs3g-2017.3.23-r1.ebuild 2360 BLAKE2B 4929f0847741acef18f7078d0f62246aada50f35312398e068ceb2438751aa34245dc0af5ddd1d06a85da8e8f084fd35c7beaf1380efd24fe6ce3f9b94d0a85d SHA512 3760806c53d47b38cd1b5416d76c1bdeb2854b1b831139ca86ef1de64de0933c8804e78a333f55751812c4a8bb1cc8c8757f002b3aa36181fba5ee43db7a5041 -EBUILD ntfs3g-2017.3.23-r2.ebuild 2789 BLAKE2B 90c1cd72ba461cd6fddd11cd67e944d7eacd4c7ab58c27bc14496daad9df8a8a25695f46c03c03a762f66006500f70cecf658b92f0a416a3eebc4de60bbcf829 SHA512 32d146befbe410645e0aff2ad23746e2b1a5dea6e124c67186b438b662eeb82041fea424fea22bb4e3be0a2e1862131b348c9d2a112ad9dc859afffab0b2ec50 +EBUILD ntfs3g-2017.3.23-r2.ebuild 2787 BLAKE2B 089194c852c928a6f07e1bb5afdaceadb33627ecabebd018c9866d26832cd0b1df3fd7cd57b8a2a08465de0f5a837146549fc682968824ed0bad9ca84aa8c1fb SHA512 c0d1552999b6f78d986ff70dd9c5bda0a01955fba85ae01fb6f48367b0be58ec6defe260c11cb573d31906d3953309b4e5c3ff312e2030a1e69d88cdbbd7f67e MISC metadata.xml 1188 BLAKE2B cd693b8b1281d056a5e75baeb04019684a67033607e16479c58830fbf9a19b88ba6e263c5e0637b5501cd5fe2fd000f92e8212354576242fa31c513158b38774 SHA512 6d9aa23202090132c37fe6915aa300597f2c88474065749de36143b8a47090c5bdb2e6449dffbb3843c9b7d30254fdde849b1aa230641910189d00134bd88c85 diff --git a/sys-fs/ntfs3g/ntfs3g-2017.3.23-r2.ebuild b/sys-fs/ntfs3g/ntfs3g-2017.3.23-r2.ebuild index de551002bf0d..60587e720fec 100644 --- a/sys-fs/ntfs3g/ntfs3g-2017.3.23-r2.ebuild +++ b/sys-fs/ntfs3g/ntfs3g-2017.3.23-r2.ebuild @@ -14,7 +14,7 @@ SRC_URI="http://tuxera.com/opensource/${MY_P}.tgz" LICENSE="GPL-2" # The subslot matches the SONAME major #. SLOT="0/88" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="alpha amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" IUSE="acl debug +external-fuse ntfsdecrypt +ntfsprogs static-libs suid xattr" RDEPEND="! -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/sys-fs/quota/files/quota-4.03-distribute_ldap-scripts.patch b/sys-fs/quota/files/quota-4.03-distribute_ldap-scripts.patch deleted file mode 100644 index 83339159e0fb..000000000000 --- a/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/sys-fs/quota/files/quota-4.03-dont_override_cflags.patch b/sys-fs/quota/files/quota-4.03-dont_override_cflags.patch deleted file mode 100644 index e59341a702ac..000000000000 --- a/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/sys-fs/quota/files/quota-4.03-explicitely_print_disabled_options.patch b/sys-fs/quota/files/quota-4.03-explicitely_print_disabled_options.patch deleted file mode 100644 index 29627c03ab32..000000000000 --- a/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/sys-fs/quota/files/quota-4.03-fix_build_without_ldap.patch b/sys-fs/quota/files/quota-4.03-fix_build_without_ldap.patch deleted file mode 100644 index ba838bfe2838..000000000000 --- a/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/sys-fs/quota/files/quota-4.03-no_rpc.patch b/sys-fs/quota/files/quota-4.03-no_rpc.patch deleted file mode 100644 index c4f5007fca5d..000000000000 --- a/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/sys-fs/quota/files/quota-4.03-noldap_linking.patch b/sys-fs/quota/files/quota-4.03-noldap_linking.patch deleted file mode 100644 index dbaca69bb7d3..000000000000 --- a/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/sys-fs/quota/files/quota-4.03-repqouta_F_option_arg.patch b/sys-fs/quota/files/quota-4.03-repqouta_F_option_arg.patch deleted file mode 100644 index d4fffd4f03fa..000000000000 --- a/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/sys-fs/quota/files/quota-4.03-respect_docdir.patch b/sys-fs/quota/files/quota-4.03-respect_docdir.patch deleted file mode 100644 index 214b3ad1f17a..000000000000 --- a/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/sys-fs/quota/quota-4.03.ebuild b/sys-fs/quota/quota-4.03.ebuild deleted file mode 100644 index 2bab377c69b7..000000000000 --- a/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/sys-fs/quota/quota-4.04-r1.ebuild b/sys-fs/quota/quota-4.04-r1.ebuild deleted file mode 100644 index 9b5fdbca4429..000000000000 --- a/sys-fs/quota/quota-4.04-r1.ebuild +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools - -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 ~arm64 ~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 - elibc_glibc? ( sys-libs/glibc[-rpc(-)] ) - net-libs/libtirpc - net-libs/rpcsvc-proto - ) - tcpd? ( sys-apps/tcp-wrappers ) -" -DEPEND=" - ${RDEPEND} - nls? ( sys-devel/gettext ) -" - -PATCHES=( - "${FILESDIR}/${P}-glibc226.patch" -) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - local myeconfargs=( - --docdir="${EPREFIX%/}/usr/share/doc/${PF}" - $(use_enable nls) - $(use_enable ldap ldapmail) - $(use_enable netlink) - $(use_enable rpc) - $(use_enable rpc rpcsetquota) - ) - econf "${myeconfargs[@]}" -} - -src_install() { - emake DESTDIR="${D}" install - dodoc doc/* README.* Changelog - - 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/sys-fs/quota/quota-4.04-r2.ebuild b/sys-fs/quota/quota-4.04-r2.ebuild index a7dc2fb0040d..1d128be85e60 100644 --- a/sys-fs/quota/quota-4.04-r2.ebuild +++ b/sys-fs/quota/quota-4.04-r2.ebuild @@ -11,7 +11,7 @@ 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=" -- cgit v1.2.3