Update spamassassin to version 4.0.2 and spampd to version 2.62 #1

adkorte · 2025-09-02T22:25:51+02:00

adkorte commented

2025-09-02 22:25:51 +02:00

First-time contributor

No description provided.

adkorte added 1 commit 2025-09-02 22:25:52 +02:00

Update spamassassin to version 4.0.2 and spampd to version 2.62 14aeee4289

smithfarm commented

2025-09-05 13:01:16 +02:00

Please note, openSUSE:Factory has not been migrated to git, yet. The process for landing updates there is still:

land the update in the devel project (NOTE: the devel project may or may not have been migrated to git already)
SR from devel to openSUSE:Factory

Please note, openSUSE:Factory has not been migrated to git, yet. The process for landing updates there is still: 1. land the update in the devel project (NOTE: the devel project may or may not have been migrated to git already) 2. SR from devel to openSUSE:Factory

adkorte commented

2025-09-05 13:07:23 +02:00

First-time contributor

I will need some help with this. It took me several hours to get to this point, which would literally have taken less than two minutes on OBS. I have no idea what to do.

adamm commented

2025-09-05 13:11:30 +02:00

First-time contributor

osc develproject openSUSE:Factory spamassassin

So, this one is actually already in Git in src.opensuse.org/perl/spamassassin

Can you please create a PR against src.opensuse.org/perl/spamassassin ?

`osc develproject openSUSE:Factory spamassassin` So, this one is actually already in Git in [src.opensuse.org/perl/spamassassin](src.opensuse.org/perl/spamassassin) Can you please create a PR against src.opensuse.org/perl/spamassassin ?

adkorte commented

2025-09-05 13:15:58 +02:00

First-time contributor

As mentioned above, I have no idea how to do that. I found instructions in https://en.opensuse.org/openSUSE:Git_Packaging_Workflow but apparently missed some steps. I have no idea what.

adamm commented

2025-09-05 13:35:31 +02:00

First-time contributor

I understand. The instructions there talk about /pool specifically and not devel projects. So, what you can do is this, go to src.opensuse.org/perl/spamassassin and create a fork there to your home, call it "spamassassin2". Then in your current checkout (spamassassin) that contains your changes,

git remote add devel gitea@src.opensuse.org:adkorte/spamassassin2
git fetch devel
git checkout -b version_update devel/main
git cherry-pick 14aeee4289b66f8911d35498fba345f1ab5b6a79025bb6f284d1ecb5b435ac49
git push devel version_update

Now you should have version_update branch in spamassassin2 fork on Gitea. Then create a PR against the main branch of the perl package.

The commands above did,
* add another gitea repository to your git checkout, the 2nd fork
* fetch current state from it
* checkout the current devel project branch as "version_update" branch
* cherry-pick the changes you are trying to commit here to that branch (there should be no conflicts)
* push the new branch to your 2nd fork

The reason for 2nd fork is that Gitea only has 1:1 relationship between parents and forks. You can't add the devel project to existing fork.

Did this work?

I understand. The instructions there talk about `/pool` specifically and not devel projects. So, what you can do is this, go to [src.opensuse.org/perl/spamassassin](src.opensuse.org/perl/spamassassin) and create a fork there to your home, call it "spamassassin2". Then in your current checkout (spamassassin) that contains your changes, ``` git remote add devel gitea@src.opensuse.org:adkorte/spamassassin2 git fetch devel git checkout -b version_update devel/main git cherry-pick 14aeee4289b66f8911d35498fba345f1ab5b6a79025bb6f284d1ecb5b435ac49 git push devel version_update ``` Now you should have version_update branch in spamassassin2 fork on Gitea. Then create a PR against the main branch of the perl package. The commands above did, * add another gitea repository to your git checkout, the 2nd fork * fetch current state from it * checkout the current devel project branch as "version_update" branch * cherry-pick the changes you are trying to commit here to that branch (there should be no conflicts) * push the new branch to your 2nd fork The reason for 2nd fork is that Gitea only has 1:1 relationship between parents and forks. You can't add the devel project to existing fork. Did this work?

adkorte closed this pull request

2025-09-05 13:58:53 +02:00

adkorte commented

2025-09-05 14:06:13 +02:00

First-time contributor

I think it worked, I now see a bunch of reviewers in the pull request I just created. Now the million dollar question is, where did I go wrong in my earlier attempt to do this?

adamm commented

2025-09-05 14:30:55 +02:00

First-time contributor

I don't believe it's your fault so much. The wiki talks about /pool still, but we are migrating devel projects to their own organizations.

And I forgot to set an Branch blocking attribute for openSUSE:Factory/spamassassin that should have told you to contribute to src.opensuse.org/perl/spamassassin directly instead of trying to create an osc branch. I'll do that now.

I don't believe it's your fault so much. The wiki talks about `/pool` still, but we are migrating devel projects to their own organizations. And I forgot to set an Branch blocking attribute for openSUSE:Factory/spamassassin that should have told you to contribute to src.opensuse.org/perl/spamassassin directly instead of trying to create an osc branch. I'll do that now.

Pull request closed

This pull request cannot be reopened because the branch was deleted.

Sign in to join this conversation.

3 Participants

Notifications

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: pool/spamassassin#1