[PR PATCH] unixodbc: update to 2.3.11.

[PR PATCH] unixodbc: update to 2.3.11.

[mhmdanas]

[-- Attachment #1: Type: text/plain, Size: 1230 bytes --]

There is a new pull request by mhmdanas against master on the void-packages repository

https://github.com/mhmdanas/void-packages unixodbc-2.3.11
https://github.com/void-linux/void-packages/pull/42529

unixodbc: update to 2.3.11.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/42529.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-unixodbc-2.3.11-42529.patch --]
[-- Type: text/x-diff, Size: 1231 bytes --]

From 6c43a367e78abdac52e740116b202c70691a1df0 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Wed, 1 Mar 2023 17:57:24 +0000
Subject: [PATCH] unixodbc: update to 2.3.11.

---
 srcpkgs/unixodbc/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/unixodbc/template b/srcpkgs/unixodbc/template
index d1ee07c0b54d..11784add7063 100644
--- a/srcpkgs/unixodbc/template
+++ b/srcpkgs/unixodbc/template
@@ -1,6 +1,6 @@
 # Template file for 'unixodbc'
 pkgname=unixodbc
-version=2.3.9
+version=2.3.11
 revision=1
 build_style=gnu-configure
 makedepends="libltdl-devel readline-devel"
@@ -8,9 +8,9 @@ conf_files="/etc/odbcinst.ini /etc/odbc.ini"
 short_desc="Basic ODBC tools"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only, LGPL-2.1-or-later"
-homepage="http://www.unixodbc.org"
-distfiles="http://www.unixodbc.org/unixODBC-${version}.tar.gz"
-checksum=52833eac3d681c8b0c9a5a65f2ebd745b3a964f208fc748f977e44015a31b207
+homepage="https://www.unixodbc.org"
+distfiles="https://www.unixodbc.org/unixODBC-${version}.tar.gz"
+checksum=d9e55c8e7118347e3c66c87338856dad1516b490fb7c756c1562a2c267c73b5c
 
 libodbc_package() {
 	short_desc="ODBC library for Unix"

Re: [PR PATCH] [Updated] unixodbc: update to 2.3.11.

[mhmdanas]

[-- Attachment #1: Type: text/plain, Size: 1235 bytes --]

There is an updated pull request by mhmdanas against master on the void-packages repository

https://github.com/mhmdanas/void-packages unixodbc-2.3.11
https://github.com/void-linux/void-packages/pull/42529

unixodbc: update to 2.3.11.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/42529.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-unixodbc-2.3.11-42529.patch --]
[-- Type: text/x-diff, Size: 1336 bytes --]

From a0c8e09008c579173ecdbe27123a07642a5ffe00 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Wed, 1 Mar 2023 17:57:24 +0000
Subject: [PATCH] unixodbc: update to 2.3.11.

---
 srcpkgs/unixodbc/template | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/unixodbc/template b/srcpkgs/unixodbc/template
index d1ee07c0b54d..5960b723bf45 100644
--- a/srcpkgs/unixodbc/template
+++ b/srcpkgs/unixodbc/template
@@ -1,6 +1,6 @@
 # Template file for 'unixodbc'
 pkgname=unixodbc
-version=2.3.9
+version=2.3.11
 revision=1
 build_style=gnu-configure
 makedepends="libltdl-devel readline-devel"
@@ -8,9 +8,14 @@ conf_files="/etc/odbcinst.ini /etc/odbc.ini"
 short_desc="Basic ODBC tools"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only, LGPL-2.1-or-later"
-homepage="http://www.unixodbc.org"
-distfiles="http://www.unixodbc.org/unixODBC-${version}.tar.gz"
-checksum=52833eac3d681c8b0c9a5a65f2ebd745b3a964f208fc748f977e44015a31b207
+homepage="https://www.unixodbc.org"
+distfiles="https://www.unixodbc.org/unixODBC-${version}.tar.gz"
+checksum=d9e55c8e7118347e3c66c87338856dad1516b490fb7c756c1562a2c267c73b5c
+
+post_install() {
+	# Conflicts with isql from firebird3.
+	mv ${DESTDIR}/usr/bin/isql{,-uo}
+}
 
 libodbc_package() {
 	short_desc="ODBC library for Unix"

Re: [PR REVIEW] unixodbc: update to 2.3.11.

[mhmdanas]

[-- Attachment #1: Type: text/plain, Size: 220 bytes --]

New review comment by mhmdanas on void-packages repository

https://github.com/void-linux/void-packages/pull/42529#discussion_r1131432943

Comment:
`isql-uo` looks kind of weird, does anybody have any alternative names?

Re: [PR REVIEW] unixodbc: update to 2.3.11.

[ahesford]

[-- Attachment #1: Type: text/plain, Size: 442 bytes --]

New review comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/42529#discussion_r1199108144

Comment:
Hrm, popcorn shows 2 installed `unixodbc` packages and no `firebird3`. I wonder whether firebird's executable should be renamed instead.

If it's appropriate to rename this one, we should also move the man page, or even better have a symlink so *both* `isql` and `isql-uo` bring up the page.

Re: [PR PATCH] [Updated] unixodbc: update to 2.3.11.

[mhmdanas]

[-- Attachment #1: Type: text/plain, Size: 1235 bytes --]

There is an updated pull request by mhmdanas against master on the void-packages repository

https://github.com/mhmdanas/void-packages unixodbc-2.3.11
https://github.com/void-linux/void-packages/pull/42529

unixodbc: update to 2.3.11.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/42529.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-unixodbc-2.3.11-42529.patch --]
[-- Type: text/x-diff, Size: 2126 bytes --]

From 986551225b8c513f354ec5774518f67aafa7a522 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Wed, 1 Mar 2023 17:57:24 +0000
Subject: [PATCH 1/2] unixodbc: update to 2.3.11.

---
 srcpkgs/unixodbc/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/unixodbc/template b/srcpkgs/unixodbc/template
index d1ee07c0b54d8..11784add7063c 100644
--- a/srcpkgs/unixodbc/template
+++ b/srcpkgs/unixodbc/template
@@ -1,6 +1,6 @@
 # Template file for 'unixodbc'
 pkgname=unixodbc
-version=2.3.9
+version=2.3.11
 revision=1
 build_style=gnu-configure
 makedepends="libltdl-devel readline-devel"
@@ -8,9 +8,9 @@ conf_files="/etc/odbcinst.ini /etc/odbc.ini"
 short_desc="Basic ODBC tools"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only, LGPL-2.1-or-later"
-homepage="http://www.unixodbc.org"
-distfiles="http://www.unixodbc.org/unixODBC-${version}.tar.gz"
-checksum=52833eac3d681c8b0c9a5a65f2ebd745b3a964f208fc748f977e44015a31b207
+homepage="https://www.unixodbc.org"
+distfiles="https://www.unixodbc.org/unixODBC-${version}.tar.gz"
+checksum=d9e55c8e7118347e3c66c87338856dad1516b490fb7c756c1562a2c267c73b5c
 
 libodbc_package() {
 	short_desc="ODBC library for Unix"

From 18b82e918458e9c16a2291bfeb9e497d4f57d5b4 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Tue, 13 Jun 2023 12:33:40 +0100
Subject: [PATCH 2/2] firebird3: rename isql to avoid conflict with unixodbc.

---
 srcpkgs/firebird3/template | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/firebird3/template b/srcpkgs/firebird3/template
index 8f2285dc7729f..0c5bfdd5e74fb 100644
--- a/srcpkgs/firebird3/template
+++ b/srcpkgs/firebird3/template
@@ -1,7 +1,7 @@
 # Template file for 'firebird3'
 pkgname=firebird3
 version=3.0.6.33328
-revision=1
+revision=2
 _build=0
 _uver=${version//./_}
 build_style=gnu-configure
@@ -113,6 +113,9 @@ do_install() {
 
 	cp -pR gen/buildroot/* ${DESTDIR}/
 
+	# Conflicts with isql from unixodbc.
+	mv ${DESTDIR}/usr/bin/isql{,-fb}
+
 	# TODO: create superserver?
 	# system account?
 	# runit service?

Re: [PR REVIEW] unixodbc: update to 2.3.11.

[mhmdanas]

[-- Attachment #1: Type: text/plain, Size: 390 bytes --]

New review comment by mhmdanas on void-packages repository

https://github.com/void-linux/void-packages/pull/42529#discussion_r1227987897

Comment:
> Hrm, popcorn shows 2 installed unixodbc packages and no firebird3. I wonder whether firebird's executable should be renamed instead.

Those two could have been me. :P

Anyway, I went ahead and renamed `firebird3`'s `isql` to `isql-fb`.

Re: [PR PATCH] [Updated] unixodbc: update to 2.3.11.

[mhmdanas]

[-- Attachment #1: Type: text/plain, Size: 1235 bytes --]

There is an updated pull request by mhmdanas against master on the void-packages repository

https://github.com/mhmdanas/void-packages unixodbc-2.3.11
https://github.com/void-linux/void-packages/pull/42529

unixodbc: update to 2.3.11.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/42529.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-unixodbc-2.3.11-42529.patch --]
[-- Type: text/x-diff, Size: 2688 bytes --]

From a3055866fd31ef682f924e2c2902c1b6007f3032 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Wed, 1 Mar 2023 17:57:24 +0000
Subject: [PATCH 1/2] unixodbc: update to 2.3.11.

---
 srcpkgs/unixodbc/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/unixodbc/template b/srcpkgs/unixodbc/template
index d1ee07c0b54d..11784add7063 100644
--- a/srcpkgs/unixodbc/template
+++ b/srcpkgs/unixodbc/template
@@ -1,6 +1,6 @@
 # Template file for 'unixodbc'
 pkgname=unixodbc
-version=2.3.9
+version=2.3.11
 revision=1
 build_style=gnu-configure
 makedepends="libltdl-devel readline-devel"
@@ -8,9 +8,9 @@ conf_files="/etc/odbcinst.ini /etc/odbc.ini"
 short_desc="Basic ODBC tools"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only, LGPL-2.1-or-later"
-homepage="http://www.unixodbc.org"
-distfiles="http://www.unixodbc.org/unixODBC-${version}.tar.gz"
-checksum=52833eac3d681c8b0c9a5a65f2ebd745b3a964f208fc748f977e44015a31b207
+homepage="https://www.unixodbc.org"
+distfiles="https://www.unixodbc.org/unixODBC-${version}.tar.gz"
+checksum=d9e55c8e7118347e3c66c87338856dad1516b490fb7c756c1562a2c267c73b5c
 
 libodbc_package() {
 	short_desc="ODBC library for Unix"

From 7cbf9c0490d0499dd67b356cecb62f1c0b81ab1d Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Tue, 13 Jun 2023 12:33:40 +0100
Subject: [PATCH 2/2] firebird3: rename isql to avoid conflict with unixodbc.

---
 srcpkgs/firebird3/template | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/firebird3/template b/srcpkgs/firebird3/template
index 8f2285dc7729..f9d40790bb64 100644
--- a/srcpkgs/firebird3/template
+++ b/srcpkgs/firebird3/template
@@ -1,7 +1,7 @@
 # Template file for 'firebird3'
 pkgname=firebird3
 version=3.0.6.33328
-revision=1
+revision=2
 _build=0
 _uver=${version//./_}
 build_style=gnu-configure
@@ -30,7 +30,7 @@ makedepends="boost-devel libedit-devel icu-devel ncurses-devel libatomic_ops-dev
  libtommath-devel zlib-devel"
 short_desc="Relational database offering many ANSI SQL standard features (V3)"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="custom"
+license="custom:IDPL-1.0, Interbase-1.0"
 homepage="https://www.firebirdsql.org/en/start/"
 distfiles="https://github.com/FirebirdSQL/firebird/releases/download/R${_uver%_*}/Firebird-${version}-${_build}.tar.bz2"
 checksum=34c1d2a29bbaf288e682cd1b5f8083f2baf73f351062245ace0bee35a3f7d35f
@@ -113,6 +113,9 @@ do_install() {
 
 	cp -pR gen/buildroot/* ${DESTDIR}/
 
+	# Conflicts with isql from unixodbc.
+	mv ${DESTDIR}/usr/bin/isql{,-fb}
+
 	# TODO: create superserver?
 	# system account?
 	# runit service?

Re: [PR PATCH] [Updated] unixodbc: update to 2.3.11.

[mhmdanas]

[-- Attachment #1: Type: text/plain, Size: 1235 bytes --]

There is an updated pull request by mhmdanas against master on the void-packages repository

https://github.com/mhmdanas/void-packages unixodbc-2.3.11
https://github.com/void-linux/void-packages/pull/42529

unixodbc: update to 2.3.11.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/42529.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-unixodbc-2.3.11-42529.patch --]
[-- Type: text/x-diff, Size: 3018 bytes --]

From e1247779852e8c081f073569c4be52d7b6a02db1 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Wed, 1 Mar 2023 17:57:24 +0000
Subject: [PATCH 1/2] unixodbc: update to 2.3.11.

---
 srcpkgs/unixodbc/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/unixodbc/template b/srcpkgs/unixodbc/template
index d1ee07c0b54d..11784add7063 100644
--- a/srcpkgs/unixodbc/template
+++ b/srcpkgs/unixodbc/template
@@ -1,6 +1,6 @@
 # Template file for 'unixodbc'
 pkgname=unixodbc
-version=2.3.9
+version=2.3.11
 revision=1
 build_style=gnu-configure
 makedepends="libltdl-devel readline-devel"
@@ -8,9 +8,9 @@ conf_files="/etc/odbcinst.ini /etc/odbc.ini"
 short_desc="Basic ODBC tools"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only, LGPL-2.1-or-later"
-homepage="http://www.unixodbc.org"
-distfiles="http://www.unixodbc.org/unixODBC-${version}.tar.gz"
-checksum=52833eac3d681c8b0c9a5a65f2ebd745b3a964f208fc748f977e44015a31b207
+homepage="https://www.unixodbc.org"
+distfiles="https://www.unixodbc.org/unixODBC-${version}.tar.gz"
+checksum=d9e55c8e7118347e3c66c87338856dad1516b490fb7c756c1562a2c267c73b5c
 
 libodbc_package() {
 	short_desc="ODBC library for Unix"

From 208a9df12e1d431d6123a059f051d53288763f47 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Tue, 13 Jun 2023 12:33:40 +0100
Subject: [PATCH 2/2] firebird3: rename isql to avoid conflict with unixodbc.

---
 srcpkgs/firebird3/template | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/firebird3/template b/srcpkgs/firebird3/template
index 8f2285dc7729..575415d2128f 100644
--- a/srcpkgs/firebird3/template
+++ b/srcpkgs/firebird3/template
@@ -1,7 +1,7 @@
 # Template file for 'firebird3'
 pkgname=firebird3
 version=3.0.6.33328
-revision=1
+revision=2
 _build=0
 _uver=${version//./_}
 build_style=gnu-configure
@@ -30,7 +30,7 @@ makedepends="boost-devel libedit-devel icu-devel ncurses-devel libatomic_ops-dev
  libtommath-devel zlib-devel"
 short_desc="Relational database offering many ANSI SQL standard features (V3)"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="custom"
+license="custom:IDPL-1.0, Interbase-1.0"
 homepage="https://www.firebirdsql.org/en/start/"
 distfiles="https://github.com/FirebirdSQL/firebird/releases/download/R${_uver%_*}/Firebird-${version}-${_build}.tar.bz2"
 checksum=34c1d2a29bbaf288e682cd1b5f8083f2baf73f351062245ace0bee35a3f7d35f
@@ -87,7 +87,7 @@ pre_configure() {
 	# do not change ownership to root:root and
 	# do not change permissions to read-only
 	find -iname "*.sh.in" -exec sed -i "{}" \
-		-e 's;"`whoami`";"root";' \
+		-e 's;"\x60whoami\x60";"root";' \
 		-e 's;chown root:root;#&;' \
 		-e 's;chown -R;#&;' \
 		-e 's;chmod 0444;chmod 0644;' \
@@ -113,6 +113,9 @@ do_install() {
 
 	cp -pR gen/buildroot/* ${DESTDIR}/
 
+	# Conflicts with isql from unixodbc.
+	mv ${DESTDIR}/usr/bin/isql{,-fb}
+
 	# TODO: create superserver?
 	# system account?
 	# runit service?

Re: [PR PATCH] [Merged]: unixodbc: update to 2.3.11.

[leahneukirchen]

[-- Attachment #1: Type: text/plain, Size: 1069 bytes --]

There's a merged pull request on the void-packages repository

unixodbc: update to 2.3.11.
https://github.com/void-linux/void-packages/pull/42529

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->