Re: The great find(1) cleanup
On Sun, Mar 22, 2020 at 02:08:12AM +0100, Christian Weisgerber wrote:
> - find ${PREFIX}/libexec/drush -name '*.orig' -exec rm {} +
> - find ${PREFIX}/libexec/drush -name '.git' -type d -exec rm -rf {} +
> + find ${PREFIX}/libexec/drush \
>
> + -name '*.orig' -exec rm {} + -o \
> + -name '.git' -type d -prune -exec rm -rf {} +
>
> Exercise question: Why didn't I use -delete for *.orig here?
-delete implies depth-first traversal which conflicts with what -prune
should do.
savannah MASTER_SITES refresh
- mirrors.zerg.biz is no more (points to 127.0.0.1), drop it. - savannah.c3sl.ufpr.br stopped their FTP service, fall back on ftp.cc.uoc.gr - ftp.twaren.net replies 403 errors when fetching with ftp(1) (it's an IIS server fwiw). Move to mirror.ossplanet.net which is also in .tw and supports https - move mirror.csclub.uwaterloo.ca and nongnu.askapache.com to https More info at http://download0.savannah.gnu.org/mirmon/savannah/ ok? Index: network.conf === RCS file: /d/cvs/ports/infrastructure/db/network.conf,v retrieving revision 1.16 diff -u -p -p -u -r1.16 network.conf --- network.conf12 Mar 2020 20:46:54 - 1.16 +++ network.conf22 Mar 2020 01:50:18 - @@ -124,12 +124,11 @@ MASTER_SITE_SAVANNAH+=\ https://download.savannah.nongnu.org/releases/ \ https://download-mirror.savannah.nongnu.org/releases/ \ https://ftp.cc.uoc.gr/mirrors/nongnu.org/ \ - http://ftp.twaren.net/Unix/NonGNU/ \ - http://mirror.csclub.uwaterloo.ca/nongnu/ \ - http://mirrors.zerg.biz/nongnu/ \ - http://nongnu.askapache.com/ \ + https://mirror.ossplanet.net/nongnu/ \ + https://mirror.csclub.uwaterloo.ca/nongnu/ \ + https://nongnu.askapache.com/ \ http://savannah.c3sl.ufpr.br/ \ - ftp://savannah.c3sl.ufpr.br/savannah-nongnu/ + ftp://ftp.cc.uoc.gr/mirrors/nongnu.org/ MASTER_SITE_AFTERSTEP+=\ ftp://ftp.afterstep.org/ \ -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2020/03/21 19:14:31 Modified files: x11/autocutsel : Makefile Log message: Move HOMEPAGE to https
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2020/03/21 19:11:00 Modified files: net/iodine : Makefile Log message: Move HOMEPAGE and MASTER_SITES to https
Re: The great find(1) cleanup
Klemens Nanni:
> > * Use the -delete operator to remove files and empty directories.
> > I'm ambivalent about this since it isn't POSIX, but people seem
> > to like it.
> All major find implementations have it, its faster and much less error
> prone;
Well...
I have a few more tweaks to existing users of {} + in my tree. One of
them is this:
- find ${PREFIX}/libexec/drush -name '*.orig' -exec rm {} +
- find ${PREFIX}/libexec/drush -name '.git' -type d -exec rm -rf {} +
+ find ${PREFIX}/libexec/drush \
+ -name '*.orig' -exec rm {} + -o \
+ -name '.git' -type d -prune -exec rm -rf {} +
Exercise question: Why didn't I use -delete for *.orig here?
--
Christian "naddy" Weisgerber na...@mips.inka.de
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2020/03/21 19:05:54 Modified files: x11/ratpoison : Makefile Log message: https HOMEPAGE
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2020/03/21 18:58:37 Modified files: devel/llvm : Makefile devel/llvm/pkg : PLIST-lldb PLIST-python Log message: Switch llvm to python3 While here: - adjust python scripts shebang lines - also byte-compile the .py files in the lldb subpackage. One file needs a brute-force conversion using 2to3 Tested in a bulk by ajacoutot@, prompted by and ok kn@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2020/03/21 18:57:51 Modified files: devel/llvm : Makefile devel/llvm/pkg : PLIST-main Log message: Drop gtest from RUN_DEPENDS The installed headers don't need it, except for a testsuite header not used by the ecosystem. Also drop two outdated PLIST lines from back when llvm tried to install libgtest.a Spotted while discussing the deps of the various subpackages with kn@ Tested in a bulk by ajacoutot@, ok kn@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/03/21 17:54:59 Modified files: www/webkitgtk4 : Tag: OPENBSD_6_6 Makefile Added files: www/webkitgtk4/patches: Tag: OPENBSD_6_6 patch-Source_WebCore_accessibility_AXObjectCache_cpp Log message: Merge security fix for CVE-2020-10018.
Firefox -current: hangouts screen sharing cause pledge(2) to kill the browser
Hi ports@ I switched to firefox recently, because with chromium, hangouts screen sharing doesn't work at all and I need it for work. While testing Firefox screen sharing in hangouts, pledge kills it with: "/bsd: firefox[43476]: pledge "", syscall 289" The syscall itself is shmget(2). Running hangouts with pledge disabled in firefox works fine (I can share the screen without problems). I tried to see how to solve the situation without disabling pledge. I modified the kernel to include shmget(2), shmat(2), shmctl(2) and shmdt(2) in the stdio set and now, screen sharing works. Regards. Andrea
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2020/03/21 16:42:42 Modified files: print/poppler : Makefile distinfo print/poppler/patches: patch-poppler_XRef_cc Log message: Update to poppler-0.86.1 Note: this does *not* contain the dynamic_cast -> static_cast chunk, because that would only hide a bug introduced somewhere else.
Re: Sympa's wwsympa Fails "Can't locate CGI/Fast.pm in @INC"
On Tue, 17 Mar 2020 11:25:35 +0100 Jeremie Courreges-Anglas wrote: > On Mon, Mar 16 2020, Ian McWilliam > wrote: > > You'll actually need to add CGI::Fast as a package as it is missing. > > > > pkg_add p5-CGI-Fast > > FastCGI is indeed optional in this release of sympa, later releases > make it mandatory[0]. The README already describes a FastCGI setup, > and I suspect most users use FastCGI for sp33d these days, so the port > could help the user a bit more. What about adding p5-CGI-Fast to > RUN_DEPENDS? > > I'll note that our sympa port is out of date, 6.2.16 vs 6.2.54, and > that it's probably affected by CVE-2018-1000550[1]. > > [0] > https://sympa-community.github.io/manual/upgrade/notes.html#from-versions-prior-to-6224 > [1] https://sympa-community.github.io/security/index.html > So I am still having the problem that I reported earlier, having fixed the original problem. But I've realized that the only relevant log that I can really find is in /var/www/logs/error.log. There is no association that I can find with any logs produced by sympa or wwsympa. What is additionally strange is that the password reset function partially works. I can enter in an email address for login, hit Reset Password and nothing will happen. But if simply attempt to login with an invalid password I am directly dropped into the password reset page. I can reset my password and receive the password reset email from Sympa. When I try to visit the link, it doesn't recognize it and simply reverts to the main page. In doing so it produces an error in /var/www/logs/error.log: >2020/03/21 14:30:35 [error] 85255#0: *24 kevent() reported that >connect() failed (61: Connection refused) while connecting to >upstream, client: 11.11.11.11, server: domain.com, >request: "GET /ticket/88026461536332 HTTP/2.0", upstream: >"fastcgi://[::1]:1026", host: "domain.com" I search for wwsympa errors and it appears clean of any error typed logs. Sympa is working normally with email as shown by the password reset emails and "help" tests. This doesnt look like an nginx issue, which I basically copied from the package maintainers readme. And there are very little to no changes that I could make to wwsympa. Its .fcgi is publicly r and x. Hopefully there is something I am missing. Thank you all.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2020/03/21 15:18:06 Modified files: x11/qt5/qtwebkit: Makefile Log message: Add missing python module. Spotted by aja
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/03/21 15:07:02 Modified files: x11/xscreensaver: Makefile distinfo x11/xscreensaver/pkg: PLIST Log message: update to xscreensaver-5.44
Re: Kernel relink and disable ulpt in kernel - cups printing
Hi, On Thu, Mar 19, 2020 at 08:08:10AM +0100, Antoine Jacoutot wrote: > > - How do you handle kernel modifications via config(8) with kernel > > relinking in a more automated way? > > $ cat /etc/rc.shutdown > printf 'disable ulpt\nq\n' | config -ef /bsd > sha256 /bsd >/var/db/kernel.SHA256 Neat, simple and straightforward. I like it, thanks Antoine. -- Regards, Mikolaj
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2020/03/21 13:48:55 Modified files: print/scribus/patches: patch-scribus_plugins_import_pdf_importpdf_cpp patch-scribus_plugins_import_pdf_slaoutput_cpp patch-scribus_plugins_import_pdf_slaoutput_h Added files: print/scribus/patches: patch-scribus_plugins_import_pdf_importpdf_h Log message: Let it build with upcoming poppler-0.86.x.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2020/03/21 13:44:46 Added files: editors/libreoffice/patches: patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_cxx Log message: Let it build with upcoming poppler-0.86.x. ok robert@ (maintainer)
Re: UPDATE: KDE Frameworks 5.68.0 and KDE5 19.12 and friends
On Sat Mar 21, 2020 at 08:21:11PM +0100, Antoine Jacoutot wrote:
> On Fri, Mar 20, 2020 at 03:58:18PM +0100, Rafael Sadowski wrote:
> > On Fri Mar 20, 2020 at 03:00:18PM +0100, Landry Breuil wrote:
> > > On Fri, Mar 20, 2020 at 01:47:48PM +0100, Rafael Sadowski wrote:
> > > > Hi ports@
> > > >
> > > > After that we reached a stable level with Qt5 5.13.2. We can update our
> > > > KDE5 universe to the latest stable version. The update diff is pretty
> > > > simple. Removed some workarounds like Qt5 5.13.2 and so one.
> > > >
> > > > It is still huge and this has the following reasons:
> > > >
> > > > - KF5Auth split into KF5Auth and KF5AuthCore, which ends in a lot of new
> > > > WANTLIBs
> > > > - Upstream changes the xdg path from share/examples/***/xdg/ to
> > > > share/qlogging-categories5/, which ends in a lot of PLIST chages.
> > >
> > > previously, those files were @sampled into ${SYSCONFDIR}/xdg, it isnt
> > > needed anymore ?
> >
> > ArchLinux don't do this anymore, so I've decided not to do that anymore.
>
> What a bizarre thing to base your decision on.
>
Based on my learnings from the last years maintaining KDE on OpenBSD.
ArchLinux do not modify the KDE installs process, so it's a good
reference for me.
> > > > - Upstream changes the xdg path from share/examples/***/xdg/ to
> > > > share/qlogging-categories5/, which ends in a lot of PLIST chages.
BTW, this only covers a few files!
Rafael
Re: UPDATE: KDE Frameworks 5.68.0 and KDE5 19.12 and friends
On Fri, Mar 20, 2020 at 03:58:18PM +0100, Rafael Sadowski wrote:
> On Fri Mar 20, 2020 at 03:00:18PM +0100, Landry Breuil wrote:
> > On Fri, Mar 20, 2020 at 01:47:48PM +0100, Rafael Sadowski wrote:
> > > Hi ports@
> > >
> > > After that we reached a stable level with Qt5 5.13.2. We can update our
> > > KDE5 universe to the latest stable version. The update diff is pretty
> > > simple. Removed some workarounds like Qt5 5.13.2 and so one.
> > >
> > > It is still huge and this has the following reasons:
> > >
> > > - KF5Auth split into KF5Auth and KF5AuthCore, which ends in a lot of new
> > > WANTLIBs
> > > - Upstream changes the xdg path from share/examples/***/xdg/ to
> > > share/qlogging-categories5/, which ends in a lot of PLIST chages.
> >
> > previously, those files were @sampled into ${SYSCONFDIR}/xdg, it isnt
> > needed anymore ?
>
> ArchLinux don't do this anymore, so I've decided not to do that anymore.
What a bizarre thing to base your decision on.
--
Antoine
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rob...@cvs.openbsd.org 2020/03/21 13:11:29 Modified files: editors/libreoffice: Makefile distinfo editors/libreoffice/patches: patch-vcl_qt5_Qt5Instance_cxx Added files: editors/libreoffice/patches: patch-oox_source_drawingml_diagram_diagramlayoutatoms_cxx Log message: update to 6.4.2.2
Re: UPDATE: libdvdread 6.0.2 / libdvdnav 6.0.1 / libdvdcss
On Sat, Mar 14, 2020 at 01:37:59AM -0400, Brad Smith wrote: > ping ping. Committed. Sorry for the wait. --Kurt
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2020/03/21 12:58:07 Modified files: converters/libdvdcss: Makefile converters/libdvdcss/patches: patch-src_css_c devel/libdvdread: Makefile distinfo multimedia/libdvdnav: Makefile distinfo multimedia/libdvdnav/patches: patch-misc_dvdnav_pc_in Added files: converters/libdvdcss/patches: patch-src_libdvdcss_c Log message: Update devel/libdvdread 6.0.1 -> 6.0.2 Update multimedia/libdvdnav 6.0.0 -> 6.0.1 Add patch to converters/libdvdcss to squelch potential buffer overflow warning. >From Brad Smith (maintainer)
Re: Maintainer update & move py-twitter to py3
Hi, > > the diff below updates py-twitter to the latest version and moves it > > to py3-only. Tested on amd64. > > > Thank you for this diff! I did not test it so far but I did notice two > things: > > 1. Instead of commenting out the IRC functionality you could opt for >another solution: There is a fork of python-irclib that adds Python 3 >support. Actually py-twitter refers to this fork [0]. Of course this >means that net/py-irclib will need some additional love; > 2. You need to add a @pkgpath- and @conflict-marker to PLIST Bjorn sent me a diff for updating py-irclib to the fork that supports python3 - thanks!. I will see if it works with py-twitter and come back with a revised diff... Daniel
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/03/21 12:32:33 Modified files: multimedia/minidlna: Makefile distinfo Log message: Update to the latest git commit.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2020/03/21 10:19:27 Modified files: audio/mumble : Makefile Added files: audio/mumble/patches: patch-src_SSL_cpp Log message: Fix/workaround TLS 1.3 support with libssl Input jb jsing
Re: Migrate ipython/py-ipykernel/py-jupyter_*/py-nbformat/py-traitlets to py3-only
On Thu, 19 Mar 2020, Bjorn Ketelaars wrote: > On Thu 19/03/2020 17:29, Paco Esteban wrote: > > The diff I sent for devel/ipython also removed the renaming of the > > binaries (so there's no more ipython-3, but ipython and all that). > > > > Should we do that ? > > Or leave it with the "-3" suffix ? > > I think your proposal is better. Enclosed a new diff which uses your > work on ipython. All build and install fine for me on amd64. About tests, all tests pass for those ports with the exceptions of: * devel/ipython Status: ERROR - 3 out of 7 test groups failed (core, lib, utils). * devel/py-jupyter_client jupyter_client/tests/test_multikernelmanager.py ...Segmentation fault This is the same as before the patches, so I guess it's ok. I also tried to test as much consumers as I could without finding any significant differences. This is expected, as there are no updates, just the py2 --> py3 move. Waiting for Edd's (maintainer) decision on the binary name change notification for users regarding ipython. A part from that, ok paco. Cheers, -- Paco Esteban. 0x5818130B8A6DBC03
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rob...@cvs.openbsd.org 2020/03/21 10:14:58 Modified files: meta/mate : Makefile x11/mate : Makefile.inc x11/mate/atril : Makefile distinfo x11/mate/atril/pkg: PLIST x11/mate/caja : Makefile distinfo x11/mate/caja/patches: patch-src_caja-application_c x11/mate/caja/pkg: PLIST x11/mate/caja-extensions: Makefile distinfo x11/mate/caja-extensions/pkg: PLIST x11/mate/calc : Makefile distinfo x11/mate/calc/pkg: PLIST x11/mate/control-center: Makefile distinfo x11/mate/control-center/pkg: PLIST x11/mate/desktop: Makefile distinfo x11/mate/desktop/pkg: PLIST x11/mate/engrampa: Makefile distinfo x11/mate/engrampa/pkg: PLIST x11/mate/eom : Makefile distinfo x11/mate/eom/pkg: PLIST x11/mate/icon-theme: Makefile distinfo x11/mate/icon-theme/pkg: PLIST x11/mate/libmatekbd: Makefile distinfo x11/mate/libmatekbd/pkg: PLIST x11/mate/libmatemixer: distinfo x11/mate/libmatemixer/pkg: PLIST x11/mate/libmateweather: Makefile distinfo x11/mate/libmateweather/pkg: PLIST x11/mate/marco : Makefile distinfo x11/mate/marco/pkg: PLIST x11/mate/media : Makefile distinfo x11/mate/menus : Makefile distinfo x11/mate/menus/pkg: PLIST x11/mate/notification-daemon: Makefile distinfo x11/mate/notification-daemon/pkg: PLIST x11/mate/panel : Makefile distinfo x11/mate/panel/pkg: PLIST x11/mate/pluma : Makefile distinfo x11/mate/pluma/pkg: PLIST x11/mate/polkit: Makefile distinfo x11/mate/polkit/pkg: PLIST x11/mate/power-manager: Makefile distinfo x11/mate/power-manager/pkg: PLIST x11/mate/screensaver: Makefile distinfo x11/mate/screensaver/patches: patch-data_lock-dialog-default_ui patch-data_mate-screensaver-preferences_desktop_in x11/mate/screensaver/pkg: PLIST x11/mate/session-manager: Makefile distinfo x11/mate/session-manager/pkg: PLIST x11/mate/settings-daemon: Makefile distinfo x11/mate/settings-daemon/pkg: PLIST x11/mate/system-monitor: Makefile distinfo x11/mate/system-monitor/pkg: PLIST x11/mate/terminal: Makefile distinfo x11/mate/terminal/pkg: PLIST x11/mate/themes: Makefile distinfo x11/mate/themes/pkg: PLIST x11/mate/utils : Makefile distinfo x11/mate/utils/pkg: PLIST Added files: x11/mate/caja/patches: patch-configure x11/mate/screensaver/patches: patch-src_mate-screensaver-preferences_c Log message: update to MATE 1.24
Re: UPDATE math/py-pandas-1.0.3
My bad looking at sqlports... OK mariani@ On Sat, Mar 21, 2020 at 12:32 PM Bjorn Ketelaars wrote: > > On Sat 21/03/2020 11:58, Elias M. Mariani wrote: > > This version has: > > python_requires=">=3.6.1" > > (1.0.1 had the same) > > > > If you are sure that this still works on py2 (which still has consumers): > > OK mariani@ > > I'm not sure that I understand you. > > pandas has dropped py2 support in >=0.25.0 [0]. To reflect this, our port > has dropped py2 support as well, and has been migrated to py3-only [1]. > So, I'm pretty sure that pandas does not work on py2. > > All consumers of py-pandas have been migrated to py3: > > $ show-reverse-deps math/py-pandas > databases/py-influxdb,python3 > graphics/py-seaborn > math/mlpack > math/mlpack,-main > math/mlpack,-python > math/mlpack,python3,-python > net/py-siphon,python3 > www/py-bokeh > > [0] https://github.com/pandas-dev/pandas/releases/tag/v0.25.0 > [1] > http://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/math/py-pandas/Makefile.diff?r1=1.10=1.11=h
Re: [UPDATE] ropper et filebytes
On Sat, Mar 21 2020, Bjorn Ketelaars wrote: > On Sat 21/03/2020 16:12, Remi Pointel wrote: >> On 2020-03-10 10:19, Jeremie Courreges-Anglas wrote: >> > On Mon, Mar 09 2020, Paco Esteban wrote: >> > > Hi Remi, >> > > >> > > On Sun, 08 Mar 2020, Remi Pointel wrote: >> > > >> > > > Hi, >> > > > >> > > > these are the diff to update filebytes and ropper to latest releases. >> > > > >> > > > Ok? >> > >> > LGTM and appears to work fine in my tests on amd64, ok jca@ >> > >> > > ropper has no consumers and filebytes only has ropper. I gess those are >> > > perfect candidates to go py3 only, don't you think ? >> > >> > It appears so indeed. >> > >> >> >> Hi, >> >> these are the diff to use Python 3 only. >> >> Ok? > > Is there a reason that you are not using @conflict markers in PLIST? Same question. Assuming there is no reason to avoid the conflict marker, please add @conflict py-pkgname-* to the PLIST of both ports, and don't forget to drop "SUBDIR += py-pkgname" from ../Makefile. With this, ok jca@ for the python3-only bits, I did not test the ropper update (you probably can get enough coverage without my simple tests). -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: Maintainer update & move py-twitter to py3
On Sat 21/03/2020 00:04, Daniel Winters wrote: > Dear all, > > the diff below updates py-twitter to the latest version and moves it > to py3-only. Tested on amd64. > > This is mostly interesting for the commandline tools and is has no > consumers. I commented out the IRC functionality as the py-irclib > library that is imported does not support python3 and has not been > updated in more than 10 years. I doubt the IRC functionality will be > missed. > > This will need a quirks entry which is not in the patch yet. > > Any comment or feedback is very welcome! > > Daniel Thank you for this diff! I did not test it so far but I did notice two things: 1. Instead of commenting out the IRC functionality you could opt for another solution: There is a fork of python-irclib that adds Python 3 support. Actually py-twitter refers to this fork [0]. Of course this means that net/py-irclib will need some additional love; 2. You need to add a @pkgpath- and @conflict-marker to PLIST [0] https://github.com/sixohsix/twitter/search?q=irclib_q=irclib
Re: [UPDATE] ropper et filebytes
On Sat 21/03/2020 16:12, Remi Pointel wrote: > On 2020-03-10 10:19, Jeremie Courreges-Anglas wrote: > > On Mon, Mar 09 2020, Paco Esteban wrote: > > > Hi Remi, > > > > > > On Sun, 08 Mar 2020, Remi Pointel wrote: > > > > > > > Hi, > > > > > > > > these are the diff to update filebytes and ropper to latest releases. > > > > > > > > Ok? > > > > LGTM and appears to work fine in my tests on amd64, ok jca@ > > > > > ropper has no consumers and filebytes only has ropper. I gess those are > > > perfect candidates to go py3 only, don't you think ? > > > > It appears so indeed. > > > > > Hi, > > these are the diff to use Python 3 only. > > Ok? Is there a reason that you are not using @conflict markers in PLIST?
Re: UPDATE math/py-pandas-1.0.3
On Sat 21/03/2020 11:58, Elias M. Mariani wrote: > This version has: > python_requires=">=3.6.1" > (1.0.1 had the same) > > If you are sure that this still works on py2 (which still has consumers): > OK mariani@ I'm not sure that I understand you. pandas has dropped py2 support in >=0.25.0 [0]. To reflect this, our port has dropped py2 support as well, and has been migrated to py3-only [1]. So, I'm pretty sure that pandas does not work on py2. All consumers of py-pandas have been migrated to py3: $ show-reverse-deps math/py-pandas databases/py-influxdb,python3 graphics/py-seaborn math/mlpack math/mlpack,-main math/mlpack,-python math/mlpack,python3,-python net/py-siphon,python3 www/py-bokeh [0] https://github.com/pandas-dev/pandas/releases/tag/v0.25.0 [1] http://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/math/py-pandas/Makefile.diff?r1=1.10=1.11=h
Re: [UPDATE] ropper et filebytes
On 2020-03-10 10:19, Jeremie Courreges-Anglas wrote:
On Mon, Mar 09 2020, Paco Esteban wrote:
Hi Remi,
On Sun, 08 Mar 2020, Remi Pointel wrote:
Hi,
these are the diff to update filebytes and ropper to latest releases.
Ok?
LGTM and appears to work fine in my tests on amd64, ok jca@
ropper has no consumers and filebytes only has ropper. I gess those are
perfect candidates to go py3 only, don't you think ?
It appears so indeed.
Hi,
these are the diff to use Python 3 only.
Ok?
Cheers,
Remi.
Index: Makefile
===
RCS file: /cvs/ports/devel/py-filebytes/Makefile,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 Makefile
--- Makefile 27 Sep 2019 05:46:30 - 1.7
+++ Makefile 21 Mar 2020 15:10:28 -
@@ -2,7 +2,7 @@
COMMENT = python module to read and write ELF, PE, MachO or OAT
-MODPY_EGG_VERSION = 0.9.21
+MODPY_EGG_VERSION = 0.10.2
DISTNAME = filebytes-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
@@ -20,6 +20,6 @@ MODPY_SETUPTOOLS = Yes
MODPY_PI = Yes
FLAVORS = python3
-FLAVOR ?=
+FLAVOR = python3
.include
Index: distinfo
===
RCS file: /cvs/ports/devel/py-filebytes/distinfo,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 distinfo
--- distinfo 27 Sep 2019 05:46:30 - 1.5
+++ distinfo 21 Mar 2020 15:10:28 -
@@ -1,2 +1,2 @@
-SHA256 (filebytes-0.9.21.tar.gz) = CeMG/q/UNeJAtsoi5jGc5Rhi2+meNIE2j8mi0V0iY9U=
-SIZE (filebytes-0.9.21.tar.gz) = 19174
+SHA256 (filebytes-0.10.2.tar.gz) = dkIC901551h/BLatRvfFBIXY8yxK7d0CIA8WUaCJJ0E=
+SIZE (filebytes-0.10.2.tar.gz) = 20358
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/py-filebytes/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 4 Apr 2018 19:00:45 - 1.1.1.1
+++ pkg/PLIST 21 Mar 2020 15:10:28 -
@@ -1,4 +1,5 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2018/04/04 19:00:45 rpointel Exp $
+@pkgpath devel/py-filebytes
lib/python${MODPY_VERSION}/site-packages/filebytes/
lib/python${MODPY_VERSION}/site-packages/filebytes-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
lib/python${MODPY_VERSION}/site-packages/filebytes-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
Index: Makefile
===
RCS file: /cvs/ports/security/py-ropper/Makefile,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 Makefile
--- Makefile 27 Sep 2019 05:48:12 - 1.6
+++ Makefile 21 Mar 2020 15:10:27 -
@@ -2,7 +2,7 @@
COMMENT = rop gadget finder and binary information tool
-MODPY_EGG_VERSION = 1.12.5
+MODPY_EGG_VERSION = 1.13.3
DISTNAME = ropper-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
@@ -24,10 +24,6 @@ RUN_DEPENDS = devel/py-filebytes${MODPY_
devel/keystone/python${MODPY_FLAVOR}
FLAVORS = python3
-FLAVOR ?=
-
-# permit installing py- and py3- on same machine
-post-install:
- mv ${PREFIX}/bin/ropper ${PREFIX}/bin/ropper${MODPY_BIN_SUFFIX}
+FLAVOR = python3
.include
Index: distinfo
===
RCS file: /cvs/ports/security/py-ropper/distinfo,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 distinfo
--- distinfo 27 Sep 2019 05:48:12 - 1.3
+++ distinfo 21 Mar 2020 15:10:27 -
@@ -1,2 +1,2 @@
-SHA256 (ropper-1.12.5.tar.gz) = DevhcizzVtgjyravsr632K1sZEFHl4wf9UpbNEicdBg=
-SIZE (ropper-1.12.5.tar.gz) = 68836
+SHA256 (ropper-1.13.3.tar.gz) = 38h0d8D1PT0oNqOEwQY3PXYcxDXq/Ed/KZUj5UBN2kM=
+SIZE (ropper-1.13.3.tar.gz) = 68927
Index: pkg/PLIST
===
RCS file: /cvs/ports/security/py-ropper/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 PLIST
--- pkg/PLIST 2 Jan 2019 06:33:17 - 1.2
+++ pkg/PLIST 21 Mar 2020 15:10:27 -
@@ -1,5 +1,6 @@
@comment $OpenBSD: PLIST,v 1.2 2019/01/02 06:33:17 rpointel Exp $
-bin/ropper${MODPY_BIN_SUFFIX}
+@pkgpath security/py-ropper
+bin/ropper
lib/python${MODPY_VERSION}/site-packages/ropper/
lib/python${MODPY_VERSION}/site-packages/ropper-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
lib/python${MODPY_VERSION}/site-packages/ropper-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
Index: Makefile
===
RCS file: /cvs/ports/devel/quirks/Makefile,v
retrieving revision 1.892
diff -u -p -u -p -r1.892 Makefile
--- Makefile 20 Mar 2020 14:46:47 - 1.892
+++ Makefile 21 Mar 2020 15:10:20 -
@@ -5,7 +5,7 @@ CATEGORIES = devel databases
DISTFILES =
# API.rev
-PKGNAME = quirks-3.283
+PKGNAME = quirks-3.284
PKG_ARCH = *
MAINTAINER = Marc Espie
Index: files/Quirks.pm
===
RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
retrieving revision 1.910
diff -u -p -u -p -r1.910 Quirks.pm
--- files/Quirks.pm 20 Mar 2020 14:46:47 - 1.910
Re: UPDATE math/py-pandas-1.0.3
This version has:
python_requires=">=3.6.1"
(1.0.1 had the same)
If you are sure that this still works on py2 (which still has consumers):
OK mariani@
Cheers.
Elias.
On Sat, Mar 21, 2020 at 9:08 AM Bjorn Ketelaars wrote:
>
> Diff below brings py-pandas to 1.0.3, which includes some regression
> fixes and bug fixes. Release notes:
> https://pandas.pydata.org/docs/whatsnew/index.html#release
>
> Tarball does not include all files required for the test suite, as such
> numerous tests fail:
>
> 1.0.1 (currently in ports):
> = 429 failed, 59284 passed, 3479 skipped, 541 xfailed, 5 xpassed, 82
> warnings, 153 error in 4398.30 seconds =
>
> 1.0.3:
> = 435 failed, 59854 passed, 3516 skipped, 559 xfailed, 7 xpassed, 79
> warnings, 153 error in 4301.79 seconds =
>
> Run tested on amd64.
>
> Comments/OK?
>
>
> diff --git Makefile Makefile
> index c51371e4af4..0cf845c5220 100644
> --- Makefile
> +++ Makefile
> @@ -2,7 +2,7 @@
>
> COMMENT = data analysis and manipulation library
>
> -MODPY_EGG_VERSION =1.0.1
> +MODPY_EGG_VERSION =1.0.3
> DISTNAME = pandas-${MODPY_EGG_VERSION}
> PKGNAME = py-${DISTNAME}
>
> diff --git distinfo distinfo
> index ecc217ae441..d7693c18d97 100644
> --- distinfo
> +++ distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (pandas-1.0.1.tar.gz) = PAd2UwjwkdgbZzXU8iQrtDwzLMNGHK5gVD32sQln/ic=
> -SIZE (pandas-1.0.1.tar.gz) = 4852368
> +SHA256 (pandas-1.0.3.tar.gz) = MvQuMi+5A9DhiaTBC3W6cNkJWMxPZqF4HtAn8aHRRYY=
> +SIZE (pandas-1.0.3.tar.gz) = 5003497
> diff --git pkg/PLIST pkg/PLIST
> index 1c5c7fb..cfd6254b9dc 100644
> --- pkg/PLIST
> +++ pkg/PLIST
> @@ -615,6 +615,7 @@
> lib/python${MODPY_VERSION}/site-packages/pandas/tests/arrays/categorical/${MODPY
>
> lib/python${MODPY_VERSION}/site-packages/pandas/tests/arrays/categorical/${MODPY_PYCACHE}test_indexing.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/pandas/tests/arrays/categorical/${MODPY_PYCACHE}test_missing.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/pandas/tests/arrays/categorical/${MODPY_PYCACHE}test_operators.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/pandas/tests/arrays/categorical/${MODPY_PYCACHE}test_replace.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/pandas/tests/arrays/categorical/${MODPY_PYCACHE}test_repr.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/pandas/tests/arrays/categorical/${MODPY_PYCACHE}test_sorting.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/pandas/tests/arrays/categorical/${MODPY_PYCACHE}test_subclass.${MODPY_PYC_MAGIC_TAG}pyc
> @@ -629,6 +630,7 @@
> lib/python${MODPY_VERSION}/site-packages/pandas/tests/arrays/categorical/test_dt
>
> lib/python${MODPY_VERSION}/site-packages/pandas/tests/arrays/categorical/test_indexing.py
>
> lib/python${MODPY_VERSION}/site-packages/pandas/tests/arrays/categorical/test_missing.py
>
> lib/python${MODPY_VERSION}/site-packages/pandas/tests/arrays/categorical/test_operators.py
> +lib/python${MODPY_VERSION}/site-packages/pandas/tests/arrays/categorical/test_replace.py
>
> lib/python${MODPY_VERSION}/site-packages/pandas/tests/arrays/categorical/test_repr.py
>
> lib/python${MODPY_VERSION}/site-packages/pandas/tests/arrays/categorical/test_sorting.py
>
> lib/python${MODPY_VERSION}/site-packages/pandas/tests/arrays/categorical/test_subclass.py
> @@ -1038,6 +1040,7 @@
> lib/python${MODPY_VERSION}/site-packages/pandas/tests/indexes/datetimes/${MODPY_
>
> lib/python${MODPY_VERSION}/site-packages/pandas/tests/indexes/datetimes/${MODPY_PYCACHE}test_datetimelike.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/pandas/tests/indexes/datetimes/${MODPY_PYCACHE}test_formats.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/pandas/tests/indexes/datetimes/${MODPY_PYCACHE}test_indexing.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/pandas/tests/indexes/datetimes/${MODPY_PYCACHE}test_join.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/pandas/tests/indexes/datetimes/${MODPY_PYCACHE}test_misc.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/pandas/tests/indexes/datetimes/${MODPY_PYCACHE}test_missing.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/pandas/tests/indexes/datetimes/${MODPY_PYCACHE}test_ops.${MODPY_PYC_MAGIC_TAG}pyc
> @@ -1054,6 +1057,7 @@
> lib/python${MODPY_VERSION}/site-packages/pandas/tests/indexes/datetimes/test_dat
>
> lib/python${MODPY_VERSION}/site-packages/pandas/tests/indexes/datetimes/test_datetimelike.py
>
> lib/python${MODPY_VERSION}/site-packages/pandas/tests/indexes/datetimes/test_formats.py
>
> lib/python${MODPY_VERSION}/site-packages/pandas/tests/indexes/datetimes/test_indexing.py
> +lib/python${MODPY_VERSION}/site-packages/pandas/tests/indexes/datetimes/test_join.py
>
>
Re: pkg/PLIST automation
Hi Martin,
Martin wrote on Sat, Mar 21, 2020 at 06:07:57AM +:
> make fake -> make update-plist successfully generates PLIST but
>
> make package and make install produce an error:
>
> make: don't know how to make /usr/ports/packages/.tgz
> (prerequisite of: /usr/ports/packages/amd64/all/uhd-3.15.0.0p0)
It is hard to judge what exactly went wrong without seeing your
Makefile.
You are supposed to follow thw documentation (e.g. bsd.port.mk(5))
and also use it for debugging. If you can't find your mistake by
looking at the documentation, you can try looking at the code -
in this case /usr/ports/infrastructure/mk/bsd.port.mk - to find
out where exactly things break, then deduce from that what your
error might be and go back to the documentation how the specific
thing(s) that broke for you are supposed to be used correctly.
If you can't find your own mistake and ask for the help of others
to find them, you are supposed to provide complete information.
It is hard to find your error without seeing your Makefile.
Here is an example of how i might proceed to debug the message above
if the documentation wouldn't help me (assuming you did not
set MULTI_PACKAGES):
- search for "\.tgz" -> line 965
so ${FULLPKGNAME${_S}} seems to be empty
- without MULTI_PACKAGES, _S is "-"
(leaving it as an exercise why that is so)
- line 636: FULLPKGNAME- is set to ${FULLPKGNAME}
- line 611: FULLPKGNAME is set to ${PKGNAME}${FLAVOR_EXT}
So try to find out whether in your Makefile, you fiddled with
variables like PKGNAME or FULLPKGNAME in an invalid manner.
While reading bsd.port.mk, you can also use commands like
make show=FULLPKGNAME-
make show=FULLPKGNAME
make show=PKGNAME
to inspect various variables that file is using, to debug your Makefile.
I find it hard to be more specific given the amount of information
you provided.
If you did try to use MULTI_PACKAGES, first try to get it to work
without that, then add MULTI_PACKAGES once everything works without it.
Yours,
Ingo
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rob...@cvs.openbsd.org 2020/03/21 08:08:01 Modified files: www/chromium : Makefile distinfo www/chromium/patches: patch-build_config_compiler_BUILD_gn patch-chrome_browser_about_flags_cc patch-v8_BUILD_gn patch-v8_src_api_api_cc patch-v8_src_diagnostics_perf-jit_cc patch-v8_src_diagnostics_perf-jit_h patch-v8_src_trap-handler_trap-handler_h www/chromium/pkg: PFRAG.component PLIST Removed files: www/chromium/patches: patch-third_party_closure_compiler_js_binary_py patch-v8_src_common_globals_h Log message: update to 80.0.3987.149 and apply the following changes: - re-enable pointer compression (it is not the cause of crashes) - use system harfbuzz and freetype - add a debug package for the component flavor so that backtraces are useful - remove the dependency on java by disabling the closure compiler and other UI "optimizations" using javascript
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/03/21 07:51:45 Modified files: print/cups-filters: Makefile distinfo Removed files: print/cups-filters/patches: patch-filter_foomatic-rip_pdf_c Log message: Update to cups-filters-1.27.3.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/03/21 07:51:12 Modified files: net/py-boto3 : Makefile distinfo Log message: Update to py-boto3-1.12.26.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/03/21 07:51:27 Modified files: sysutils/awscli: Makefile distinfo Log message: Update to awscli-1.18.26.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/03/21 07:50:59 Modified files: net/py-botocore: Makefile distinfo Log message: Update to py-botocore-1.15.26.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/03/21 07:40:45 Modified files: devel/pangomm : Makefile distinfo devel/pangomm/pkg: PLIST Log message: Update to pangomm-2.42.1.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/03/21 07:39:24 Modified files: mail/gmime30 : Makefile distinfo Log message: Update to gmime30-3.2.7.
Re: Migrate ipython/py-ipykernel/py-jupyter_*/py-nbformat/py-traitlets to py3-only
On Thu, 19 Mar 2020, Edd Barrett wrote: > On Thu, Mar 19, 2020 at 05:29:17PM +0100, Paco Esteban wrote: > > The diff I sent for devel/ipython also removed the renaming of the > > binaries (so there's no more ipython-3, but ipython and all that). > > > > Should we do that ? > > Or leave it with the "-3" suffix ? > > I wonder if we should make ipython-3 a symlink to ipython? > > At least tell users about the change, either as a MESSAGE or in > current.html? I leave that decision to you as maintainer. I'm not a user of ipython myself, so I don't really care. Just let us know so we can include it on a diff if necessary. I hope to finish this endless testing this weekend ... Cheers, -- Paco Esteban. 0x5818130B8A6DBC03
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: p...@cvs.openbsd.org2020/03/21 06:48:36 Modified files: www/hugo : Makefile distinfo Log message: update www/hugo to latest versio 0.68.0 Changes for this release: * Some minify configuration adjustments * Add minify config * Allow headless bundles to list pages via $page.Pages and $page.RegularPages * Update to Go 1.14.1 and 1.13.9 * Pass directory name to filters in LstatIfPossible in the same way as Readdir * Update to goldmark 1.1.25. * Add workaround for regular CSS imports in SCSS * Add .RegularPagesRecursive * Add data context to the key in ExecuteAsTemplate * Improve Tailwind/PostCSS error messages * Update Blackfriday * Add languageDirection to language configuration * Fix Go build version * Fix GetTerms nil pointer * Fix scss vs css import regexp * Fix --templateMetricsHints * Try to fix a Go 1.15 go vet error ok jca@
Re: package-specs(7) and alpha releases
On Sat, Mar 21 2020, Rafael Sadowski wrote:
[...]
> Thanks Jeremie, tested with the diff qtwebkit diff below.
Thanks for testing. It's nice that you want to use the support for
"alpha" releases right now, but I wouldn't delay your qtwebkit update
for this reason.
> From /var/log/messages
> Mar 21 11:55:33 kubus pkg_add: Added qtwebkit-5.212.0p0->5.212.0-alpha4
[...]
> This diff disable dwz for now.
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/x11/qt5/qtwebkit/Makefile,v
> retrieving revision 1.20
> diff -u -p -u -p -r1.20 Makefile
> --- Makefile 20 Mar 2020 16:44:29 - 1.20
> +++ Makefile 21 Mar 2020 10:56:39 -
> @@ -9,15 +9,13 @@ CATEGORIES =www
> DPB_PROPERTIES = parallel
>
> VERSION =${QT5_WEBKIT_VERSION}
> -DISTNAME = qtwebkit-${QT5_WEBKIT_VERSION}-alpha3
> -PKGNAME =qtwebkit-${QT5_WEBKIT_VERSION}
> -REVISION = 0
> +DISTNAME = qtwebkit-${QT5_WEBKIT_VERSION}-alpha4
1. (pointed out by Landry earlier) the suffix should be right after the
version, ie:
DISTNAME = qtwebkit-${QT5_WEBKIT_VERSION}-alpha4
PKGNAME = qtwebkit-${QT5_WEBKIT_VERSION}alpha4
2. with explicit support for "alpha" in the pkg_* tools,
qtwebkit-5.212.0alpha4 (your update) < qtwebkit-5.212.0p0 (-current)
If you want to be benefit from support for "alpha" right now, you should
use EPOCH so that your qtwebkit update actually appears newer.
Else, you could keep using your "new alpha release -> REVISION bump"
scheme until upstream bumps to qtwebkit-5.212.1 or qtwebkit-5.213.0 etc.
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
UPDATE math/py-pandas-1.0.3
Diff below brings py-pandas to 1.0.3, which includes some regression
fixes and bug fixes. Release notes:
https://pandas.pydata.org/docs/whatsnew/index.html#release
Tarball does not include all files required for the test suite, as such
numerous tests fail:
1.0.1 (currently in ports):
= 429 failed, 59284 passed, 3479 skipped, 541 xfailed, 5 xpassed, 82 warnings,
153 error in 4398.30 seconds =
1.0.3:
= 435 failed, 59854 passed, 3516 skipped, 559 xfailed, 7 xpassed, 79 warnings,
153 error in 4301.79 seconds =
Run tested on amd64.
Comments/OK?
diff --git Makefile Makefile
index c51371e4af4..0cf845c5220 100644
--- Makefile
+++ Makefile
@@ -2,7 +2,7 @@
COMMENT = data analysis and manipulation library
-MODPY_EGG_VERSION =1.0.1
+MODPY_EGG_VERSION =1.0.3
DISTNAME = pandas-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
diff --git distinfo distinfo
index ecc217ae441..d7693c18d97 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (pandas-1.0.1.tar.gz) = PAd2UwjwkdgbZzXU8iQrtDwzLMNGHK5gVD32sQln/ic=
-SIZE (pandas-1.0.1.tar.gz) = 4852368
+SHA256 (pandas-1.0.3.tar.gz) = MvQuMi+5A9DhiaTBC3W6cNkJWMxPZqF4HtAn8aHRRYY=
+SIZE (pandas-1.0.3.tar.gz) = 5003497
diff --git pkg/PLIST pkg/PLIST
index 1c5c7fb..cfd6254b9dc 100644
--- pkg/PLIST
+++ pkg/PLIST
@@ -615,6 +615,7 @@
lib/python${MODPY_VERSION}/site-packages/pandas/tests/arrays/categorical/${MODPY
lib/python${MODPY_VERSION}/site-packages/pandas/tests/arrays/categorical/${MODPY_PYCACHE}test_indexing.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/pandas/tests/arrays/categorical/${MODPY_PYCACHE}test_missing.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/pandas/tests/arrays/categorical/${MODPY_PYCACHE}test_operators.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pandas/tests/arrays/categorical/${MODPY_PYCACHE}test_replace.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/pandas/tests/arrays/categorical/${MODPY_PYCACHE}test_repr.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/pandas/tests/arrays/categorical/${MODPY_PYCACHE}test_sorting.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/pandas/tests/arrays/categorical/${MODPY_PYCACHE}test_subclass.${MODPY_PYC_MAGIC_TAG}pyc
@@ -629,6 +630,7 @@
lib/python${MODPY_VERSION}/site-packages/pandas/tests/arrays/categorical/test_dt
lib/python${MODPY_VERSION}/site-packages/pandas/tests/arrays/categorical/test_indexing.py
lib/python${MODPY_VERSION}/site-packages/pandas/tests/arrays/categorical/test_missing.py
lib/python${MODPY_VERSION}/site-packages/pandas/tests/arrays/categorical/test_operators.py
+lib/python${MODPY_VERSION}/site-packages/pandas/tests/arrays/categorical/test_replace.py
lib/python${MODPY_VERSION}/site-packages/pandas/tests/arrays/categorical/test_repr.py
lib/python${MODPY_VERSION}/site-packages/pandas/tests/arrays/categorical/test_sorting.py
lib/python${MODPY_VERSION}/site-packages/pandas/tests/arrays/categorical/test_subclass.py
@@ -1038,6 +1040,7 @@
lib/python${MODPY_VERSION}/site-packages/pandas/tests/indexes/datetimes/${MODPY_
lib/python${MODPY_VERSION}/site-packages/pandas/tests/indexes/datetimes/${MODPY_PYCACHE}test_datetimelike.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/pandas/tests/indexes/datetimes/${MODPY_PYCACHE}test_formats.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/pandas/tests/indexes/datetimes/${MODPY_PYCACHE}test_indexing.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pandas/tests/indexes/datetimes/${MODPY_PYCACHE}test_join.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/pandas/tests/indexes/datetimes/${MODPY_PYCACHE}test_misc.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/pandas/tests/indexes/datetimes/${MODPY_PYCACHE}test_missing.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/pandas/tests/indexes/datetimes/${MODPY_PYCACHE}test_ops.${MODPY_PYC_MAGIC_TAG}pyc
@@ -1054,6 +1057,7 @@
lib/python${MODPY_VERSION}/site-packages/pandas/tests/indexes/datetimes/test_dat
lib/python${MODPY_VERSION}/site-packages/pandas/tests/indexes/datetimes/test_datetimelike.py
lib/python${MODPY_VERSION}/site-packages/pandas/tests/indexes/datetimes/test_formats.py
lib/python${MODPY_VERSION}/site-packages/pandas/tests/indexes/datetimes/test_indexing.py
+lib/python${MODPY_VERSION}/site-packages/pandas/tests/indexes/datetimes/test_join.py
lib/python${MODPY_VERSION}/site-packages/pandas/tests/indexes/datetimes/test_misc.py
lib/python${MODPY_VERSION}/site-packages/pandas/tests/indexes/datetimes/test_missing.py
lib/python${MODPY_VERSION}/site-packages/pandas/tests/indexes/datetimes/test_ops.py
@@ -1191,6 +1195,7 @@
lib/python${MODPY_VERSION}/site-packages/pandas/tests/indexes/timedeltas/${MODPY
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2020/03/21 05:07:38 Modified files: converters/rpm2cpio: Makefile converters/rpm2cpio/files: rpm2cpio converters/rpm2cpio/pkg: DESCR Log message: Update to rpm2cpio 1.4 It is now a thin shell script wrapper around bsdtar. OK sthen
Re: rpm2cpio: update to 1.4, sync with FreeBSD
On 2020/03/21 10:59, Klemens Nanni wrote:
> Upstream has been using a tiny shell script wrapper around bsdtar for
> years now.
>
> sysutils/mdprint extracts just fine as before.
>
> OK?
>
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/converters/rpm2cpio/Makefile,v
> retrieving revision 1.16
> diff -u -p -r1.16 Makefile
> --- Makefile 12 Jul 2019 20:43:52 - 1.16
> +++ Makefile 21 Mar 2020 09:46:15 -
> @@ -1,27 +1,21 @@
> # $OpenBSD: Makefile,v 1.16 2019/07/12 20:43:52 sthen Exp $
>
> -COMMENT= rpm2cpio converter in Perl
> +COMMENT= Convert .rpm files to cpio format
Please lowercase Convert.
The other ports in the tree using this to extract are still OK,
and the ones that use it at runtime should see no difference as
the command-line interface is unchanged.
OK.
>
> -DISTNAME=rpm2cpio-1.3
> +DISTNAME=rpm2cpio-1.4
> CATEGORIES= converters archivers
>
> -REVISION=2
> -
> -HOMEPAGE=http://www.freebsd.org/cgi/cvsweb.cgi/ports/archivers/rpm2cpio/
> +HOMEPAGE=https://svnweb.freebsd.org/ports/archivers/rpm2cpio/
>
> # BSD
> PERMIT_PACKAGE= Yes
>
> DISTFILES= # empty
>
> -RUN_DEPENDS= archivers/bzip2 \
> - archivers/xz
> +RUN_DEPENDS= archivers/libarchive>2.8
>
> -# don't extract, don't build. Install the script directly
> -EXTRACT_ONLY=# empty
> NO_BUILD=Yes
> NO_TEST= Yes
> -PKG_ARCH=*
>
> do-install:
> ${INSTALL_SCRIPT} ${FILESDIR}/rpm2cpio ${PREFIX}/bin
> Index: files/rpm2cpio
> ===
> RCS file: /cvs/ports/converters/rpm2cpio/files/rpm2cpio,v
> retrieving revision 1.2
> diff -u -p -r1.2 rpm2cpio
> --- files/rpm2cpio22 Aug 2010 17:55:38 - 1.2
> +++ files/rpm2cpio21 Mar 2020 09:57:56 -
> @@ -1,98 +1,15 @@
> -#!/usr/bin/perl -w
> +#!/bin/sh
>
> -# Copyright (C) 1997,1998,1999, Roger Espel Llima
> -# Copyright (C) 2000, Sergey Babkin
> -# Copyright (C) 2009, Alex Kozlov
> -#
> -# Permission is hereby granted, free of charge, to any person obtaining a
> copy
> -# of this software and any associated documentation files (the "Software"),
> to
> -# deal in the Software without restriction, including without limitation the
> -# rights to use, copy, modify, merge, publish, distribute, sublicense,
> -# and/or sell copies of the Software, and to permit persons to whom the
> -# Software is furnished to do so, subject to the following conditions:
> -#
> -# The above copyright notice and this permission notice shall be included in
> -# all copies or substantial portions of the Software.
> -#
> -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
> -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
> THE
> -# SOFTWARE'S COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
> -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
> FROM,
> -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
> -# THE SOFTWARE
> +# NB! needs bsdtar/libarchive v2.8+
>
> -# (whew, that's done!)
> +if [ $# -eq 0 -a ! -t 0 ]; then
> + f=/dev/stdin
> +elif [ $# -eq 1 ]; then
> + f=$1
> +else
> + echo Usage: rpm2cpio [file.rpm]
> + echo dumps the contents to stdout as a GNU cpio archive
> + exit 0
> +fi
>
> -# why does the world need another rpm2cpio? because the existing one
> -# won't build unless you have half a ton of things that aren't really
> -# required for it, since it uses the same library used to extract RPM's.
> -# in particular, it won't build on the HPsUX box i'm on.
> -
> -use strict;
> -
> -my ($f, $rpm, $filter) = ();
> -
> -if ($#ARGV == -1) {
> - $f = "STDIN";
> -} elsif ($#ARGV == 0) {
> - open($f, "< $ARGV[0]") or die "Can't read file $ARGV[0]\n";
> -} else {
> - print "rpm2cpio v1.3, perl version by orabidoo\n";
> - print "use: rpm2cpio [file.rpm]\n";
> - print "dumps the contents to stdout as a GNU cpio archive\n";
> - exit 0;
> -}
> -
> -read $f, $rpm, 96;
> -
> -my ($magic, $major, undef) = unpack("NCC", $rpm);
> -
> -die "Not an RPM\n" if $magic != 0xedabeedb;
> -die "Not a version 3 or 4 RPM\n" if $major != 3 and $major != 4;
> -
> -read $f, $rpm, 16 or die "No header\n";
> -while(1) {
> - ($magic, undef, my $sections, my $bytes) = unpack("N4", $rpm);
> - my ($smagic, $smagic2) = unpack("nN", $rpm);
> -
> - #printf(STDERR "0x%x 0x%x 0x%x 0x%x 0x%x\n",
> - # tell($f)-16, $magic, $sections, $bytes, $smagic);
> -
> - if ($smagic == 0x1f8b) {
> - $filter = "gzip -cd";
> - last;
> - }
> - # BZh
> - if ($smagic == 0x425a and ($smagic2 & 0xff00) == 0x6800) {
> - $filter = "bzip2 -cd";
> - last;
> - }
> - # 0xFD, '7zXZ', 0x0
>
Re: package-specs(7) and alpha releases
On Sat Mar 21, 2020 at 02:57:39AM +0100, Jeremie Courreges-Anglas wrote:
> On Fri, Mar 20 2020, Marc Espie wrote:
> > On Fri, Mar 20, 2020 at 05:16:12PM +, Stuart Henderson wrote:
> >> On 2020/03/20 17:41, Jeremie Courreges-Anglas wrote:
> >> > >> only rc[N], beta[N], pre[N], and pl[N]. Would it makes sense to add a
> >> > >> alpha[N]? We could of course also use EPOCH here.
> >> > >
> >> > > adding support for alpha[N] would be in suffix_compare in
> >> > > PackageName.pm
> >> > > (and from_string), but that would only work (afaik) if the suffix was
> >> > > directly near the version, ie 5.13.2alpha3 (not 5.13.2-alpha3).
> >> >
> >> > I suspect that the lack of support for alpha[N] is intentional, as in
> >> > "You should not put alpha-quality software in the ports tree."
> >>
> >> Yes, I think so too.
> >>
> >> > The current situation is that we have ports using alpha releases in the
> >> > tree, and I see no reason to arbitrarily draw a line between alpha and
> >> > beta releases.
> >> > Diff below, not tested much yet. Thoughts?
> >>
> >> I agree with adding it.
> >>
> >> It wants to go in /usr/src/regress/usr.sbin/pkg_add/check-name and
> >> packages-specs(7) too,
>
> Bah, I should have mentioned that the diff was not intended as complete.
> Thanks for the pointers, I did not find other places to tweak.
>
> www/faq/ports/guide.html says:
>
> "* Do not use alpha or beta code when preparing a port. Use the latest
> regular or patch release."
>
> but I don't think it needs changing.
>
> >> and I think anything currently using "alpha" will
> >> need an EPOCH bump.
>
> Hmm this indeed raises a point... I'm not sure why they would need an
> EPOCH bump. The packages contents won't change, only the way the
> pkg_* tools handle them, right?
>
> There are three affected ports:
>
> ritchie ~$ sqlite3 /usr/local/share/sqlports 'select fullpkgpath, fullpkgname
> from ports where fullpkgname like "%alpha%";'
> archivers/libmspack|libmspack-0.10.1alphav1
> lang/squeak/funsqueak|squeak-funsqueak-3.10alpha7
> net/py-tlslite-ng,python3|py3-tlslite-ng-0.8.0alpha37p1
>
> - the version of funsqueak hasn't changed since import
> - net/py-tlslite-ng has been imported weeks ago and has had no version
> bump
> - the last update of archivers/libmspack came with an EPOCH bump so
> I don't see how its version could be considered lower than any
> previous version available in the tree
>
> Even though I can't find a reason for adding/bumping EPOCH in those
> ports, I'll do it anyway to resolve any concern, unless I hear
> objections.
>
> > Definitely wants tests.
>
> The diff below:
> - implements the changes as pointed by landry@
> - documents "alpha" in packages-specs(7)
> - adds "alpha" to the tests in regress/usr.sbin/pkg_add/check-name, as
> suggested by sthen@; ''make pkgnames'' still succeeds
>
> ok?
>
Thanks Jeremie, tested with the diff qtwebkit diff below.
>From /var/log/messages
Mar 21 11:55:33 kubus pkg_add: Added qtwebkit-5.212.0p0->5.212.0-alpha4
>
> Index: usr.sbin/pkg_add/OpenBSD/PackageName.pm
> ===
> RCS file: /d/cvs/src/usr.sbin/pkg_add/OpenBSD/PackageName.pm,v
> retrieving revision 1.53
> diff -u -p -r1.53 PackageName.pm
> --- usr.sbin/pkg_add/OpenBSD/PackageName.pm 7 Nov 2019 15:35:23 -
> 1.53
> +++ usr.sbin/pkg_add/OpenBSD/PackageName.pm 21 Mar 2020 01:47:15 -
> @@ -153,7 +153,7 @@ sub from_string
> my ($class, $string) = @_;
> my $o = bless { deweys => [ split(/\./o, $string) ],
> suffix => '', suffix_value => 0}, $class;
> - if ($o->{deweys}->[-1] =~ m/^(\d+)(rc|beta|pre|pl)(\d*)$/) {
> + if ($o->{deweys}->[-1] =~ m/^(\d+)(rc|alpha|beta|pre|pl)(\d*)$/) {
> $o->{deweys}->[-1] = $1;
> $o->{suffix} = $2;
> $o->{suffix_value} = $3;
> @@ -193,10 +193,13 @@ sub suffix_compare
> if ($a->{suffix} gt $b->{suffix}) {
> return -suffix_compare($b, $a);
> }
> - # order is '', beta, pre, rc
> + # order is '', alpha, beta, pre, rc
> # we know that a < b,
> if ($a->{suffix} eq '') {
> return 1;
> + }
> + if ($a->{suffix} eq 'alpha') {
> + return -1;
> }
> if ($a->{suffix} eq 'beta') {
> return -1;
> Index: regress/usr.sbin/pkg_add/check-name
> ===
> RCS file: /d/cvs/src/regress/usr.sbin/pkg_add/check-name,v
> retrieving revision 1.11
> diff -u -p -r1.11 check-name
> --- regress/usr.sbin/pkg_add/check-name 27 Jan 2010 15:41:58 -
> 1.11
> +++ regress/usr.sbin/pkg_add/check-name 21 Mar 2020 01:47:15 -
> @@ -119,5 +119,5 @@ ok(check_list(["correct order is pNvM"],
> "mixed up vp");
> ok(check_list([], check_name("pkgname-1.0p0v0")), "correct name");
>
> -ok(check_order(qw(speex-1.2beta3 speex-1.2rc1 speex-1.2 speex-1.2pl1
>
rpm2cpio: update to 1.4, sync with FreeBSD
Upstream has been using a tiny shell script wrapper around bsdtar for
years now.
sysutils/mdprint extracts just fine as before.
OK?
Index: Makefile
===
RCS file: /cvs/ports/converters/rpm2cpio/Makefile,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile
--- Makefile12 Jul 2019 20:43:52 - 1.16
+++ Makefile21 Mar 2020 09:46:15 -
@@ -1,27 +1,21 @@
# $OpenBSD: Makefile,v 1.16 2019/07/12 20:43:52 sthen Exp $
-COMMENT= rpm2cpio converter in Perl
+COMMENT= Convert .rpm files to cpio format
-DISTNAME= rpm2cpio-1.3
+DISTNAME= rpm2cpio-1.4
CATEGORIES=converters archivers
-REVISION= 2
-
-HOMEPAGE= http://www.freebsd.org/cgi/cvsweb.cgi/ports/archivers/rpm2cpio/
+HOMEPAGE= https://svnweb.freebsd.org/ports/archivers/rpm2cpio/
# BSD
PERMIT_PACKAGE=Yes
DISTFILES= # empty
-RUN_DEPENDS= archivers/bzip2 \
- archivers/xz
+RUN_DEPENDS= archivers/libarchive>2.8
-# don't extract, don't build. Install the script directly
-EXTRACT_ONLY= # empty
NO_BUILD= Yes
NO_TEST= Yes
-PKG_ARCH= *
do-install:
${INSTALL_SCRIPT} ${FILESDIR}/rpm2cpio ${PREFIX}/bin
Index: files/rpm2cpio
===
RCS file: /cvs/ports/converters/rpm2cpio/files/rpm2cpio,v
retrieving revision 1.2
diff -u -p -r1.2 rpm2cpio
--- files/rpm2cpio 22 Aug 2010 17:55:38 - 1.2
+++ files/rpm2cpio 21 Mar 2020 09:57:56 -
@@ -1,98 +1,15 @@
-#!/usr/bin/perl -w
+#!/bin/sh
-# Copyright (C) 1997,1998,1999, Roger Espel Llima
-# Copyright (C) 2000, Sergey Babkin
-# Copyright (C) 2009, Alex Kozlov
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and any associated documentation files (the "Software"), to
-# deal in the Software without restriction, including without limitation the
-# rights to use, copy, modify, merge, publish, distribute, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# SOFTWARE'S COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE
+# NB! needs bsdtar/libarchive v2.8+
-# (whew, that's done!)
+if [ $# -eq 0 -a ! -t 0 ]; then
+ f=/dev/stdin
+elif [ $# -eq 1 ]; then
+ f=$1
+else
+ echo Usage: rpm2cpio [file.rpm]
+ echo dumps the contents to stdout as a GNU cpio archive
+ exit 0
+fi
-# why does the world need another rpm2cpio? because the existing one
-# won't build unless you have half a ton of things that aren't really
-# required for it, since it uses the same library used to extract RPM's.
-# in particular, it won't build on the HPsUX box i'm on.
-
-use strict;
-
-my ($f, $rpm, $filter) = ();
-
-if ($#ARGV == -1) {
- $f = "STDIN";
-} elsif ($#ARGV == 0) {
- open($f, "< $ARGV[0]") or die "Can't read file $ARGV[0]\n";
-} else {
- print "rpm2cpio v1.3, perl version by orabidoo\n";
- print "use: rpm2cpio [file.rpm]\n";
- print "dumps the contents to stdout as a GNU cpio archive\n";
- exit 0;
-}
-
-read $f, $rpm, 96;
-
-my ($magic, $major, undef) = unpack("NCC", $rpm);
-
-die "Not an RPM\n" if $magic != 0xedabeedb;
-die "Not a version 3 or 4 RPM\n" if $major != 3 and $major != 4;
-
-read $f, $rpm, 16 or die "No header\n";
-while(1) {
- ($magic, undef, my $sections, my $bytes) = unpack("N4", $rpm);
- my ($smagic, $smagic2) = unpack("nN", $rpm);
-
- #printf(STDERR "0x%x 0x%x 0x%x 0x%x 0x%x\n",
- # tell($f)-16, $magic, $sections, $bytes, $smagic);
-
- if ($smagic == 0x1f8b) {
- $filter = "gzip -cd";
- last;
- }
- # BZh
- if ($smagic == 0x425a and ($smagic2 & 0xff00) == 0x6800) {
- $filter = "bzip2 -cd";
- last;
- }
- # 0xFD, '7zXZ', 0x0
- if ($smagic == 0xfd37 and $smagic2 == 0x7a585a00) {
- $filter = "xz -cd";
- last;
- }
- # assume lzma if there is no sig
- if ($magic != 0x8eade801) {
- $filter = "lzma -cd";
- last;
- }
-
- # skip the headers
- seek $f, 16 * $sections + $bytes, 1 or die "File is too small\n";
- do {
- read $f, $rpm, 1 or die "No header\n" ;
-
Re: package-specs(7) and alpha releases
Oh, forget what I said about EPOCH, I figured out why is not needed now :-)
--
Sent from a phone, apologies for poor formatting.
On 21 March 2020 02:00:31 Jeremie Courreges-Anglas wrote:
On Fri, Mar 20 2020, Marc Espie wrote:
On Fri, Mar 20, 2020 at 05:16:12PM +, Stuart Henderson wrote:
On 2020/03/20 17:41, Jeremie Courreges-Anglas wrote:
only rc[N], beta[N], pre[N], and pl[N]. Would it makes sense to add a
alpha[N]? We could of course also use EPOCH here.
adding support for alpha[N] would be in suffix_compare in PackageName.pm
(and from_string), but that would only work (afaik) if the suffix was
directly near the version, ie 5.13.2alpha3 (not 5.13.2-alpha3).
I suspect that the lack of support for alpha[N] is intentional, as in
"You should not put alpha-quality software in the ports tree."
Yes, I think so too.
The current situation is that we have ports using alpha releases in the
tree, and I see no reason to arbitrarily draw a line between alpha and
beta releases.
Diff below, not tested much yet. Thoughts?
I agree with adding it.
It wants to go in /usr/src/regress/usr.sbin/pkg_add/check-name and
packages-specs(7) too,
Bah, I should have mentioned that the diff was not intended as complete.
Thanks for the pointers, I did not find other places to tweak.
www/faq/ports/guide.html says:
"* Do not use alpha or beta code when preparing a port. Use the latest
regular or patch release."
but I don't think it needs changing.
and I think anything currently using "alpha" will
need an EPOCH bump.
Hmm this indeed raises a point... I'm not sure why they would need an
EPOCH bump. The packages contents won't change, only the way the
pkg_* tools handle them, right?
There are three affected ports:
ritchie ~$ sqlite3 /usr/local/share/sqlports 'select fullpkgpath,
fullpkgname from ports where fullpkgname like "%alpha%";'
archivers/libmspack|libmspack-0.10.1alphav1
lang/squeak/funsqueak|squeak-funsqueak-3.10alpha7
net/py-tlslite-ng,python3|py3-tlslite-ng-0.8.0alpha37p1
- the version of funsqueak hasn't changed since import
- net/py-tlslite-ng has been imported weeks ago and has had no version
bump
- the last update of archivers/libmspack came with an EPOCH bump so
I don't see how its version could be considered lower than any
previous version available in the tree
Even though I can't find a reason for adding/bumping EPOCH in those
ports, I'll do it anyway to resolve any concern, unless I hear
objections.
Definitely wants tests.
The diff below:
- implements the changes as pointed by landry@
- documents "alpha" in packages-specs(7)
- adds "alpha" to the tests in regress/usr.sbin/pkg_add/check-name, as
suggested by sthen@; ''make pkgnames'' still succeeds
ok?
Index: usr.sbin/pkg_add/OpenBSD/PackageName.pm
===
RCS file: /d/cvs/src/usr.sbin/pkg_add/OpenBSD/PackageName.pm,v
retrieving revision 1.53
diff -u -p -r1.53 PackageName.pm
--- usr.sbin/pkg_add/OpenBSD/PackageName.pm 7 Nov 2019 15:35:23 - 1.53
+++ usr.sbin/pkg_add/OpenBSD/PackageName.pm 21 Mar 2020 01:47:15 -
@@ -153,7 +153,7 @@ sub from_string
my ($class, $string) = @_;
my $o = bless { deweys => [ split(/\./o, $string) ],
suffix => '', suffix_value => 0}, $class;
- if ($o->{deweys}->[-1] =~ m/^(\d+)(rc|beta|pre|pl)(\d*)$/) {
+ if ($o->{deweys}->[-1] =~ m/^(\d+)(rc|alpha|beta|pre|pl)(\d*)$/) {
$o->{deweys}->[-1] = $1;
$o->{suffix} = $2;
$o->{suffix_value} = $3;
@@ -193,10 +193,13 @@ sub suffix_compare
if ($a->{suffix} gt $b->{suffix}) {
return -suffix_compare($b, $a);
}
- # order is '', beta, pre, rc
+ # order is '', alpha, beta, pre, rc
# we know that a < b,
if ($a->{suffix} eq '') {
return 1;
+ }
+ if ($a->{suffix} eq 'alpha') {
+ return -1;
}
if ($a->{suffix} eq 'beta') {
return -1;
Index: regress/usr.sbin/pkg_add/check-name
===
RCS file: /d/cvs/src/regress/usr.sbin/pkg_add/check-name,v
retrieving revision 1.11
diff -u -p -r1.11 check-name
--- regress/usr.sbin/pkg_add/check-name 27 Jan 2010 15:41:58 - 1.11
+++ regress/usr.sbin/pkg_add/check-name 21 Mar 2020 01:47:15 -
@@ -119,5 +119,5 @@ ok(check_list(["correct order is pNvM"],
"mixed up vp");
ok(check_list([], check_name("pkgname-1.0p0v0")), "correct name");
-ok(check_order(qw(speex-1.2beta3 speex-1.2rc1 speex-1.2 speex-1.2pl1
-speex-1.3beta1)), 'check order');
+ok(check_order(qw(speex-1.2alpha3 speex-1.2beta3 speex-1.2rc1 speex-1.2
+speex-1.2pl1 speex-1.3beta1)), 'check order');
Index: share/man/man7/packages-specs.7
===
RCS file: /d/cvs/src/share/man/man7/packages-specs.7,v
retrieving revision 1.25
diff -u -p -r1.25 packages-specs.7
--- share/man/man7/packages-specs.7 27 Oct 2014 22:45:30 - 1.25
+++ share/man/man7/packages-specs.7 21 Mar 2020 01:47:15 -
@@ -109,6 +109,7 @@ Other parts are compared alphabetically.
.It
The last
UPDATE: cad/qcad
This is a result of debugging qt5-cups. Starts fine and feels usable on
amd64. Any consumers around?
Index: Makefile
===
RCS file: /cvs/ports/cad/qcad/Makefile,v
retrieving revision 1.36
diff -u -p -u -p -r1.36 Makefile
--- Makefile7 Mar 2020 17:35:00 - 1.36
+++ Makefile21 Mar 2020 09:22:40 -
@@ -4,10 +4,9 @@ COMMENT = Qt-based 2D CAD system
GH_ACCOUNT = qcad
GH_PROJECT = qcad
-GH_TAGNAME = v3.23.0.0
-REVISION = 1
+GH_TAGNAME = v3.24.3.0
-SO_VERSION = 0.0
+SO_VERSION = 1.0
QCAD_LIBS =qcadcore \
qcadecmaapi \
qcadentity \
@@ -22,6 +21,17 @@ QCAD_LIBS = qcadcore \
.for _lib in ${QCAD_LIBS}
SHARED_LIBS += ${_lib} ${SO_VERSION}
.endfor
+
+SHARED_LIBS += qtscript_core 0.0 # 1.0
+SHARED_LIBS += qtscript_gui 0.0 # 1.0
+SHARED_LIBS += qtscript_network 0.0 # 1.0
+SHARED_LIBS += qtscript_opengl 0.0 # 1.0
+SHARED_LIBS += qtscript_printsupport 0.0 # 1.0
+SHARED_LIBS += qtscript_sql 0.0 # 1.0
+SHARED_LIBS += qtscript_uitools 0.0 # 1.0
+SHARED_LIBS += qtscript_widgets 0.0 # 1.0
+SHARED_LIBS += qtscript_xml 0.0 # 1.0
+SHARED_LIBS += qtscript_xmlpatterns 0.0 # 1.0
CATEGORIES = cad graphics
Index: distinfo
===
RCS file: /cvs/ports/cad/qcad/distinfo,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 distinfo
--- distinfo14 Aug 2019 06:56:50 - 1.7
+++ distinfo21 Mar 2020 09:22:40 -
@@ -1,2 +1,2 @@
-SHA256 (qcad-3.23.0.0.tar.gz) = QuNmoKEpMPMYIc+23TKPiKceG4z8tzSlGtDqqLjqJws=
-SIZE (qcad-3.23.0.0.tar.gz) = 33296984
+SHA256 (qcad-3.24.3.0.tar.gz) = A1JZf9QfaKQ8+qrFsWufK9Dn2x12mGPJMXDeZMgEv3c=
+SIZE (qcad-3.24.3.0.tar.gz) = 33874174
Index: patches/patch-scripts_Help_About_About_js
===
RCS file: /cvs/ports/cad/qcad/patches/patch-scripts_Help_About_About_js,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-scripts_Help_About_About_js
--- patches/patch-scripts_Help_About_About_js 14 Aug 2019 06:56:50 -
1.1
+++ patches/patch-scripts_Help_About_About_js 21 Mar 2020 09:22:40 -
@@ -3,9 +3,9 @@ $OpenBSD: patch-scripts_Help_About_About
Index: scripts/Help/About/About.js
--- scripts/Help/About/About.js.orig
+++ scripts/Help/About/About.js
-@@ -451,6 +451,9 @@ About.prototype.initAboutSystem = function(textEdit) {
- if (RS.getSystemId()==="linux") {
- text += "Linux";
+@@ -467,6 +467,9 @@ About.prototype.initAboutSystem = function(textEdit) {
+ if (RS.getSystemId()==="solaris") {
+ text += "Solaris";
}
+if (RS.getSystemId()==="openbsd") {
+text += "OpenBSD";
Index: patches/patch-scripts_Widgets_CommandLine_CommandLine_js
===
RCS file:
/cvs/ports/cad/qcad/patches/patch-scripts_Widgets_CommandLine_CommandLine_js,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-scripts_Widgets_CommandLine_CommandLine_js
--- patches/patch-scripts_Widgets_CommandLine_CommandLine_js14 Aug 2019
06:56:50 - 1.1
+++ patches/patch-scripts_Widgets_CommandLine_CommandLine_js21 Mar 2020
09:22:40 -
@@ -3,9 +3,9 @@ $OpenBSD: patch-scripts_Widgets_CommandL
Index: scripts/Widgets/CommandLine/CommandLine.js
--- scripts/Widgets/CommandLine/CommandLine.js.orig
+++ scripts/Widgets/CommandLine/CommandLine.js
-@@ -478,6 +478,9 @@ CommandLine.init = function(basePath) {
- case "linux":
- system = "Linux";
+@@ -490,6 +490,9 @@ CommandLine.init = function(basePath) {
+ case "solaris":
+ system = "Solaris";
break;
+case "openbsd":
+system = "OpenBSD";
Index: patches/patch-src_core_RSPlatform_cpp
===
RCS file: patches/patch-src_core_RSPlatform_cpp
diff -N patches/patch-src_core_RSPlatform_cpp
--- patches/patch-src_core_RSPlatform_cpp 14 Aug 2019 06:56:50 -
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,32 +0,0 @@
-$OpenBSD: patch-src_core_RSPlatform_cpp,v 1.1 2019/08/14 06:56:50 feinerer Exp
$
-
-Index: src/core/RSPlatform.cpp
src/core/RSPlatform.cpp.orig
-+++ src/core/RSPlatform.cpp
-@@ -43,7 +43,7 @@
- QString RS::getHostId() {
- return QString("%1_%2")
- .arg(getSystemId())
--#if defined(Q_OS_LINUX)
-+#if defined(Q_OS_LINUX) || defined(Q_OS_OPENBSD)
- .arg(getenv("HOSTNAME"));
- #elif defined(Q_OS_MAC)
- // environment variable HOSTNAME not exported on OS X by default:
-@@ -56,7 +56,7 @@ QString RS::getHostId() {
- }
-
- /**
-- * \return Unique system ID ("linux", "osx", "win").
-+ * \return Unique system ID ("linux", "osx", "win", "openbsd").
- */
- QString RS::getSystemId() {
- #if defined(Q_OS_LINUX)
-@@ -65,6 +65,8 @@ QString RS::getSystemId()
Re: ports: pkg_add as root
On Sat, Mar 21, 2020 at 02:26:26PM +0530, putridsou...@gmail.com wrote: > I'm have never tried the ports system before. > I have read through the faq and the man pages, > but I get stuck at building dependencies. > I follow through the fetch,checksum steps and then > for 'make prepare' as local user, > I'm greeted with following message. > This is for the 'rsnapshot' package > > ===> Building package for rsync-3.1.3 > Create /usr/ports/packages/amd64/all/rsync-3.1.3.tgz > Creating package rsync-3.1.3 > Link to /usr/ports/packages/amd64/ftp/rsync-3.1.3.tgz > ===> Cleaning for rsync-3.1.3 > ===> Verifying specs: c > ===> found c.95.1 > ===> Installing rsync-3.1.3 from /usr/ports/packages/amd64/all/ > pkg_add: pkg_add must be run as root > *** Error 1 in /usr/ports/net/rsync > (/usr/ports/infrastructure/mk/bsd.port.mk:2028 > '/var/db/pkg/rsync-3.1.3/+CONTENTS': @/usr/bin/env -i PKG...) > *** Error 1 in /usr/ports/net/rsync > (/usr/ports/infrastructure/mk/bsd.port.mk:2451 'install') > *** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2135 > '/usr/ports/pobj/rsnapshot-1.4.2/.dep-net-rsync') > *** Error 1 in /usr/ports/net/rsnapshot > (/usr/ports/infrastructure/mk/bsd.port.mk:2451 'prepare') > > I have successfully installed programs > with no dependencies using command > 'doas make install' as the final step, > after fetch,patch,gen,configure,etc. > Is this the right way? > > Why doesn't a make install command as a local user > while in 'net/rsnapshot' call doas on it's own? > you should instruct ports infrastructure how to gain root's privileges. Else it will just try "as it" (and fail if run as normal user). as you are using doas(1), you should add SUDO = doas in your /etc/mk.conf file. And after that, running "make install" (as user), will automatically invoke pkg_add(8) with doas(1). So you don't have to run "doas make install", but only "make install". you could see mk.conf(5) and bsd.port.mk(5) man pages for more details. Thanks. -- Sebastien Marie
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2020/03/21 03:13:51 Modified files: sysutils : Makefile Log message: + mdprint
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2020/03/21 03:12:37 Log message: Import mdprint Feedback OK jca mdprint prints the contents of the provided binary sun4v MD file. If no file is provided, the "guest MD" is read from the device file "/dev/mdesc" which is expected to be present on all sun4v guest domains. If no file is provided and the -P/--PRI option is used, the PRI (physical resource inventory) MD is read from the device file "/devices/pseudo/ds_pri@0:ds_pri" (Solaris only). The complete PRI is only available on the "primary" domain. Status: Vendor Tag: kn Release Tags: kn_20200321 N ports/sysutils/mdprint/Makefile N ports/sysutils/mdprint/distinfo N ports/sysutils/mdprint/pkg/DESCR N ports/sysutils/mdprint/pkg/PLIST N ports/sysutils/mdprint/patches/patch-tools_mdprint_mdprint_py No conflicts created by this import
ports: pkg_add as root
I'm have never tried the ports system before. I have read through the faq and the man pages, but I get stuck at building dependencies. I follow through the fetch,checksum steps and then for 'make prepare' as local user, I'm greeted with following message. This is for the 'rsnapshot' package ===> Building package for rsync-3.1.3 Create /usr/ports/packages/amd64/all/rsync-3.1.3.tgz Creating package rsync-3.1.3 Link to /usr/ports/packages/amd64/ftp/rsync-3.1.3.tgz ===> Cleaning for rsync-3.1.3 ===> Verifying specs: c ===> found c.95.1 ===> Installing rsync-3.1.3 from /usr/ports/packages/amd64/all/ pkg_add: pkg_add must be run as root *** Error 1 in /usr/ports/net/rsync (/usr/ports/infrastructure/mk/bsd.port.mk:2028 '/var/db/pkg/rsync-3.1.3/+CONTENTS': @/usr/bin/env -i PKG...) *** Error 1 in /usr/ports/net/rsync (/usr/ports/infrastructure/mk/bsd.port.mk:2451 'install') *** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2135 '/usr/ports/pobj/rsnapshot-1.4.2/.dep-net-rsync') *** Error 1 in /usr/ports/net/rsnapshot (/usr/ports/infrastructure/mk/bsd.port.mk:2451 'prepare') I have successfully installed programs with no dependencies using command 'doas make install' as the final step, after fetch,patch,gen,configure,etc. Is this the right way? Why doesn't a make install command as a local user while in 'net/rsnapshot' call doas on it's own?
Re: cmake builds with debuginfo
On Sat, Mar 21, 2020 at 08:06:21AM +0100, Rafael Sadowski wrote: > Hi ports! > > Landry said "iirc so far cmake failed to provide useful debugging syms, > so i dont see the point ofadding DEBUG_PACKAGES if they're not helpful." > > That's probably because we're building a "Release" type and not a > release with debug informations (RelWithDebInfo). > > I have not tested it any further but maybe this is a good starting > point. sadly, it's been discussed/tried before, and things arent that simple. Iirc cmake strips binaries directly unless RelWithDebInfo is passed, but some cmake consumers try to detect RelWithDebInfo and do different things if so (see for example https://github.com/qgis/QGIS/blob/master/CMakeLists.txt#L600) and thus that provides different binaries to the ones with Release. With qgis i know the packages/binaries were way larger. so either one would have to go through each cmake consumer to patch out this (ugh) or we stay with Release, and twist cmake's arm behind its back to avoid stripping binaries, letting this job to the existing ports infra triggered by DEBUG_PACKAGES. Landry
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sema...@cvs.openbsd.org 2020/03/21 02:09:44 Modified files: www/zola : Makefile distinfo Added files: www/zola/patches: patch-modcargo-crates_rustls-native-certs-0_1_0_Cargo_toml patch-modcargo-crates_rustls-native-certs-0_1_0_src_lib_rs Log message: update www/zola to 0.10.0 from maintainer Peter Ezetta with some modification by me to copte with devel/cargo update
cmake builds with debuginfo
Hi ports!
Landry said "iirc so far cmake failed to provide useful debugging syms,
so i dont see the point ofadding DEBUG_PACKAGES if they're not helpful."
That's probably because we're building a "Release" type and not a
release with debug informations (RelWithDebInfo).
I have not tested it any further but maybe this is a good starting
point.
Rafael
Index: cmake.port.mk
===
RCS file: /cvs/ports/devel/cmake/cmake.port.mk,v
retrieving revision 1.65
diff -u -p -r1.65 cmake.port.mk
--- cmake.port.mk 21 Aug 2019 05:47:40 - 1.65
+++ cmake.port.mk 21 Mar 2020 06:57:51 -
@@ -85,8 +85,8 @@ MODCMAKE_configure= cd ${WRKBUILD} && ${
CONFIGURE_ARGS += -DCMAKE_BUILD_TYPE=Debug
MODCMAKE_BUILD_SUFFIX =-debug.cmake
. else
-CONFIGURE_ARGS += -DCMAKE_BUILD_TYPE=Release
-MODCMAKE_BUILD_SUFFIX =-release.cmake
+CONFIGURE_ARGS += -DCMAKE_BUILD_TYPE=RelWithDebInfo
+MODCMAKE_BUILD_SUFFIX =-RelWithDebInfo.cmake
. endif
.endif
SUBST_VARS += MODCMAKE_BUILD_SUFFIX
Re: editors/libreoffice and poppler-0.86
Hi Sure thing! On 21/03/20 00:01 +0100, Matthias Kilian wrote: > Hi, > > whatever I do about the type insanities in poppler-glib pointed out > by Greg, this one will be required to build libreoffice against > poppler-0.86.x in any case. > > ok? > > Ciao, > Kili > > Index: patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_cxx > === > RCS file: patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_cxx > diff -N patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_cxx > --- /dev/null 1 Jan 1970 00:00:00 - > +++ patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_cxx > 20 Mar 2020 22:55:12 - > @@ -0,0 +1,18 @@ > +$OpenBSD$ > + > +Fix with poppler-0.86.x. > + > +Index: sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx > +--- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx.orig > sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx > +@@ -563,7 +563,9 @@ void PDFOutDev::processLink(Link* link, Catalog*) > + if (!(pAction && pAction->getKind() == actionURI)) > + return; > + > +-#if POPPLER_CHECK_VERSION(0, 72, 0) > ++#if POPPLER_CHECK_VERSION(0, 86, 0) > ++const char* pURI = static_cast(pAction)->getURI().c_str(); > ++#elif POPPLER_CHECK_VERSION(0, 72, 0) > + const char* pURI = static_cast(pAction)->getURI()->c_str(); > + #else > + const char* pURI = > static_cast(pAction)->getURI()->getCString(); -- Regards, Robert Nagy
Re: pkg/PLIST automation
make fake -> make update-plist successfully generates PLIST but make package and make install produce an error: make: don't know how to make /usr/ports/packages/.tgz (prerequisite of: /usr/ports/packages/amd64/all/uhd-3.15.0.0p0) Stop in: *** Error 2 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2472 '_internal-package') *** Error 1 in /usr/ports/comms/uhd (/usr/ports/infrastructure/mk/bsd.port.mk:2451 'package') Where to find a problem? Martin ‐‐‐ Original Message ‐‐‐ On Friday, March 20, 2020 4:05 PM, Ingo Schwarze wrote: > Hi Martin, > > Martin wrote on Fri, Mar 20, 2020 at 03:59:42PM +: > > > Any automation suggestions for pkg/PLIST create for a new port? > > Read all of: > > https://www.openbsd.org/faq/ports/guide.html#PortsChecklist > > In this case, the answer to your question is in step 22. > > make update-plist > > Yours, > Ingo
