* Re: [PR PATCH] [Updated] mit-krb5: update to 1.21
2023-06-07 22:04 [PR PATCH] mit-krb5: update to 1.21 klarasm
@ 2023-06-10 16:52 ` klarasm
2023-06-10 17:00 ` klarasm
` (7 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: klarasm @ 2023-06-10 16:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1088 bytes --]
There is an updated pull request by klarasm against master on the void-packages repository
https://github.com/klarasm/void-packages mit-krb5/1.21
https://github.com/void-linux/void-packages/pull/44311
mit-krb5: update to 1.21
- update changed upstream mirror
- move configure options to configure_args
- add build options
- ldap: enable LDAP database backend, enabled by default
- lmdb: enable LMDB database backend, disabled by default
- remove --without-tcl (not recognized by configure)
- remove vsed that doesn't do anything
- change sed to vsed and restrict it to files which need the changes
- remove unnecessary do_build
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for my native architecture, (x86_64-musl)
- I built this PR locally for these architectures:
- aarch64-musl
- armv7l
- armv6l-musl
- x86_64-musl
A patch file from https://github.com/void-linux/void-packages/pull/44311.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mit-krb5/1.21-44311.patch --]
[-- Type: text/x-diff, Size: 3178 bytes --]
From ce10fc83f6aec9601bb8d7ab50fc62cab09f1ad5 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 7 Jun 2023 23:14:35 +0200
Subject: [PATCH] mit-krb5: update to 1.21
- update changed upstream mirror
- move configure options to configure_args
- add build options
- ldap: enable LDAP database backend, enabled by default
- lmdb: enable LMDB database backend, disabled by default
- include LDAP schemas when ldap option is set
- remove --without-tcl (not recognized by configure)
- remove vsed that doesn't do anything
- change sed to vsed and restrict it to files which need the changes
- remove unnecessary do_build
---
srcpkgs/mit-krb5/template | 35 +++++++++++++++++++++--------------
1 file changed, 21 insertions(+), 14 deletions(-)
diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template
index 36a7de46e099..78d422c6307e 100644
--- a/srcpkgs/mit-krb5/template
+++ b/srcpkgs/mit-krb5/template
@@ -2,42 +2,49 @@
# if there is a bump in .so version,
# also update srcpkgs/libgssglue/files/gssapi_mech.conf
pkgname=mit-krb5
-version=1.20.1
+version=1.21
revision=1
build_style=gnu-configure
+configure_args="--sbindir=/usr/bin --disable-rpath --with-system-et
+ --without-system-verto --with-system-ss --enable-shared --with-system-db
+ $(vopt_with ldap) $(vopt_with lmdb)"
hostmakedepends="e2fsprogs-devel flex perl pkg-config"
-makedepends="e2fsprogs-devel libldap-devel"
+makedepends="e2fsprogs-devel db-devel $(vopt_if ldap libldap-devel)
+ $(vopt_if lmdb lmdb-devel)"
short_desc="MIT Kerberos 5 implementation"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="http://web.mit.edu/kerberos"
-distfiles="http://web.mit.edu/kerberos/dist/krb5/${version%.*}/krb5-${version}.tar.gz"
-checksum=704aed49b19eb5a7178b34b2873620ec299db08752d6a8574f95d41879ab8851
+distfiles="http://kerberos.org/dist/krb5/${version}/krb5-${version}.tar.gz"
+checksum=69f8aaff85484832df67a4bbacd99b9259bd95aab8c651fbbe65cdc9620ea93b
+build_options="ldap lmdb"
+build_options_default="ldap"
+desc_option_lmdb="Enable LMDB database backend"
post_patch() {
- vsed -e "/LDFLAGS=/d" -i src/build-tools/krb5-config.in
-
# Fix db plugin.
- sed -i -e "s|<db.h>|<db_185.h>|" $wrksrc/src/plugins/kdb/db2/*.[ch]
+ vsed -i -e "s|<db.h>|<db_185.h>|" \
+ src/plugins/kdb/db2/{adb_openclose.c,db2_exp.c,kdb_db2.c,policy_db.h}
}
do_configure() {
- WARN_CFLAGS= ./src/configure ${configure_args} --sbindir=/usr/bin \
- --disable-rpath --with-system-et --without-system-verto --with-ldap \
- --with-system-ss --with-system-db --enable-shared --without-tcl \
+ ./src/configure ${configure_args} \
ac_cv_func_pthread_once=yes ac_cv_func_pthread_rwlock_init=yes \
acx_pthread_ok=yes ac_cv_func_regcomp=yes ac_cv_printf_positional=yes \
krb5_cv_attr_constructor_destructor=yes,yes
}
-do_build() {
- make
-}
-
post_install() {
vsv krb5kdc
vsv kadmind
vlicense NOTICE
+
+ # Install schema files for LDAP database backend
+ if [ -n "$(vopt_if ldap present)" ]; then
+ for schema in kerberos.{schema,ldif,openldap.ldif}; do
+ vdoc src/plugins/kdb/ldap/libkdb_ldap/$schema
+ done
+ fi
}
mit-krb5-client_package() {
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: mit-krb5: update to 1.21
2023-06-07 22:04 [PR PATCH] mit-krb5: update to 1.21 klarasm
2023-06-10 16:52 ` [PR PATCH] [Updated] " klarasm
@ 2023-06-10 17:00 ` klarasm
2023-07-24 14:47 ` [PR PATCH] [Updated] " klarasm
` (6 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: klarasm @ 2023-06-10 17:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 429 bytes --]
New comment by klarasm on void-packages repository
https://github.com/void-linux/void-packages/pull/44311#issuecomment-1585735756
Comment:
Forgot to include `db-devel` in makedepends. `libldap-devel` depends on `db-devel` but I don't include that when not building with LDAP support.
Put the LDAP schemas in `/usr/share/doc`. Would it make sense to put them in `/etc/openldap/schema` instead (Gentoo does this for example)?
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PR PATCH] [Updated] mit-krb5: update to 1.21
2023-06-07 22:04 [PR PATCH] mit-krb5: update to 1.21 klarasm
2023-06-10 16:52 ` [PR PATCH] [Updated] " klarasm
2023-06-10 17:00 ` klarasm
@ 2023-07-24 14:47 ` klarasm
2023-07-24 14:48 ` mit-krb5: update to 1.21.1 klarasm
` (5 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: klarasm @ 2023-07-24 14:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1088 bytes --]
There is an updated pull request by klarasm against master on the void-packages repository
https://github.com/klarasm/void-packages mit-krb5/1.21
https://github.com/void-linux/void-packages/pull/44311
mit-krb5: update to 1.21
- update changed upstream mirror
- move configure options to configure_args
- add build options
- ldap: enable LDAP database backend, enabled by default
- lmdb: enable LMDB database backend, disabled by default
- remove --without-tcl (not recognized by configure)
- remove vsed that doesn't do anything
- change sed to vsed and restrict it to files which need the changes
- remove unnecessary do_build
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for my native architecture, (x86_64-musl)
- I built this PR locally for these architectures:
- aarch64-musl
- armv7l
- armv6l-musl
- x86_64-musl
A patch file from https://github.com/void-linux/void-packages/pull/44311.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mit-krb5/1.21-44311.patch --]
[-- Type: text/x-diff, Size: 3351 bytes --]
From a0630df4b892ffcb506a1054fef119fbf64b8243 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 7 Jun 2023 23:14:35 +0200
Subject: [PATCH] mit-krb5: update to 1.21.1
- update changed upstream mirror
- move configure options to configure_args
- add build options
- ldap: enable LDAP database backend, enabled by default
- lmdb: enable LMDB database backend, disabled by default
- include LDAP schemas when ldap option is set
- remove --without-tcl (not recognized by configure)
- remove vsed that doesn't do anything
- change sed to vsed and restrict it to files which need the changes
- remove unnecessary do_build
- getting the major version for distfile dir should also work when the
package does not have a minor version
---
srcpkgs/mit-krb5/template | 36 ++++++++++++++++++++++--------------
1 file changed, 22 insertions(+), 14 deletions(-)
diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template
index 36a7de46e0991..8446ef255920e 100644
--- a/srcpkgs/mit-krb5/template
+++ b/srcpkgs/mit-krb5/template
@@ -2,42 +2,50 @@
# if there is a bump in .so version,
# also update srcpkgs/libgssglue/files/gssapi_mech.conf
pkgname=mit-krb5
-version=1.20.1
+version=1.21.1
revision=1
+_major_version=$(echo $version | cut -d. -f-2)
build_style=gnu-configure
+configure_args="--sbindir=/usr/bin --disable-rpath --with-system-et
+ --without-system-verto --with-system-ss --enable-shared --with-system-db
+ $(vopt_with ldap) $(vopt_with lmdb)"
hostmakedepends="e2fsprogs-devel flex perl pkg-config"
-makedepends="e2fsprogs-devel libldap-devel"
+makedepends="e2fsprogs-devel db-devel $(vopt_if ldap libldap-devel)
+ $(vopt_if lmdb lmdb-devel)"
short_desc="MIT Kerberos 5 implementation"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="http://web.mit.edu/kerberos"
-distfiles="http://web.mit.edu/kerberos/dist/krb5/${version%.*}/krb5-${version}.tar.gz"
-checksum=704aed49b19eb5a7178b34b2873620ec299db08752d6a8574f95d41879ab8851
+distfiles="http://kerberos.org/dist/krb5/${_major_version}/krb5-${version}.tar.gz"
+checksum=7881c3aaaa1b329bd27dbc6bf2bf1c85c5d0b6c7358aff2b35d513ec2d50fa1f
+build_options="ldap lmdb"
+build_options_default="ldap"
+desc_option_lmdb="Enable LMDB database backend"
post_patch() {
- vsed -e "/LDFLAGS=/d" -i src/build-tools/krb5-config.in
-
# Fix db plugin.
- sed -i -e "s|<db.h>|<db_185.h>|" $wrksrc/src/plugins/kdb/db2/*.[ch]
+ vsed -i -e "s|<db.h>|<db_185.h>|" \
+ src/plugins/kdb/db2/{adb_openclose.c,db2_exp.c,kdb_db2.c,policy_db.h}
}
do_configure() {
- WARN_CFLAGS= ./src/configure ${configure_args} --sbindir=/usr/bin \
- --disable-rpath --with-system-et --without-system-verto --with-ldap \
- --with-system-ss --with-system-db --enable-shared --without-tcl \
+ ./src/configure ${configure_args} \
ac_cv_func_pthread_once=yes ac_cv_func_pthread_rwlock_init=yes \
acx_pthread_ok=yes ac_cv_func_regcomp=yes ac_cv_printf_positional=yes \
krb5_cv_attr_constructor_destructor=yes,yes
}
-do_build() {
- make
-}
-
post_install() {
vsv krb5kdc
vsv kadmind
vlicense NOTICE
+
+ # Install schema files for LDAP database backend
+ if [ -n "$(vopt_if ldap present)" ]; then
+ for schema in kerberos.{schema,ldif,openldap.ldif}; do
+ vdoc src/plugins/kdb/ldap/libkdb_ldap/$schema
+ done
+ fi
}
mit-krb5-client_package() {
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: mit-krb5: update to 1.21.1
2023-06-07 22:04 [PR PATCH] mit-krb5: update to 1.21 klarasm
` (2 preceding siblings ...)
2023-07-24 14:47 ` [PR PATCH] [Updated] " klarasm
@ 2023-07-24 14:48 ` klarasm
2023-07-25 1:40 ` [PR REVIEW] " Piraty
` (4 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: klarasm @ 2023-07-24 14:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 162 bytes --]
New comment by klarasm on void-packages repository
https://github.com/void-linux/void-packages/pull/44311#issuecomment-1648060805
Comment:
Update PR to 1.21.1.
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PR REVIEW] mit-krb5: update to 1.21.1
2023-06-07 22:04 [PR PATCH] mit-krb5: update to 1.21 klarasm
` (3 preceding siblings ...)
2023-07-24 14:48 ` mit-krb5: update to 1.21.1 klarasm
@ 2023-07-25 1:40 ` Piraty
2023-07-25 9:36 ` klarasm
` (3 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Piraty @ 2023-07-25 1:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 200 bytes --]
New review comment by Piraty on void-packages repository
https://github.com/void-linux/void-packages/pull/44311#discussion_r1272907539
Comment:
`_majorver="${version%%.*}` (used in other templates)
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PR REVIEW] mit-krb5: update to 1.21.1
2023-06-07 22:04 [PR PATCH] mit-krb5: update to 1.21 klarasm
` (4 preceding siblings ...)
2023-07-25 1:40 ` [PR REVIEW] " Piraty
@ 2023-07-25 9:36 ` klarasm
2023-07-27 0:23 ` Piraty
` (2 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: klarasm @ 2023-07-25 9:36 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 582 bytes --]
New review comment by klarasm on void-packages repository
https://github.com/void-linux/void-packages/pull/44311#discussion_r1273272421
Comment:
Naming it major version was probably a bad choice on my part. Upstream names the directory to A.B. Previously `${version%.*}` was used (the non-greedy variant) which works if version is A.B.C but not A.B. The greedy variant will always return A.
I'm aware my suggestion is a bit ugly but did not find a way to do it with bash substitution. Would it be better to do something like
```
_majorver=1.21
version="${_majorver}.1"
```
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PR REVIEW] mit-krb5: update to 1.21.1
2023-06-07 22:04 [PR PATCH] mit-krb5: update to 1.21 klarasm
` (5 preceding siblings ...)
2023-07-25 9:36 ` klarasm
@ 2023-07-27 0:23 ` Piraty
2023-07-27 16:08 ` [PR PATCH] [Updated] " klarasm
2023-07-29 22:45 ` [PR PATCH] [Merged]: " Piraty
8 siblings, 0 replies; 10+ messages in thread
From: Piraty @ 2023-07-27 0:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 212 bytes --]
New review comment by Piraty on void-packages repository
https://github.com/void-linux/void-packages/pull/44311#discussion_r1275603378
Comment:
oh i didn't pay attention... `_dist_ver`/`distver` seem popular..
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PR PATCH] [Updated] mit-krb5: update to 1.21.1
2023-06-07 22:04 [PR PATCH] mit-krb5: update to 1.21 klarasm
` (6 preceding siblings ...)
2023-07-27 0:23 ` Piraty
@ 2023-07-27 16:08 ` klarasm
2023-07-29 22:45 ` [PR PATCH] [Merged]: " Piraty
8 siblings, 0 replies; 10+ messages in thread
From: klarasm @ 2023-07-27 16:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1090 bytes --]
There is an updated pull request by klarasm against master on the void-packages repository
https://github.com/klarasm/void-packages mit-krb5/1.21
https://github.com/void-linux/void-packages/pull/44311
mit-krb5: update to 1.21.1
- update changed upstream mirror
- move configure options to configure_args
- add build options
- ldap: enable LDAP database backend, enabled by default
- lmdb: enable LMDB database backend, disabled by default
- remove --without-tcl (not recognized by configure)
- remove vsed that doesn't do anything
- change sed to vsed and restrict it to files which need the changes
- remove unnecessary do_build
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for my native architecture, (x86_64-musl)
- I built this PR locally for these architectures:
- aarch64-musl
- armv7l
- armv6l-musl
- x86_64-musl
A patch file from https://github.com/void-linux/void-packages/pull/44311.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mit-krb5/1.21-44311.patch --]
[-- Type: text/x-diff, Size: 3343 bytes --]
From f6f63afc50d99885536a66afb8f49be4515bd117 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 7 Jun 2023 23:14:35 +0200
Subject: [PATCH] mit-krb5: update to 1.21.1
- update changed upstream mirror
- move configure options to configure_args
- add build options
- ldap: enable LDAP database backend, enabled by default
- lmdb: enable LMDB database backend, disabled by default
- include LDAP schemas when ldap option is set
- remove --without-tcl (not recognized by configure)
- remove vsed that doesn't do anything
- change sed to vsed and restrict it to files which need the changes
- remove unnecessary do_build
- getting the major version for distfile dir should now also work when the
package does not have a minor version
---
srcpkgs/mit-krb5/template | 36 ++++++++++++++++++++++--------------
1 file changed, 22 insertions(+), 14 deletions(-)
diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template
index 36a7de46e0991..683c7e8d32a03 100644
--- a/srcpkgs/mit-krb5/template
+++ b/srcpkgs/mit-krb5/template
@@ -2,42 +2,50 @@
# if there is a bump in .so version,
# also update srcpkgs/libgssglue/files/gssapi_mech.conf
pkgname=mit-krb5
-version=1.20.1
+version=1.21.1
revision=1
+_distver=$(echo $version | cut -d. -f-2)
build_style=gnu-configure
+configure_args="--sbindir=/usr/bin --disable-rpath --with-system-et
+ --without-system-verto --with-system-ss --enable-shared --with-system-db
+ $(vopt_with ldap) $(vopt_with lmdb)"
hostmakedepends="e2fsprogs-devel flex perl pkg-config"
-makedepends="e2fsprogs-devel libldap-devel"
+makedepends="e2fsprogs-devel db-devel $(vopt_if ldap libldap-devel)
+ $(vopt_if lmdb lmdb-devel)"
short_desc="MIT Kerberos 5 implementation"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="http://web.mit.edu/kerberos"
-distfiles="http://web.mit.edu/kerberos/dist/krb5/${version%.*}/krb5-${version}.tar.gz"
-checksum=704aed49b19eb5a7178b34b2873620ec299db08752d6a8574f95d41879ab8851
+distfiles="http://kerberos.org/dist/krb5/${_distver}/krb5-${version}.tar.gz"
+checksum=7881c3aaaa1b329bd27dbc6bf2bf1c85c5d0b6c7358aff2b35d513ec2d50fa1f
+build_options="ldap lmdb"
+build_options_default="ldap"
+desc_option_lmdb="Enable LMDB database backend"
post_patch() {
- vsed -e "/LDFLAGS=/d" -i src/build-tools/krb5-config.in
-
# Fix db plugin.
- sed -i -e "s|<db.h>|<db_185.h>|" $wrksrc/src/plugins/kdb/db2/*.[ch]
+ vsed -i -e "s|<db.h>|<db_185.h>|" \
+ src/plugins/kdb/db2/{adb_openclose.c,db2_exp.c,kdb_db2.c,policy_db.h}
}
do_configure() {
- WARN_CFLAGS= ./src/configure ${configure_args} --sbindir=/usr/bin \
- --disable-rpath --with-system-et --without-system-verto --with-ldap \
- --with-system-ss --with-system-db --enable-shared --without-tcl \
+ ./src/configure ${configure_args} \
ac_cv_func_pthread_once=yes ac_cv_func_pthread_rwlock_init=yes \
acx_pthread_ok=yes ac_cv_func_regcomp=yes ac_cv_printf_positional=yes \
krb5_cv_attr_constructor_destructor=yes,yes
}
-do_build() {
- make
-}
-
post_install() {
vsv krb5kdc
vsv kadmind
vlicense NOTICE
+
+ # Install schema files for LDAP database backend
+ if [ -n "$(vopt_if ldap present)" ]; then
+ for schema in kerberos.{schema,ldif,openldap.ldif}; do
+ vdoc src/plugins/kdb/ldap/libkdb_ldap/$schema
+ done
+ fi
}
mit-krb5-client_package() {
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PR PATCH] [Merged]: mit-krb5: update to 1.21.1
2023-06-07 22:04 [PR PATCH] mit-krb5: update to 1.21 klarasm
` (7 preceding siblings ...)
2023-07-27 16:08 ` [PR PATCH] [Updated] " klarasm
@ 2023-07-29 22:45 ` Piraty
8 siblings, 0 replies; 10+ messages in thread
From: Piraty @ 2023-07-29 22:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 928 bytes --]
There's a merged pull request on the void-packages repository
mit-krb5: update to 1.21.1
https://github.com/void-linux/void-packages/pull/44311
Description:
- update changed upstream mirror
- move configure options to configure_args
- add build options
- ldap: enable LDAP database backend, enabled by default
- lmdb: enable LMDB database backend, disabled by default
- remove --without-tcl (not recognized by configure)
- remove vsed that doesn't do anything
- change sed to vsed and restrict it to files which need the changes
- remove unnecessary do_build
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for my native architecture, (x86_64-musl)
- I built this PR locally for these architectures:
- aarch64-musl
- armv7l
- armv6l-musl
- x86_64-musl
^ permalink raw reply [flat|nested] 10+ messages in thread