Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

certbot 3.2.0 wrong paths #27700

Merged
merged 8 commits into from
Feb 22, 2025
Merged

certbot 3.2.0 wrong paths #27700

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
20b85a4
certbot 3.2.0 wrong paths
BjarneDM Feb 17, 2025
247ef5c
temp fix for py-josepy
BjarneDM Feb 17, 2025
9596ed7
fix indent
BjarneDM Feb 17, 2025
6d1f525
incrementedd epoch
BjarneDM Feb 17, 2025
c502bf4
fix for epoch
BjarneDM Feb 17, 2025
e991b8e
fixed the certbot +docs variant
BjarneDM Feb 17, 2025
88c5d1b
Changes to be committed:
BjarneDM Feb 18, 2025
e3d26fc
rev bump
BjarneDM Feb 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions python/py-acme/Portfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ PortGroup python 1.0
name py-acme
github.setup certbot certbot 3.2.0 v
github.tarball_from releases
revision 0
revision 1
categories-append security
license Apache-2
maintainers {mps @Schamschula} openmaintainer
Expand Down Expand Up @@ -53,9 +53,9 @@ if {${name} ne ${subport}} {

post-destroot {
xinstall -d ${destroot}${prefix}/share/man/man1
xinstall -m 640 ${worksrcpath}/acme/docs/_build/man/acme-python.1 \
xinstall -m 640 ${worksrcpath}/docs/_build/man/acme-python.1 \
${destroot}${prefix}/share/man/man1/
xinstall -m 640 ${worksrcpath}/acme/docs/_build/man/jws.1 \
xinstall -m 640 ${worksrcpath}/docs/_build/man/jws.1 \
${destroot}${prefix}/share/man/man1/
}
}
Expand Down
11 changes: 6 additions & 5 deletions python/py-josepy/Portfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@ PortSystem 1.0
PortGroup python 1.0

name py-josepy
version 2.0.0
# don't upgrade to v 2.0.0 until certbot 4.0.0 is released
version 1.15.0
revision 0
epoch 1
epoch 2
categories-append security
license Apache-2
maintainers {mps @Schamschula} openmaintainer
Expand All @@ -20,9 +21,9 @@ python.versions 39 310 311 312 313

python.pep517_backend poetry

checksums rmd160 5b999de9bb7ce497d6ed828532fdb3621a696deb \
sha256 e7d7acd2fe77435cda76092abe4950bb47b597243a8fb733088615fa6de9ec40 \
size 55767
checksums rmd160 113cc85bf0bee1a5673e848651e267597b717d3a \
sha256 46c9b13d1a5104ffbfa5853e555805c915dcde71c2cd91ce5386e84211281223 \
size 59310

if {${name} ne ${subport}} {
depends_lib-append \
Expand Down
22 changes: 11 additions & 11 deletions security/certbot/Portfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@ PortSystem 1.0
PortGroup github 1.0
PortGroup python 1.0

# upgrade py-josepy to v 2.0.0 when certbot v 4.0.0 is released
github.setup certbot certbot 3.2.0 v
revision 0
revision 1
categories security
license Apache-2
maintainers {mps @Schamschula} openmaintainer
Expand Down Expand Up @@ -52,32 +53,31 @@ depends_lib-append port:py${python.version}-acme \
port:py${python.version}-pyrfc3339 \
port:py${python.version}-tz


subport ${name} {
post-patch {
reinplace "s|/etc/|${prefix}/etc/|" ${worksrcpath}/certbot/compat/misc.py
reinplace "s|/var/lib/|${prefix}/var/db/|" ${worksrcpath}/certbot/compat/misc.py
reinplace "s|/var/log/|${prefix}/var/log/|" ${worksrcpath}/certbot/compat/misc.py
}

variant docs description {Build man pages} {
depends_lib-append \
port:py${python.version}-repoze.sphinx.autointerface \
port:py${python.version}-sphinx \
port:py${python.version}-sphinx_rtd_theme

post-patch {
reinplace "s|/etc/|${prefix}/etc/|" ${worksrcpath}/certbot/compat/misc.py
reinplace "s|/var/lib/|${prefix}/var/db/|" ${worksrcpath}/certbot/compat/misc.py
reinplace "s|/var/log/|${prefix}/var/log/|" ${worksrcpath}/certbot/compat/misc.py
}

post-build {
set env(doc_path) ${worksrcpath}/${name}/docs
set env(doc_path) ${worksrcpath}/docs
set env(python_branch) ${python.branch}
exec sh -c {cd $doc_path && sphinx-build-$python_branch -N -b man . _build/man} >@stdout
}

post-destroot {
xinstall -d ${destroot}${prefix}/share/man/man1
xinstall -d ${destroot}${prefix}/share/man/man7
xinstall -m 640 ${worksrcpath}//${name}/docs/_build/man/certbot.1 \
xinstall -m 640 ${worksrcpath}/docs/_build/man/certbot.1 \
${destroot}${prefix}/share/man/man1/
xinstall -m 640 ${worksrcpath}//${name}/docs/_build/man/certbot.7 \
xinstall -m 640 ${worksrcpath}/docs/_build/man/certbot.7 \
${destroot}${prefix}/share/man/man7/
}
}
Expand Down
Loading