fixing issue #20818 . upgrade gnucobol upstream and the local patches to allow usage of indexed files by libdb. #20961

alexbodn · 2024-07-26T14:04:40Z

the patches to packages/gnucobol solve the problem in issue #20818 entirely, while also upgrading upstream gnucobol.

however, i'm about to ask upstream to adopt one hefty patch file, so that the package will be termux related only.

does my PR include commits out of packages/gnucobol they may be safely discarded as unrelated.

enabled indexed files support

alexbodn · 2024-07-26T15:51:30Z

i know the patch seems a mess, since the commits are my progress with building and checking the package.
here is one file patch that diffs end - start without any back and forth, or other directories.
gnucobol.patch

GitMensch · 2024-07-26T16:53:40Z

These are too many commits. Can you please squash them into two (one for the update, the other for bdb compatibility and use)?

GitMensch · 2024-07-26T16:55:15Z

packages/gnucobol/build.sh

-TERMUX_PKG_VERSION=3.1.2
-TERMUX_PKG_REVISION=3
+TERMUX_PKG_VERSION=3.2
+TERMUX_PKG_REVISION=4


If you increase the version then revision is to be set to 0 or 1 (please check the docs)

GitMensch · 2024-07-26T16:55:45Z

packages/gnucobol/build.sh

-TERMUX_PKG_SHA256=597005d71fd7d65b90cbe42bbfecd5a9ec0445388639404662e70d53ddf22574
-TERMUX_PKG_DEPENDS="json-c, libgmp, libvbisam, libxml2, ncurses"
+TERMUX_PKG_SHA256=3bb48af46ced4779facf41fdc2ee60e4ccb86eaa99d010b36685315df39c2ee2
+##TERMUX_PKG_SRCURL=git+https://github.com/alexbodn/gnucobol-3.2.git


Please drop the commented parts

GitMensch

Packages libdb should be part of a separate PR, no?

alexbodn · 2024-07-27T10:27:19Z

Packages libdb should be part of a separate PR, no?

sure, i didn't know how to proceed, so i have initialy pushed all my commits during this period.
to correct this, i have attached to my other comment the diff of packages/gnucobol only from my first checkout to my last commit.
btw, @GitMensch , my upstream.patch doesn't have much to do with termux, has some missed includes and could help with any cross compilation, so i'd encourage you to apply to your distro. configure is autogenerated, but it's needed for now already.

alexbodn · 2024-07-27T10:37:21Z

These are too many commits. Can you please squash them into two (one for the update, the other for bdb compatibility and use)?

sure, the workflow is triggered by commits, so all my trials had to be commited.
i've also sent a one patch from start to end.

here it is

gnucobol.patch

TomJo2000 · 2024-07-27T11:49:54Z

sure, the workflow is triggered by commits, so all my trials had to be commited. i've also sent a one patch from start to end.

The workflows are also dispatched when force pushing to a PR branch.
I recommend you familiarize yourself with the git commit --amend, git rebase -i and git push --force-with-lease= commands.

TomJo2000

Completely unmergable in its current state.
Barely reviewable as is too.

TomJo2000 · 2024-07-27T11:52:45Z

scripts/lint-packages.sh

 				else
 					echo "INVALID"
-					pkg_lint_error=true
+##					pkg_lint_error=true


You may not disable the License check just because your package does not pass it.

this was for another package. this one does pass.
could you take a lokk a my gnucobol.patch file attached to a comment above?
it doesn't contain other directories, nor back and forth trials.

TomJo2000 · 2024-07-27T11:55:28Z

packages/libdb6/build.sh

@@ -0,0 +1,38 @@
+TERMUX_PKG_HOMEPAGE=https://www.oracle.com/database/berkeley-db
+TERMUX_PKG_DESCRIPTION="The Berkeley DB embedded database system (library) last non AGPL"
+TERMUX_PKG_LICENSE=Sleepycat


This should be set to custom.
If you want to denote a license name, do so in a comment above.
See:

termux-packages/x11-packages/feh/build.sh

Lines 3 to 5 in cf857f7

# License: MIT-feh

TERMUX_PKG_LICENSE="custom"

TERMUX_PKG_LICENSE_FILE="COPYING"

Sleepycat was on the list of licenses on termux-packages, but indeed lint didn't pass.

TomJo2000 · 2024-07-27T11:56:16Z

packages/libdb6/build.sh

+TERMUX_PKG_CONFLICTS="libdb-dev,libdb"
+TERMUX_PKG_REPLACES="libdb-dev,libdb"
+TERMUX_PKG_PROVIDES="libdb"
+TERMUX_PKG_BLACKLISTED_ARCHES="arm, i686, x86_64"


Would you mind explaining why you disabled all but aarch64 for this package?

sure.
first, it's another package i tried to build.
it's build took a lot of time, and i could only try on aarch64.

TomJo2000 · 2024-07-27T11:57:43Z

packages/libdb6/build.sh

+TERMUX_PKG_LICENSE_FILE="../LICENSE"
+TERMUX_PKG_MAINTAINER="@termux"
+TERMUX_PKG_VERSION=6.0.19
+TERMUX_PKG_REVISION=1


TERMUX_PKG_REVISION shouldn't be set for a newly introduced package.

TomJo2000 · 2024-07-27T11:58:48Z

packages/libdb6/build.sh

@@ -0,0 +1,38 @@
+TERMUX_PKG_HOMEPAGE=https://www.oracle.com/database/berkeley-db
+TERMUX_PKG_DESCRIPTION="The Berkeley DB embedded database system (library) last non AGPL"


We already provide a libdb package.
What exactly necessitates packaging libdb6 specifically?

libdb6 is not the issue in this PR.

libdb 6.0.19 was the last libdb that is not AGPL.

v6 had more features dropped in very 18.1.40, like sql and client-server interfaces.

debian also prefer v5, even older.

TomJo2000 · 2024-07-27T11:59:45Z

packages/gnucobol/upstream.patch

What the actual hell is this patch.
How do you expect anyone to review, let alone maintain this?

It's gonna stop applying immediately after the next version upgrade.

i'd rather look at gnucobol.patch instead. do Ctrl-F here. it contains only changes to packages/gnucobol.

the PR itself mirrors all my commits to my termux-packages fork during my work on gnucobol. as the CI workflow would only work on commits, i had to commit all my trials until i got the problem fixed. a big thank goes to github for all these resources.

the problem my patch came to solve was with the upstream configure script that wouldn't work correctly when cross compiling.
most of my patch, the file packages/gnucobol/upstream.patch is directed to the upstream developers. i will delete it here once they apply it.
however it's here to make gnucobol run correctly already, based on their current official released archive.

I'll have a look at this patch (and guess most things area already solved in the current dev snapshot for GnuCOBOL 3.3, but the final release will take some months)

alexbodn · 2024-07-28T09:04:17Z

the problems in this PR challenged me to try a better way to wrap my changes.

thank you everybody.

i'm closing this PR and have submitted another at.

@GitMensch part of the code to this patch belongs, in my opinion, upstream, to gnucobol project for any other cross compilation.
you may see my work at, in branch termux.
if that suites you please checkout and provide an updated release to the termux port.
otherwise, i could push upstream.patch without configure to termux, and just run autoconfigure at build time.
your choice.

GitMensch · 2024-07-28T10:10:57Z

Can you please create another PR for BDB?

alexbodn and others added 30 commits July 15, 2024 17:53

Update build.sh

6c57c43

enabled indexed files support

Update build.sh

a94d987

cloned libdb to package libdb-5

26ab0e7

Update build.sh

177b23c

Update build.sh

a529db3

Update build.sh

3e0aaa7

removed libdb5

9ff8bfd

disabled patches

67e670e

renamed

b2ee631

Update build.sh

2f3de8b

Update build.sh

83e18ce

Update build.sh

e34ef63

Update build.sh

e971253

Update libcob-common.c.patch

e4849af

renamed

3c39772

Update libcob-common.c.patch

32ae058

Update build.sh

6e1e371

renamed

e1debd2

rename

d446da4

quotes on branch name

17d9443

echo git clone branch

53f4201

echoes

0eb5763

help2man dependency

ef0201c

revert h2m

112266b

inquire

3465bde

inquire

a970e4a

newline

0af0bcb

simpler man

d6a95ba

db6

c3857c1

progress

6428334

alexbodn and others added 14 commits July 25, 2024 11:50

reorder prints

15b1dc2

BDB_CFLAGS

2c89ee1

all flags

8e2a03c

cancel bdb_cflags

7983c4c

revert flag. remove cat configure log

0acbf6c

minimal cobc pre_configure

20fc096

install_deps=true

bdb17a2

test autodetect

425345a

aquire bdb_header

6bdd157

test header detection

b551224

give -i

868d295

reintegrate to upstream archive

fe66bdb

final test

a62595d

Merge branch 'termux:master' into master

3a7e19d

alexbodn requested review from Grimler91 and finagolfin as code owners July 26, 2024 14:04

GitMensch reviewed Jul 26, 2024

View reviewed changes

TomJo2000 requested changes Jul 27, 2024

View reviewed changes

Update packages.yml

12609c3

alexbodn mentioned this pull request Jul 28, 2024

Gnucobol pushed to version 3.2 and implemented berkeley db support #20968

Open

alexbodn closed this Jul 28, 2024

	# License: MIT-feh
	TERMUX_PKG_LICENSE="custom"
	TERMUX_PKG_LICENSE_FILE="COPYING"

		@@ -0,0 +1,38 @@
		TERMUX_PKG_HOMEPAGE=https://www.oracle.com/database/berkeley-db
		TERMUX_PKG_DESCRIPTION="The Berkeley DB embedded database system (library) last non AGPL"

Uh oh!

fixing issue #20818 . upgrade gnucobol upstream and the local patches to allow usage of indexed files by libdb. #20961

fixing issue #20818 . upgrade gnucobol upstream and the local patches to allow usage of indexed files by libdb. #20961

Uh oh!

Conversation

alexbodn commented Jul 26, 2024

Uh oh!

alexbodn commented Jul 26, 2024

Uh oh!

GitMensch commented Jul 26, 2024

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

GitMensch left a comment

Choose a reason for hiding this comment

Uh oh!

alexbodn commented Jul 27, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

alexbodn commented Jul 27, 2024

Uh oh!

TomJo2000 commented Jul 27, 2024

Uh oh!

TomJo2000 left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

TomJo2000 Jul 27, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

TomJo2000 Jul 27, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

alexbodn commented Jul 28, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

GitMensch commented Jul 28, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

alexbodn commented Jul 27, 2024 •

edited

Loading

TomJo2000 Jul 27, 2024 •

edited

Loading

TomJo2000 Jul 27, 2024 •

edited

Loading

alexbodn commented Jul 28, 2024 •

edited

Loading