Re: [gentoo-dev] Bug #733802, USE 'scp' now defaults to off in net-misc/openssh
On 7/26/20 12:57 PM, Ulrich Mueller wrote: > Even more appropriate would be to enable the flag with an IUSE default. > The ebuild could still display an ewarn message pointing out the alleged > security issue. > > Ulrich This'd be nice. A news-worthy update in my opinion regardless. -- juippis signature.asc Description: OpenPGP digital signature
Re: [gentoo-dev] [RFC] sword-module.eclass: update, extend, increment revision
On 2020-07-26 21:19, Michał Górny wrote:
> Please use git-send-email, so that we can reply in context without
> jumping through hoops.
Funny, last time I used git-send-email to post a diff introducing a new
revision of a file (it was virtual/opencl, IIRC) I got told it was too
difficult to follow the changes that way and a plain diff would have
been more useful.
Anyway, here is the same diff but inline. I'll also repeat the summary
of proposed changes here so that it isn't necessary to switch to a
different message to see it:
- add eclassdoc blocks;
- add the optional variable SWORD_MINIMUM_VERSION to specify the lowest
version of app-text/sword supported by the module at hand;
- check if SWORD_MODULE is set and not null, and die otherwise;
- change the default SRC_URI from mirror://gentoo to my Web space on
dev.gentoo.org;
- remove redundant declarations of HOMEPAGE and IUSE;
- app-arch/unzip is now in BDEPEND rather than DEPEND;
- as a consequence of the above, enforce the use of EAPI-7 in ebuilds
inheriting this eclass;
- remove redundant references to ${S} from doins() calls.
* * *
--- eclass/sword-module.eclass
+++ eclass/sword-module-r1.eclass
@@ -1,33 +1,100 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
+# @ECLASS: sword-module-r1.eclass
+# @MAINTAINER:
+# Marek Szuba
+# @SUPPORTED_EAPIS: 7
+# @BLURB: Simplify installations of SWORD modules
+# @DESCRIPTION:
+# This eclass provides dependencies, ebuild environment and the src_install
+# function common to all app-text/sword modules published by the SWORD Project.
#
-# eclass to simplify installation of Sword modules
-# Bugs to mare...@gentoo.org
+# Note that while all SWORD modules which do not require prior registration
+# to unlock can easily be downloaded from the upstream Web site, as of
+# 2020-07-26 all the files available at
+# https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/
+# are unversioned and it is necessary to look at respective module pages
+# in order to see when they have last been updated. Therefore, maintainers
+# must rename module files to include the version number and host them
+# somewhere to avoid breaking digests when new versions are released.
#
+# @EXAMPLE:
+# Typical ebuild using sword-module-r1.eclass:
+#
+# @CODE
+# EAPI=7
+#
+# SWORD_MODULE="Personal"
+# SWORD_MINIMUM_VERSION="1.5.1a"
+#
+# inherit sword-module-r1
+#
+# DESCRIPTION="SWORD module for storing one's own commentary"
+# HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Personal";
+# LICENSE="public-domain"
+# KEYWORDS="~amd64"
+#
+# @CODE
-HOMEPAGE="http://www.crosswire.org/sword/modules/";
+case ${EAPI:-0} in
+ 0|1|2|3|4|5|6)
+ die "Unsupported EAPI=${EAPI} (too old) for ${ECLASS}"
+ ;;
+ 7)
+ ;;
+ *)
+ die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"
+ ;;
+esac
+
+# @ECLASS-VARIABLE: SWORD_MODULE
+# @DEFAULT_UNSET
+# @PRE_INHERIT
+# @REQUIRED
+# @DESCRIPTION:
+# Name of the module as used by the SWORD Project. Case-sensitive.
+# Needs to be set before the inherit line.
+
+if [[ ! ${SWORD_MODULE} ]]; then
+ die 'SWORD_MODULE not declared or null'
+fi
+
+# @ECLASS-VARIABLE: SWORD_MINIMUM_VERSION
+# @DEFAULT_UNSET
+# @PRE_INHERIT
+# @DESCRIPTION:
+# If set to a non-null value, specifies the minimum version of app-text/sword
+# the module requires. This will be included in RDEPEND. If null or unset,
+# the dependency will be unversioned.
+# Needs to be set before the inherit line.
-# Sword packages are generally released as FooBar.zip in their 'rawzip' form
-# The files are also unversioned, so the packager will need to rename the
-# original file to something else and host it somewhere to avoid breaking
-# the digest when new versions are released.
+EXPORT_FUNCTIONS src_install
-SRC_URI="mirror://gentoo/${SWORD_MODULE}-${PV}.zip"
+# Default location of versioned files. In general this is obviously
+# maintainer-specific, then again all the 133 modules present in the tree
+# as of mid-July 2020 are maintained by the same person.
+SRC_URI="https://dev.gentoo.org/~marecki/dists/sword-modules/${SWORD_MODULE}-${PV}.zip";
SLOT="0"
-IUSE=""
+# Module archives contain no top-level directory.
S="${WORKDIR}"
-RDEPEND="app-text/sword"
-DEPEND="app-arch/unzip"
-
-sword-module_src_install() {
+if [[ ${SWORD_MINIMUM_VERSION} ]]; then
+ RDEPEND=">=app-text/sword-${SWORD_MINIMUM_VERSION}"
+else
+ RDEPEND="app-text/sword"
+fi
+
+BDEPEND="app-arch/unzip"
+
+# @FUNCTION: sword-module-r1_src_install
+# @DESCRIPTION:
+# Install all the module files into directories expected by app-text/sword.
+sword-module-r1_src_install() {
insinto /usr/share/sword/modules
- doins -r "${S}"/modules/*
+ doins -r modules/*
insinto /usr/share/sword/mods.d
- doins "${S}"/mods.d/*
+ doins mods.d/*
}
-
-EXPORT_FUNCTIONS src_install
Re: [gentoo-dev] [RFC] sword-module.eclass: update, extend, increment revision
On Mon, 2020-07-27 at 11:51 +0200, Marek Szuba wrote:
> On 2020-07-26 21:19, Michał Górny wrote:
>
> > Please use git-send-email, so that we can reply in context without
> > jumping through hoops.
>
> Funny, last time I used git-send-email to post a diff introducing a new
> revision of a file (it was virtual/opencl, IIRC) I got told it was too
> difficult to follow the changes that way and a plain diff would have
> been more useful.
Well, inline diff was my point, so this works. Thanks.
>
> Anyway, here is the same diff but inline. I'll also repeat the summary
> of proposed changes here so that it isn't necessary to switch to a
> different message to see it:
> - add eclassdoc blocks;
> - add the optional variable SWORD_MINIMUM_VERSION to specify the lowest
> version of app-text/sword supported by the module at hand;
> - check if SWORD_MODULE is set and not null, and die otherwise;
> - change the default SRC_URI from mirror://gentoo to my Web space on
> dev.gentoo.org;
> - remove redundant declarations of HOMEPAGE and IUSE;
> - app-arch/unzip is now in BDEPEND rather than DEPEND;
> - as a consequence of the above, enforce the use of EAPI-7 in ebuilds
> inheriting this eclass;
> - remove redundant references to ${S} from doins() calls.
>
> * * *
>
> --- eclass/sword-module.eclass
> +++ eclass/sword-module-r1.eclass
> @@ -1,33 +1,100 @@
> # Copyright 1999-2020 Gentoo Authors
> # Distributed under the terms of the GNU General Public License v2
>
> +# @ECLASS: sword-module-r1.eclass
> +# @MAINTAINER:
> +# Marek Szuba
> +# @SUPPORTED_EAPIS: 7
> +# @BLURB: Simplify installations of SWORD modules
> +# @DESCRIPTION:
> +# This eclass provides dependencies, ebuild environment and the src_install
> +# function common to all app-text/sword modules published by the SWORD
> Project.
> #
> -# eclass to simplify installation of Sword modules
> -# Bugs to mare...@gentoo.org
> +# Note that while all SWORD modules which do not require prior registration
s/which/that/
> +# to unlock can easily be downloaded from the upstream Web site, as of
> +# 2020-07-26 all the files available at
> +# https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/
> +# are unversioned and it is necessary to look at respective module pages
> +# in order to see when they have last been updated. Therefore, maintainers
> +# must rename module files to include the version number and host them
> +# somewhere to avoid breaking digests when new versions are released.
Technically speaking, this isn't strictly necessary. You could just use
SRC_URI arrows to rename them, and then Gentoo mirrors would jump in.
On the minus side, things would occasionally break for people not using
Gentoo mirrors. On the plus side, they would effectively ping you
whenever new version happens ;-).
> #
> +# @EXAMPLE:
> +# Typical ebuild using sword-module-r1.eclass:
> +#
> +# @CODE
> +# EAPI=7
> +#
> +# SWORD_MODULE="Personal"
> +# SWORD_MINIMUM_VERSION="1.5.1a"
> +#
> +# inherit sword-module-r1
> +#
> +# DESCRIPTION="SWORD module for storing one's own commentary"
> +# HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Personal";
> +# LICENSE="public-domain"
> +# KEYWORDS="~amd64"
> +#
> +# @CODE
>
> -HOMEPAGE="http://www.crosswire.org/sword/modules/";
> +case ${EAPI:-0} in
> + 0|1|2|3|4|5|6)
> + die "Unsupported EAPI=${EAPI} (too old) for ${ECLASS}"
> + ;;
> + 7)
> + ;;
> + *)
> + die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"
> + ;;
> +esac
> +
> +# @ECLASS-VARIABLE: SWORD_MODULE
> +# @DEFAULT_UNSET
> +# @PRE_INHERIT
> +# @REQUIRED
> +# @DESCRIPTION:
> +# Name of the module as used by the SWORD Project. Case-sensitive.
> +# Needs to be set before the inherit line.
Wouldn't using a default generated from PN work most of the time?
> +
> +if [[ ! ${SWORD_MODULE} ]]; then
> + die 'SWORD_MODULE not declared or null'
> +fi
> +
> +# @ECLASS-VARIABLE: SWORD_MINIMUM_VERSION
> +# @DEFAULT_UNSET
> +# @PRE_INHERIT
> +# @DESCRIPTION:
> +# If set to a non-null value, specifies the minimum version of app-text/sword
> +# the module requires. This will be included in RDEPEND. If null or unset,
> +# the dependency will be unversioned.
> +# Needs to be set before the inherit line.
>
> -# Sword packages are generally released as FooBar.zip in their 'rawzip' form
> -# The files are also unversioned, so the packager will need to rename the
> -# original file to something else and host it somewhere to avoid breaking
> -# the digest when new versions are released.
> +EXPORT_FUNCTIONS src_install
>
> -SRC_URI="mirror://gentoo/${SWORD_MODULE}-${PV}.zip"
> +# Default location of versioned files. In general this is obviously
> +# maintainer-specific, then again all the 133 modules present in the tree
> +# as of mid-July 2020 are maintained by the same person.
> +SRC_URI="https://dev.gentoo.org/~marecki/dists/sword-modules/${SWORD_MODULE}-${PV}.zip";
>
> SLOT="0"
>
Re: [gentoo-dev] [RFC] sword-module.eclass: update, extend, increment revision
On 2020-07-27 12:02, Michał Górny wrote: > +# Note that while all SWORD modules which do not require prior registration > > s/which/that/ Not quite sure if this is really necessary, as far as I remember both "which" and "that" are grammatically correct in this context - in British English anyway. >> +# in order to see when they have last been updated. Therefore, maintainers >> +# must rename module files to include the version number and host them >> +# somewhere to avoid breaking digests when new versions are released. > > Technically speaking, this isn't strictly necessary. You could just use > SRC_URI arrows to rename them, and then Gentoo mirrors would jump in. > On the minus side, things would occasionally break for people not using > Gentoo mirrors. On the plus side, they would effectively ping you > whenever new version happens ;-). On the plus side, no need for tedious file-renaming steps. And finally on the plus side, no need to store 500+ MB of renamed-but-otherwise-same-as-upstream files on dev.gentoo.org. You've convinced me :-) >> +# @ECLASS-VARIABLE: SWORD_MODULE >> +# @DEFAULT_UNSET >> +# @PRE_INHERIT >> +# @REQUIRED >> +# @DESCRIPTION: >> +# Name of the module as used by the SWORD Project. Case-sensitive. >> +# Needs to be set before the inherit line. > > Wouldn't using a default generated from PN work most of the time? Until just a moment ago, it was not - all the app-dicts/sword-* we have in the tree had been named using upstream module names converted to all-lowercase. I thought about changing this but thought it might be better to leave it until after the eclass update. That was until just a moment ago, though - having read your comment and having confirmed that we use upstream names for source archives, I have just renamed those packages to match the case of upstream names. Will update the eclass with a PN-derived default of SWORD_MODULE before the next iteration. -- MS signature.asc Description: OpenPGP digital signature
[gentoo-dev] [PATCH v2] sword-module.eclass: update SRC_URI, expand a bit, clean up
Second iteration of proposed changes to sword-module.eclass, this time without incrementing revision because I am fairly confident that it should all be backwards-compatible. Changes with respect to the first iteration: - SWORD_MODULE now defaults to a value extracted from PN; - do not bother with versioning files in advance and hosting them at d.g.o., just version files fetched from upstream and let Gentoo mirrors do their magic.
[gentoo-dev] [PATCH] eclass/sword-module.eclass: update SRC_URI, expand a bit, clean up
1. The old version expected versioned source archives to have been
manually uploaded to the Gentoo mirror network by package
maintainers. This is no longer allowed, or indeed possible for most
Gentoo developers. Instead, use the SRC_URI arrow mechanism to
version archives fetched directly from upstream. SWORD Project
updates their modules quite infrequently so it isn't really necessary
to worry the file having changed between looking the version number
up on the module page and fetching the archive for digest generation,
and while users who do not use Gentoo mirrors will see digest
conflicts when an update does occur, this would effectively encourage
them to notify maintainers whenever a new version is released;
2. If SWORD_MODULE is not set, attempt to generate it from PN by
stripping the prefix 'sword-'. This will allow explicit declarations
of SWORD_MODULE from all app-dicts/sword-* ebuilds currently in the
tree;
3. Add the optional variable SWORD_MINIMUM_VERSION to specify the lowest
version of app-text/sword supported by the module at hand;
4. Remove redundant declarations of HOMEPAGE and IUSE;
5. app-arch/unzip is now in BDEPEND rather than DEPEND;
6. As a consequence of the above, enforce the use of EAPI-7 in ebuilds
inheriting this eclass. Those in the tree have all already been
updated to that EAPI version;
7. Remove redundant references to ${S} from doins() calls;
8. Add eclassdoc blocks.
No revision change in the end because all the changes should be
backwards-compatible.
Closes: https://bugs.gentoo.org/637882
Signed-off-by: Marek Szuba
---
eclass/sword-module.eclass | 92 +++---
1 file changed, 77 insertions(+), 15 deletions(-)
diff --git a/eclass/sword-module.eclass b/eclass/sword-module.eclass
index c66c9987e9f..2ae58d1e51b 100644
--- a/eclass/sword-module.eclass
+++ b/eclass/sword-module.eclass
@@ -1,33 +1,95 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
+# @ECLASS: sword-module.eclass
+# @MAINTAINER:
+# Marek Szuba
+# @SUPPORTED_EAPIS: 7
+# @BLURB: Simplify installation of SWORD modules
+# @DESCRIPTION:
+# This eclass provides dependencies, ebuild environment and the src_install
+# function common to all app-text/sword modules published by the SWORD Project.
#
-# eclass to simplify installation of Sword modules
-# Bugs to mare...@gentoo.org
+# Note that as of 2020-07-26 module archives published by SWORD are still
+# not versioned and it is necessary to look at respective module pages in
+# order to see what versions the currently available files are. Once
+# a module file has been replicated to the Gentoo mirror network it will be
+# versioned and remain available even after upstream has changed their
+# version, however users not using mirrors will encounter hash conflicts
+# on updated modules. Should that happen, please notify the relevant
+# package maintainers that a new version is available.
#
+# @EXAMPLE:
+# sword-Personal-1.0.ebuild, a typical ebuild using sword-module.eclass:
+#
+# @CODE
+# EAPI=7
+#
+# SWORD_MINIMUM_VERSION="1.5.1a"
+#
+# inherit sword-module
+#
+# DESCRIPTION="SWORD module for storing one's own commentary"
+# HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Personal";
+# LICENSE="public-domain"
+# KEYWORDS="~amd64 ~ppc ~x86"
+#
+# @CODE
-HOMEPAGE="http://www.crosswire.org/sword/modules/";
+case ${EAPI:-0} in
+ 0|1|2|3|4|5|6)
+ die "Unsupported EAPI=${EAPI} (too old) for ${ECLASS}"
+ ;;
+ 7)
+ ;;
+ *)
+ die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"
+ ;;
+esac
-# Sword packages are generally released as FooBar.zip in their 'rawzip' form
-# The files are also unversioned, so the packager will need to rename the
-# original file to something else and host it somewhere to avoid breaking
-# the digest when new versions are released.
+# @ECLASS-VARIABLE: SWORD_MINIMUM_VERSION
+# @DEFAULT_UNSET
+# @PRE_INHERIT
+# @DESCRIPTION:
+# If set to a non-null value, specifies the minimum version of app-text/sword
+# the module requires. This will be included in RDEPEND. If null or unset,
+# the dependency will be unversioned.
+# Needs to be set before the inherit line.
-SRC_URI="mirror://gentoo/${SWORD_MODULE}-${PV}.zip"
+# @ECLASS-VARIABLE: SWORD_MODULE
+# @PRE_INHERIT
+# @DESCRIPTION:
+# Case-sensitive name of the SWORD-Project module to install. If unset
+# or null, use the name produced by removing the prefix 'sword-' from PN.
+# Needs to be set before the inherit line.
+: ${SWORD_MODULE:=${PN#sword-}}
+
+EXPORT_FUNCTIONS src_install
+
+# Unless overridden at ebuild level, append version to the name of the file
+# fetched from upstream and let the Gentoo mirror network take care of
+# persisting the versioned archive.
+SRC_URI="https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/${SWORD_MODULE}.zip
-
[gentoo-dev] Last rites: app-dicts/sword-{Cro,Dan,FarsiOPV,FreLSG,FreMartin,HNV,KJVD,RST,SpaRVG2004,SpaSEV,WEB,WebstersDict}
# Marek Szuba (2020-07-27) # No longer available upstream. Potentially copyrighted. # Removal in 30 days. Bug #734116. app-dicts/sword-Cro app-dicts/sword-Dan app-dicts/sword-FarsiOPV app-dicts/sword-FreLSG app-dicts/sword-FreMartin app-dicts/sword-HNV app-dicts/sword-KJVD app-dicts/sword-RST app-dicts/sword-SpaRVG2004 app-dicts/sword-SpaSEV app-dicts/sword-WEB app-dicts/sword-WebstersDict -- MS signature.asc Description: OpenPGP digital signature
[gentoo-dev] Up for grabs: dev-util/tup, ...
Hi fellows, The following packages are up for grabs: * dev-util/tup Two outstanding issues: https://bugs.gentoo.org/show_bug.cgi?id=711856 https://bugs.gentoo.org/show_bug.cgi?id=704990 * media-gfx/propaganda A collection of graphics. No open bugs. No other package depends on it. * dev-python/guzzle_sphinx_theme No open bugs. A dependency of dev-python/botocore. Maintainers of botocore have been notified directly. signature.asc Description: PGP signature
