Bug 237634
| Summary: | security/py-bro-pkg: Rename (move) to security/py-zkg and update to 2.0.0 | ||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| Product: | Ports & Packages | Reporter: | Shirkdog <mshirk> | ||||||||||||||
| Component: | Individual Port(s) | Assignee: | Kai Knoblich <kai> | ||||||||||||||
| Status: | Closed FIXED | ||||||||||||||||
| Severity: | Affects Only Me | CC: | kai, mshirk, python | ||||||||||||||
| Priority: | --- | ||||||||||||||||
| Version: | Latest | ||||||||||||||||
| Hardware: | Any | ||||||||||||||||
| OS: | Any | ||||||||||||||||
| URL: | https://pypi.org/project/zkg/ | ||||||||||||||||
| Attachments: |
|
||||||||||||||||
I should have added this is a maintainer update, so let me know if this needs to be split into two separate bugs. @Shirkdog Thank you for the issue detail. This should likely take the form of a "port move" via 'svn mv', then updating the target to be the new name, instead of a deprecation && new port. Please: - Include all changes for the above move as an svn diff against /usr/ports instead of in comments, including an entry in MOVED for the port rename - Use the maintainer-approval attachment flag (set to +), to signify maintainer approval. Attachment -> Details -> maintainer-approval [+]. Created attachment 204965 [details]
py-zeek-pkg shell archive updated
Created attachment 204966 [details]
svn diff for move
Created attachment 205054 [details]
py-zkg-2.0.0.patch
Created attachment 205055 [details]
py-zkg-2.0.0.shar
(In reply to Shirkdog from comment #1) Thank you for your updated patches. I looked at it and the overall picture is clear, but we need to do a small change with the package name. If you take a look at PyPi you'll see that the Python package name is "zkg" and the release has been updated to 2.0.0 recently. I have attached two patches (SVN version + shar archive) that reflects those changes. With the 2.0.0 release one can use "zkg" instead of "bro-pkg" to fetch packages but "bro-pkg" can still be used for backwards compatibility. To summarize all changes: - Port is renamed from "security/py-bro-pkg" to "security/py-zkg" - Update to 2.0.0 - Update the pkg-descr accordingly (and align the text somewhat to make it more readable) - Also update the pkg-message with a hint about the previously used command "bro-pkg" If those changes are ok for you, I'll commit them together with the other required changes (update MOVED and security/Makefile, etc.). @Kai diffs are fine for port moves Let's also obsolete any .. obsoleted patches and please include the MOVED and category/Makefile updates with it as well. And issue summary needs updating Created attachment 205057 [details] MOVE-security-py-bro-pkg-TO-security-py-zkg.patch Attached the complete diff and one more addition that I forgot to mention before: I also added "git:devel/git" to the RUN_DEPENDS otherwise "zkg" / "bro-pkg" throws an exception / warning during runtime: > Traceback (most recent call last): > File "/usr/local/lib/python3.6/site-packages/git/__init__.py", line 83, in <module> > refresh() > File "/usr/local/lib/python3.6/site-packages/git/__init__.py", line 73, in refresh > if not Git.refresh(path=path): > File "/usr/local/lib/python3.6/site-packages/git/cmd.py", line 290, in refresh > raise ImportError(err) > ImportError: Bad git executable. > The git executable must be specified in one of the following ways: > - be included in your $PATH > - be set via $GIT_PYTHON_GIT_EXECUTABLE > - explicitly set via git.refresh() > > All git commands will error until this is rectified. Comment on attachment 205057 [details]
MOVE-security-py-bro-pkg-TO-security-py-zkg.patch
Thanks for the additional updates on this, through this process I saw the 2.0.0 release hit, and did not even see the zkg changes. Hopefully for now on updates will be more routine.
A commit references this bug: Author: kai Date: Mon Jun 17 05:51:26 UTC 2019 New revision: 504391 URL: https://svnweb.freebsd.org/changeset/ports/504391 Log: security/py-bro-pkg: Rename to security/py-zkg and update to 2.0.0 The project name of upstream has changed from "Bro" to "Zeek". This also affects the repositories and offered packages. * Rename the port to security/py-zkg * Adapt the text references in COMMENT and pkg-{descr,message} accordingly. * Update to 2.0.0 Changelog: https://github.com/zeek/package-manager/blob/v2.0.0/CHANGES PR: 237634 Submitted by: Shirkdog <mshirk@daemon-security.com> (maintainer) Reviewed by: koobs Changes: head/MOVED head/security/Makefile head/security/py-bro-pkg/ head/security/py-zkg/ head/security/py-zkg/Makefile head/security/py-zkg/distinfo head/security/py-zkg/pkg-descr head/security/py-zkg/pkg-message (In reply to Shirkdog from comment #10) Pleasure, the changes have been committed! |
Created attachment 204091 [details] py-zeek-pkg shell archive The Bro Package Manager has been renamed to the Zeek Package Manager. The SVN diff in the bug includes the deprecation of the py-bro-pkg and the attached shell archive is for version 1.7.1 of the Zeek Package manager. Because everything will be renamed eventually, it is better to do this now and update the port in the process. The pkg-message file still mentions "bro-pkg" as the created python scripts still have not been updated. This will change at some point in the future and will be patched when upstream renames the python script to "zeek-pkg" Index: py-bro-pkg/Makefile =================================================================== --- py-bro-pkg/Makefile (revision 500354) +++ py-bro-pkg/Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME= bro-pkg DISTVERSIONPREFIX= v DISTVERSION= 1.4.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -18,6 +18,9 @@ ${PYTHON_PKGNAMEPREFIX}configparser>=0:devel/py-configparser@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}semantic_version>=0:devel/py-semantic_version@${PY_FLAVOR} +DEPRECATED= Bro package manager has been renamed to Zeek package manager +EXPIRATION_DATE= 2019-09-30 + USES= python USE_PYTHON= distutils autoplist concurrent