Re: [M. UPDATE] net/qbittorrent 4.1.3 -> 4.1.4
"Elias M. Mariani" wrote: > Changelog: > https://www.qbittorrent.org/news.php > > Small diff attached. > Tested on amd64 without problems (both qbittorrent and qbittorrent-nox). > > A small tweak on the README for qbittorrent-nox, now is needed to > specify a locale to have text on the interface... > > Cheers. > Elias. works well for me on amd64 (x11/nox) ok solene@
Re: UPDATE: textproc/ripgrep-0.10.0 (with request for help)
On Sun, Nov 25, 2018 at 06:49:43AM -0600, Edward Lopez-Acosta wrote: > Hi Sebastien, > > Thank you for the tips. some nits > I think the CONFIGURE_STYLE removal was simply an oversight on my part. no problem. > I regened the list of crates using the method you noted (which was > quite handy, and there were a lot of changes), you removed tabs and inserted spaces. it is why there is still lot of changes. > and removed WANTLIB since this > version removes pledge for the time being. well, only the comment should be removed, not WANTLIB :) see bsd.port.mk(5) man page, specially 'port-lib-depends-check' entry. $ make port-lib-depends-check ... > I am still interested in where this gets applied if it gets added for > a revision. I will look to re-add it later. Having some example code in Rust is a good thing. > New diff attached using a tip (on another port) from Stuart Henderson. It > should hopefully be easier to apply now. I used `git diff --relative .` in > the port directory rather than from /usr/ports and specifying the port. > > All tests pass and builds/runs fine on amd64. > > Thank you. > > Edward Lopez-Acosta > Thanks. -- Sebastien Marie
Re: update: multimedia/py-pafy
On Sun, Nov 25, 2018 at 03:37:36PM -0500, Daniel Jakots wrote:
> On Sun, 18 Nov 2018 14:53:57 +0100, Sebastien Marie
> wrote:
>
> Thanks, committed with a few improvements:
>
> > Index: pkg/PLIST
> > ===
> > RCS file: /cvs/ports/multimedia/py-pafy/pkg/PLIST,v
> > retrieving revision 1.3
> > diff -u -p -r1.3 PLIST
> > --- pkg/PLIST 23 May 2017 11:11:16 - 1.3
> > +++ pkg/PLIST 18 Nov 2018 11:34:29 -
> > @@ -8,20 +8,23 @@ lib/python${MODPY_VERSION}/site-packages
> >
> > lib/python${MODPY_VERSION}/site-packages/pafy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
> >
> > lib/python${MODPY_VERSION}/site-packages/pafy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
> > lib/python${MODPY_VERSION}/site-packages/pafy/__init__.py
> > -lib/python${MODPY_VERSION}/site-packages/pafy/__init__.pyc
> > +${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pafy/${MODPY_PYCACHE}/
>
> In py3, this is a noop. It's only useful in py2 + py3 ports so I
> removed it.
yes. but I wasn't sure if for consistency it should be here or not :)
I am fine without it.
> I also removed the HOMEPAGE as it's dead and I added the needed quirks
> as the pkgname changes.
Oops. I totally forgot about the pkgname change the switch to py3 only
introduced. Thanks to have take care of that.
--
Sebastien Marie
UPDATE security/polarssl
Diff below brings mbedtls to 2.14.0, which brings some new features, and
fixes some security issues and bugs. Details can be found at
https://tls.mbed.org/tech-updates/releases/mbedtls-2.14.0-2.7.7-and-2.1.16-released
Major number of the three shared libs have been bumped as symbols have
been removed (and a couple of new ones have been added).
'make test' runs successfully on amd64, and I have seen no complaints
from its consumers.
OK?
Index: Makefile
===
RCS file: /cvs/ports/security/polarssl/Makefile,v
retrieving revision 1.24
diff -u -p -r1.24 Makefile
--- Makefile8 Oct 2018 11:58:07 - 1.24
+++ Makefile26 Nov 2018 06:09:04 -
@@ -2,13 +2,13 @@
COMMENT= SSL library with an intuitive API and readable source code
-DISTNAME= mbedtls-2.13.0
+DISTNAME= mbedtls-2.14.0
EXTRACT_SUFX= -gpl.tgz
# check SOVERSION
-SHARED_LIBS += mbedtls 5.0 # 12
-SHARED_LIBS += mbedcrypto3.0 # 3
-SHARED_LIBS += mbedx509 2.0 # 0
+SHARED_LIBS += mbedtls 6.0 # 12
+SHARED_LIBS += mbedcrypto4.0 # 3
+SHARED_LIBS += mbedx509 3.0 # 0
CATEGORIES=security
Index: distinfo
===
RCS file: /cvs/ports/security/polarssl/distinfo,v
retrieving revision 1.16
diff -u -p -r1.16 distinfo
--- distinfo2 Oct 2018 15:13:04 - 1.16
+++ distinfo26 Nov 2018 06:09:04 -
@@ -1,2 +1,2 @@
-SHA256 (mbedtls-2.13.0-gpl.tgz) = oI3fCKrlX8T0j7xigfywi8XFPtU//RU1XuDXXsMrU64=
-SIZE (mbedtls-2.13.0-gpl.tgz) = 2419726
+SHA256 (mbedtls-2.14.0-gpl.tgz) = fGLsAqV348ygHujNFh4eNpU3cUoUjvqv55iHudlVppE=
+SIZE (mbedtls-2.14.0-gpl.tgz) = 2471418
Index: patches/patch-CMakeLists_txt
===
RCS file: /cvs/ports/security/polarssl/patches/patch-CMakeLists_txt,v
retrieving revision 1.7
diff -u -p -r1.7 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt2 Oct 2018 15:13:04 - 1.7
+++ patches/patch-CMakeLists_txt26 Nov 2018 06:09:04 -
@@ -2,7 +2,7 @@ $OpenBSD: patch-CMakeLists_txt,v 1.7 201
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
-@@ -108,8 +108,6 @@ if(CMAKE_COMPILER_IS_GNU)
+@@ -125,8 +125,6 @@ if(CMAKE_COMPILER_IS_GNU)
if (GCC_VERSION VERSION_GREATER 4.8 OR GCC_VERSION VERSION_EQUAL 4.8)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wshadow")
endif()
@@ -11,7 +11,7 @@ Index: CMakeLists.txt
set(CMAKE_C_FLAGS_COVERAGE"-O0 -g3 --coverage")
set(CMAKE_C_FLAGS_ASAN"-Werror -fsanitize=address -fno-common
-O3")
set(CMAKE_C_FLAGS_ASANDBG "-Werror -fsanitize=address -fno-common -O1
-g3 -fno-omit-frame-pointer -fno-optimize-sibling-calls ")
-@@ -119,8 +117,6 @@ endif(CMAKE_COMPILER_IS_GNU)
+@@ -136,8 +134,6 @@ endif(CMAKE_COMPILER_IS_GNU)
if(CMAKE_COMPILER_IS_CLANG)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -W
-Wdeclaration-after-statement -Wwrite-strings -Wpointer-arith
-Wimplicit-fallthrough -Wshadow")
Index: patches/patch-include_mbedtls_config_h
===
RCS file: /cvs/ports/security/polarssl/patches/patch-include_mbedtls_config_h,v
retrieving revision 1.6
diff -u -p -r1.6 patch-include_mbedtls_config_h
--- patches/patch-include_mbedtls_config_h 8 Aug 2018 12:51:09 -
1.6
+++ patches/patch-include_mbedtls_config_h 26 Nov 2018 06:09:04 -
@@ -6,7 +6,7 @@ www/hiawatha.
Index: include/mbedtls/config.h
--- include/mbedtls/config.h.orig
+++ include/mbedtls/config.h
-@@ -1549,7 +1549,7 @@
+@@ -1582,7 +1582,7 @@
*
* Uncomment this to enable pthread mutexes.
*/
@@ -15,7 +15,7 @@ Index: include/mbedtls/config.h
/**
* \def MBEDTLS_VERSION_FEATURES
-@@ -2739,7 +2739,7 @@
+@@ -2774,7 +2774,7 @@
*
* Enable this layer to allow use of mutexes within mbed TLS
*/
qt4 file not found
Ran into this while building some ports. ===> Checking files for qt4-4.8.7 >> Fetch https://download.qt.io/official_releases/qt/4.8/4.8.7/qt-everywhere-opensour ce-src-4.8.7.tar.gz ftp: Error retrieving file: 404 Not Found >> Fetch https://ftp.openbsd.org/pub/OpenBSD/distfiles/qt-everywhere-opensource-src-4 .8.7.tar.gz Tried to access via web browser. Not Found The requested URL /official_releases/qt/4.8/4.8.7/qt-everywhere-opensource-src-4.8.7.tar.gz was not found on this server.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sebas...@cvs.openbsd.org2018/11/25 15:33:58 Modified files: audio/qsynth : Makefile distinfo Log message: simple update to qsynth-0.5.3
devel/fasm, update and unbreak with lld
I tested the update with the default linker and with -fuse-ld=lld. Both
build and the assembler generates working executables and objects.
fasm can generate directly OpenBSD ELF executables but the source code
provided by upstream requires the compiler to link with libc.
OK?.
Index: Makefile
===
RCS file: /cvs/ports/devel/fasm/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- Makefile9 Nov 2014 01:05:36 - 1.6
+++ Makefile25 Nov 2018 21:02:14 -
@@ -3,7 +3,7 @@
ONLY_FOR_ARCHS = i386
COMMENT = flat assembler
-DISTNAME = fasm-1.71.22
+DISTNAME = fasm-1.73.04
CATEGORIES = devel lang
HOMEPAGE = http://flatassembler.net/
MAINTAINER = Dmitri Alenichev
@@ -19,11 +19,18 @@ NO_TEST = Yes
WRKSRC = ${WRKDIR}/fasm
do-build:
- cd ${WRKSRC} && ${CC} ${CFLAGS} fasm.o -o fasm
+ cd ${WRKSRC} && \
+ ${CC} ${CFLAGS} -Wl,-znotext fasm.o -o fasm && \
+ rm fasm.o && ./fasm source/libc/fasm.asm fasm.o && rm fasm && \
+ ${CC} ${CFLAGS} -Wl,-znotext fasm.o -o fasm
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/fasm ${PREFIX}/bin
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/fasm
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/fasm/libcdemo
${INSTALL_DATA} ${WRKSRC}/*.txt ${PREFIX}/share/doc/fasm
+ ${INSTALL_DATA} ${WRKSRC}/examples/libcdemo/*.asm \
+ ${WRKSRC}/examples/libcdemo/*.inc \
+ ${PREFIX}/share/doc/fasm/libcdemo
.include
Index: distinfo
===
RCS file: /cvs/ports/devel/fasm/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo9 Nov 2014 01:05:36 - 1.2
+++ distinfo25 Nov 2018 21:02:14 -
@@ -1,2 +1,2 @@
-SHA256 (fasm-1.71.22.tar.gz) = D8U/zOuGOupn2w2ncOqqn4xvLUodA6/AHYIYWD7y+vc=
-SIZE (fasm-1.71.22.tar.gz) = 250218
+SHA256 (fasm-1.73.04.tar.gz) = NxIIcPDcBJnxulYAfPTrIhpO/NBKcqxsf8D1NozUysI=
+SIZE (fasm-1.73.04.tar.gz) = 274732
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/fasm/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 11 Jan 2009 18:23:25 - 1.1.1.1
+++ pkg/PLIST 25 Nov 2018 21:02:14 -
@@ -2,6 +2,9 @@
@bin bin/fasm
share/doc/fasm/
share/doc/fasm/fasm.txt
+share/doc/fasm/libcdemo/
+share/doc/fasm/libcdemo/ccall.inc
+share/doc/fasm/libcdemo/libcdemo.asm
share/doc/fasm/license.txt
share/doc/fasm/readme.txt
share/doc/fasm/whatsnew.txt
UPDATE: devel/jenkins-2.138.3/2-152
Version bump.
- Builds and runs fine on amd64, no tests in distribution.
- Diff created in a way which should apply clean with patch(1).
- MAINTAINER CC'd.
Thank you,
--
Edward Lopez-Acosta
diff --git devel/Makefile devel/Makefile
index a46d04c8ebc..5939d853878 100644
--- devel/Makefile
+++ devel/Makefile
@@ -1,9 +1,7 @@
# $OpenBSD: Makefile,v 1.30 2018/09/04 12:53:16 espie Exp $
-VERSION = 2.138
+VERSION = 2.152
MASTER_SITES = http://mirrors.jenkins-ci.org/war/${VERSION}/
DIST_SUBDIR = jenkins-devel
-REVISION = 0
.include
-
diff --git devel/distinfo devel/distinfo
index 69095951c1e..e5c0c28e049 100644
--- devel/distinfo
+++ devel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (jenkins/2.138/jenkins.war) = 4cKA8SQZmcnHeVqOo+U0bevra+XiZ0TBOwO8SU3O9Ww=
-SIZE (jenkins/2.138/jenkins.war) = 75704621
+SHA256 (jenkins/2.152/jenkins.war) = jde/3OIrMtlBsnJ5qFeVQoGxfJu4d02G6H6c1A4UQMM=
+SIZE (jenkins/2.152/jenkins.war) = 75939426
diff --git devel/pkg/PLIST devel/pkg/PLIST
index 4c8acb6d7dd..555057c62d1 100644
--- devel/pkg/PLIST
+++ devel/pkg/PLIST
@@ -10,7 +10,7 @@
@sample ${HOMEDIR}/
@owner
@group
+@rcscript ${RCDIR}/jenkins
share/doc/pkg-readmes/${PKGSTEM}
share/jenkins/
share/jenkins/jenkins.war
-@rcscript ${RCDIR}/jenkins
diff --git stable/Makefile stable/Makefile
index 9c336543917..bccb74cee12 100644
--- stable/Makefile
+++ stable/Makefile
@@ -1,9 +1,7 @@
# $OpenBSD: Makefile,v 1.29 2018/09/04 12:53:16 espie Exp $
-VERSION = 2.121.3
+VERSION = 2.138.3
MASTER_SITES = http://mirrors.jenkins-ci.org/war-stable/${VERSION}/
DIST_SUBDIR = jenkins-stable
-REVISION = 0
.include
-
diff --git stable/distinfo stable/distinfo
index 40fae240692..dc95ebe1334 100644
--- stable/distinfo
+++ stable/distinfo
@@ -1,2 +1,2 @@
-SHA256 (jenkins/2.121.3/jenkins.war) = UPvOEfoUfQ7Nns82za6D73lft9R3bzO16hO8Fb9uPBM=
-SIZE (jenkins/2.121.3/jenkins.war) = 74764818
+SHA256 (jenkins/2.138.3/jenkins.war) = lT5N2i0wZShMABaz6CeeCX+DDBKLH3EthHgP8rB1Hn0=
+SIZE (jenkins/2.138.3/jenkins.war) = 75733340
diff --git stable/pkg/PLIST stable/pkg/PLIST
index 4c8acb6d7dd..555057c62d1 100644
--- stable/pkg/PLIST
+++ stable/pkg/PLIST
@@ -10,7 +10,7 @@
@sample ${HOMEDIR}/
@owner
@group
+@rcscript ${RCDIR}/jenkins
share/doc/pkg-readmes/${PKGSTEM}
share/jenkins/
share/jenkins/jenkins.war
-@rcscript ${RCDIR}/jenkins
Re: [NEW] devel/py-arrow 0.12.1 (cookiecutter porting cont.)
py-chai looks to have been merged, no new version for this port?
Other than the fixed typo, any other changes needed?
Thank you,
Edward Lopez-Acosta
On 11/20/18 6:07 PM, Stuart Henderson wrote:
On 2018/11/20 18:02, Edward Lopez-Acosta wrote:
Fixed and new tarball attached, and already noted that py-chai needs to be
in first.
But you're asking "can this be merged please" and the answer is no until
py-chai is in.
Edward Lopez-Acosta
On 11/20/18 5:58 PM, Stuart Henderson wrote:
On 2018/09/16 15:49, Edward Lopez-Acosta wrote:
==
Arrow is a lightweight library which makes working with dates and times
simpler. This is done by including an API which supports many common
scenarios. Arrow can also easily generate time span, ranges and more while
being a drop in replacement for the standard datetime module.
==
This is required for the cookiecutter project I am porting.
- Tests require py-chai, which I also submitted back on Aug 31, 2018, and
all pass for both python 2 and 3.
- Package builds successfully on amd64 for both py2 and 3.
- Only missing dependency is py-chai mentioned above.
Can this be merged please?
Thank you,
--
Edward Lopez-Acosta
Can't be merged until py-chai is in.
"FLAVORS = python3" not "FLAVORS +=".
Typo:
devel\/py-simplejson${MODPY_FLAVOR}
NEW: textprox/py-sphinx_pypa_theme-2018.6
Hello, This is a dependency of the newest version of pip which I am working on updating the port for. Builds and runs fine on amd64 with the existing version of Sphinx in the ports tree. I used the date of the commit as the version as there are no tagged releases for pypa_theme. Used the existing py-sphinx_rtd_theme as a template so no DEPENDS as this is just a collection of theme files for sphinx. Thank you, -- Edward Lopez-Acosta py-sphinx_pypa_theme-2018.6.tar.gz Description: application/gzip
Re: aarch64 bulk build report
On 2018-11-24, George Koehler wrote: >> http://build-failures.rhaalovely.net/aarch64/2018-11-18/games/dungeon-crawl.log > > I guess char is unsigned on arm, like it is on powerpc. It is. > ...but if someone fixed the strlen, Done. > there would be char problems. Yes, there are a number of ports that fail to build on aarch64 due to relatively easily fixable problems: * narrowing errors such as this one * explicitly linking with -lstdc++ -- Christian "naddy" Weisgerber na...@mips.inka.de
Re: UPDATE: textproc/ripgrep-0.10.0 (with request for help)
On Sun, 25 Nov 2018 14:48:19 -0600, Edward Lopez-Acosta wrote: > -# uses pledge() > -WANTLIB += c pthread > - The comment about pledge should go away but it's not related to the WANTLIB line which should stay (and maybe get updated as well).
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: na...@cvs.openbsd.org 2018/11/25 14:06:38 Modified files: games/dungeon-crawl: Makefile Added files: games/dungeon-crawl/patches: patch-source_describe_cc patch-source_hiscores_cc patch-source_initfile_cc patch-source_macro_cc patch-source_monplace_cc patch-source_skills2_cc patch-source_spells4_cc Log message: add missing includes
Re: UPDATE news/sabnzbd
On Sat, Nov 10, 2018 at 08:16:14PM +, Mikolaj Kucharski wrote:
> I managed to botch the PLIST in the last patch. I've looked
> into archives, why _MODPY_BUILD_DEPENDS is needed and it's
> for post-install and compileall.py, so I've added it back.
>
> To sum up again..
>
> - update to version 2.3.5
> - homepage supports https
> - added textproc/py-lxml to run depends, per advice in sabnzbd's logs
> - switched from news/py-yenc to news/py-sabyenc
> - use WRKDIST, instead of WRKSRC (I hit a problem with WRKSRC)
> - allow spaces in arguments to launcher script
> - patch for https://github.com/sabnzbd/sabnzbd/issues/1095
> - fix ownership of bin/sabnzbd (package install doesn't fix it though, pkg
> tools bug?)
> - plist regen (properly this time)
> - added 2 min timeout as I had situation when sabnzbd needed more time than
> usual to stop
>
> New port of py-sabyenc is in my previous email. Direct link to the
> tarball:
>
> https://marc.info/?l=openbsd-ports=154187615730618=p3
>
Any comments?
Index: Makefile
===
RCS file: /cvs/ports/news/sabnzbd/Makefile,v
retrieving revision 1.13
diff -u -p -u -r1.13 Makefile
--- Makefile28 May 2018 12:25:20 - 1.13
+++ Makefile25 Nov 2018 19:58:36 -
@@ -1,13 +1,12 @@
# $OpenBSD: Makefile,v 1.13 2018/05/28 12:25:20 sthen Exp $
COMMENT = retrieve and process nzb-files via web interface
-VERSION = 1.2.1
+VERSION = 2.3.5
DISTNAME = SABnzbd-${VERSION}-src
-PKGNAME = sabnzbd-${VERSION}
+PKGNAME = sabnzbd-${VERSION:L}
CATEGORIES = news
-HOMEPAGE = http://sabnzbd.org/
+HOMEPAGE = https://sabnzbd.org/
MAINTAINER = Marcus Glocker
-REVISION = 1
# GPLv2
PERMIT_PACKAGE_CDROM = Yes
@@ -22,14 +21,15 @@ RUN_DEPENDS = archivers/par2cmdline \
archivers/unzip \
devel/py-cheetah \
devel/py-notify \
- news/py-yenc \
+ textproc/py-lxml \
+ news/py-sabyenc \
security/py-openssl
NO_BUILD = Yes
NO_TEST = Yes
PKG_ARCH = *
-WRKSRC = ${WRKDIR}/SABnzbd-${VERSION}
+WRKDIST = ${WRKDIR}/SABnzbd-${VERSION}
do-install:
${INSTALL_DATA_DIR} \
Index: distinfo
===
RCS file: /cvs/ports/news/sabnzbd/distinfo,v
retrieving revision 1.7
diff -u -p -u -r1.7 distinfo
--- distinfo25 Feb 2017 20:11:33 - 1.7
+++ distinfo25 Nov 2018 19:58:36 -
@@ -1,2 +1,2 @@
-SHA256 (SABnzbd-1.2.1-src.tar.gz) =
MHL2R9PnQYGSybxYgc/JtYMUoA8NvNj4LxwRsTTENLs=
-SIZE (SABnzbd-1.2.1-src.tar.gz) = 2725395
+SHA256 (SABnzbd-2.3.5-src.tar.gz) =
4m+z6K/jXYLjGqHTVofKA/FodIIxomwSYXcXY1RfsrQ=
+SIZE (SABnzbd-2.3.5-src.tar.gz) = 2750437
Index: files/sabnzbd
===
RCS file: /cvs/ports/news/sabnzbd/files/sabnzbd,v
retrieving revision 1.2
diff -u -p -u -r1.2 sabnzbd
--- files/sabnzbd 20 May 2013 18:36:06 - 1.2
+++ files/sabnzbd 25 Nov 2018 19:58:36 -
@@ -1,3 +1,3 @@
#!/bin/sh
-exec ${MODPY_BIN}
${TRUEPREFIX}/lib/python${MODPY_VERSION}/site-packages/sabnzbd/SABnzbd.py $*
+exec ${MODPY_BIN}
${TRUEPREFIX}/lib/python${MODPY_VERSION}/site-packages/sabnzbd/SABnzbd.py "$@"
Index: patches/patch-sabnzbd_assembler_py
===
RCS file: patches/patch-sabnzbd_assembler_py
diff -N patches/patch-sabnzbd_assembler_py
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-sabnzbd_assembler_py 25 Nov 2018 19:58:36 -
@@ -0,0 +1,19 @@
+$OpenBSD$
+
+- https://github.com/sabnzbd/sabnzbd/issues/1095
+
+Index: sabnzbd/assembler.py
+--- sabnzbd/assembler.py.orig
sabnzbd/assembler.py
+@@ -81,11 +81,6 @@ class Assembler(Thread):
+ # Abort all direct unpackers, just to be sure
+ sabnzbd.directunpacker.abort_all()
+
+-# Place job back in queue and wait 30 seconds to hope it
gets resolved
+-self.process(job)
+-sleep(30)
+-continue
+-
+ # Prepare filename
+ nzo.verify_nzf_filename(nzf)
+ nzf.filename = sanitize_filename(nzf.filename)
Index: pkg/PLIST
===
RCS file: /cvs/ports/news/sabnzbd/pkg/PLIST,v
retrieving revision 1.6
diff -u -p -u -r1.6 PLIST
--- pkg/PLIST 28 May 2018 12:25:20 - 1.6
+++ pkg/PLIST
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: d...@cvs.openbsd.org2018/11/25 13:55:41 Modified files: sysutils/upt/upt: Makefile distinfo sysutils/upt/upt/pkg: PLIST Log message: Update to upt-0.5
Re: UPDATE: textproc/ripgrep-0.10.0 (with request for help)
Same patch as before but regenerated so patch(1) applies it cleanly.
Edward Lopez-Acosta
On 11/25/18 6:49 AM, Edward Lopez-Acosta wrote:
Hi Sebastien,
Thank you for the tips.
I think the CONFIGURE_STYLE removal was simply an oversight on my part.
I regened the list of crates using the method you noted (which was quite
handy, and there were a lot of changes), and removed WANTLIB since this
version removes pledge for the time being. I am still interested in
where this gets applied if it gets added for a revision.
New diff attached using a tip (on another port) from Stuart Henderson.
It should hopefully be easier to apply now. I used `git diff --relative
.` in the port directory rather than from /usr/ports and specifying the
port.
All tests pass and builds/runs fine on amd64.
Thank you.
Edward Lopez-Acosta
On 11/25/18 3:22 AM, Sebastien Marie wrote:
Hi Edward,
On Sat, Nov 24, 2018 at 05:59:15PM -0600, Edward Lopez-Acosta wrote:
Version bump.
I had to remove the pledge patch as the code was majorly changed and
it no
longer applied. I spent a couple hours trying to figure out where to
apply
pledge into the updated code, but got stuck. Would someone be willing to
help with this please?
I think it is fine to remove pledge() and look to re-add it later (if
possible).
For now, I will focus on the port update without pledge (so the "uses
pledge()" comment could be removed for now).
Otherwise:
Builds and runs successfully on amd64.
No maintainer listed in Makefile.
Nothing depends on this [1]
All tests pass [2]
it is on the right road.
Required crate versions match Cargo.lock [3]
https://github.com/BurntSushi/ripgrep/blob/master/Cargo.lock
how do you update the list of MODCARGO_CRATES in Makefile ?
port infrastructure has tools for helping regenerating MODCARGO_CRATES
lines.
on port-modules(5) man-page, see modcargo-gen-crates and
modcargo-gen-crates-licenses targets.
note the usage could be a bit tricky...
$ edit Makefile #remove all MODCARGO_CRATES lines
$ make clean && make patch
$ make modcargo-gen-crates > list
$ edit Makefile #include the list
$ make makesum
$ make clean && make patch
$ make modcargo-gen-crates-licenses > list
$ edit Makefile #replace all MODCARGO_CRATES by list
Ok?
Just a detail: if you are not a commiter, avoid asking for "ok". It is
usually used by an openbsd developer to ask review from another commiter,
in order to commit the change.
Regarding the diff itself, some questions.
diff --git a/textproc/ripgrep/Makefile b/textproc/ripgrep/Makefile
index 16d2c678d98..c8f3ea47967 100644
--- a/textproc/ripgrep/Makefile
+++ b/textproc/ripgrep/Makefile
@@ -22,53 +21,6 @@ MODULES = devel/cargo
BUILD_DEPENDS = lang/rust>=1.20 \
textproc/asciidoc
-MODCARGO_CRATES += aho-corasick-0.6.4 # Unlicense/MIT
[...]
-MODCARGO_CRATES += wincolor-0.1.6 # Unlicense/MIT
-CONFIGURE_STYLE = cargo
does the remove of CONFIGURE_STYLE is intented ?
without, the build will use network for retrieving dependencies.
$ make
[...]
===> Building for ripgrep-0.10.0
Updating crates.io index
warning: spurious network error (2 tries remaining): curl error:
Could not resolve host: github.com
; class=Net (12)
warning: spurious network error (1 tries remaining): curl error:
Could not resolve host: github.com
; class=Net (12)
error: failed to fetch `https://github.com/rust-lang/crates.io-index`
Caused by:
curl error: Could not resolve host: github.com
; class=Net (12)
PATCHORIG = .openbsd.orig
SEPARATE_BUILD = Yes
@@ -78,6 +30,92 @@ MODCARGO_RUSTFLAGS = -C debuginfo=0
RELEASE_DIR = ${MODCARGO_TARGET_DIR}/release
OUT_DIR = ${RELEASE_DIR}/build/ripgrep-*/out
+MODCARGO_CRATES += aho-corasick-0.6.8 # Unilicense/MIT
+MODCARGO_CRATES += arrayvec-0.4.7 # MIT/Apache2.0
[...]
and why moving MODCARGO_CRATES to the end ?
it doesn't help to review what changed and what is the same.
please avoid it if not necessary.
Thanks.
diff --git Makefile Makefile
index 16d2c678d98..70c845f69e6 100644
--- Makefile
+++ Makefile
@@ -4,17 +4,13 @@ COMMENT = line oriented search tool using Rust's regex library #'
GH_ACCOUNT = BurntSushi
GH_PROJECT = ripgrep
-GH_TAGNAME = 0.8.1
-REVISION = 2
+GH_TAGNAME = 0.10.0
CATEGORIES = textproc sysutils
# Unlicense/MIT
PERMIT_PACKAGE_CDROM = Yes
-# uses pledge()
-WANTLIB += c pthread
-
# as devel/cargo MODULES adds DISTFILES, GH_* didn't
DISTFILES += ${DISTNAME}${EXTRACT_SUFX}
@@ -22,52 +18,83 @@ MODULES = devel/cargo
BUILD_DEPENDS = lang/rust>=1.20 \
textproc/asciidoc
-MODCARGO_CRATES += aho-corasick-0.6.4 # Unlicense/MIT
-MODCARGO_CRATES += ansi_term-0.10.2 # MIT
-MODCARGO_CRATES += atty-0.2.6 # MIT
-MODCARGO_CRATES += bitflags-1.0.1 # MIT/Apache-2.0
-MODCARGO_CRATES += bytecount-0.3.1 # Apache-2.0/MIT
-MODCARGO_CRATES += cfg-if-0.1.2 #
Re: update: multimedia/py-pafy
On Sun, 18 Nov 2018 14:53:57 +0100, Sebastien Marie
wrote:
Thanks, committed with a few improvements:
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/multimedia/py-pafy/pkg/PLIST,v
> retrieving revision 1.3
> diff -u -p -r1.3 PLIST
> --- pkg/PLIST 23 May 2017 11:11:16 - 1.3
> +++ pkg/PLIST 18 Nov 2018 11:34:29 -
> @@ -8,20 +8,23 @@ lib/python${MODPY_VERSION}/site-packages
>
> lib/python${MODPY_VERSION}/site-packages/pafy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
>
> lib/python${MODPY_VERSION}/site-packages/pafy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
> lib/python${MODPY_VERSION}/site-packages/pafy/__init__.py
> -lib/python${MODPY_VERSION}/site-packages/pafy/__init__.pyc
> +${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pafy/${MODPY_PYCACHE}/
In py3, this is a noop. It's only useful in py2 + py3 ports so I
removed it.
I also removed the HOMEPAGE as it's dead and I added the needed quirks
as the pkgname changes.
Cheers,
Daniel
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: d...@cvs.openbsd.org2018/11/25 13:35:18 Modified files: devel/quirks : Makefile devel/quirks/files: Quirks.pm Log message: Register py-pafy pkgname change
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: d...@cvs.openbsd.org2018/11/25 13:34:37 Modified files: multimedia/py-pafy: Makefile distinfo multimedia/py-pafy/pkg: PLIST Log message: Update to py3-pafy-0.5.4 Switch to py3 and add youtube-dl as a rdep >From semarie
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: na...@cvs.openbsd.org 2018/11/25 13:16:46 Modified files: multimedia/transcode: Makefile Log message: use the alternative i386 assembly code that doesn't create text relocations
Re: UPDATE: www/pelican-4.0.0
On Sun, 18 Nov 2018 13:29:08 -0600, Edward Lopez-Acosta wrote: > Version update to latest upstream. Mostly bug fixes and enhancements. > > Builds fine on amd64, and existing maintainer contacted. Checked for > ports depending on this and found none. > > Ok? > Thanks committed. Please next time send a cvs diff (as your git is not configured per the FAQ recommendations). It's faster for me to redo your work than to make patch(1) apply it... Cheers, Daniel
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: d...@cvs.openbsd.org2018/11/25 12:57:14 Modified files: www/pelican: Makefile distinfo www/pelican/patches: patch-pelican_tests_test_pelican_py www/pelican/pkg: PLIST Log message: Update to pelican-4.0.0 Based on a diff from Edward Lopez-Acosta, maintainer timeout
Re: NEW: devel/py-magic
On Thu, 28 Jun 2018 15:27:04 +0100, Stuart Henderson
wrote:
> @pkgpath devel/py-libmagic${MODPY_FLAVOR}
This doesn't work.
If I have @pkgpath devel/py-libmagic, only py2 gets updated. If I have
@pkgpath devel/py-libmagic${MODPY_FLAVOR}, none gets updated.
In order to test, I put
@pkgpath devel/py-libmagic
@pkgpath devel/py-libmagic,python3
and pkg_add updated both:
py-libmagic-5.34->py-magic-0.4.15v0: ok
py3-libmagic-5.34->py3-magic-0.4.15v0: ok
The only other python port that has something like that is
py-sqlalchemy and it has what sthen said:
@pkgpath databases/py-sqlalchemy${MODPY_FLAVOR}
Any idea?
I attached the py-magic port and the quirks diff I currently have.
Cheers,
Daniel
Index: Makefile
===
RCS file: /cvs/ports/devel/quirks/Makefile,v
retrieving revision 1.647
diff -u -p -r1.647 Makefile
--- Makefile 20 Nov 2018 17:35:16 - 1.647
+++ Makefile 25 Nov 2018 19:16:19 -
@@ -5,7 +5,7 @@ CATEGORIES = devel databases
DISTFILES =
# API.rev
-PKGNAME = quirks-3.40
+PKGNAME = quirks-3.41
PKG_ARCH = *
MAINTAINER = Marc Espie
Index: files/Quirks.pm
===
RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
retrieving revision 1.661
diff -u -p -r1.661 Quirks.pm
--- files/Quirks.pm 20 Nov 2018 17:35:16 - 1.661
+++ files/Quirks.pm 25 Nov 2018 19:16:19 -
@@ -285,6 +285,8 @@ my $stem_extensions = {
# 6.5
'ValyriaTear' => 'valyriatear',
'apertium-es-ast_NO-PN' => 'apertium-es-ast',
+ 'py-libmagic' => 'py-magic',
+ 'py3-libmagic' => 'py3-magic',
};
my $obsolete_reason = {
py-magic.tgz
Description: application/compressed-tar
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: na...@cvs.openbsd.org 2018/11/25 12:18:21 Modified files: x11/mplayer: Makefile Log message: allow text relocations from non-PIC i386 assembly since we already link with the FFmpeg libraries where we do the same; ok Brad
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs
Module name:ports
Changes by: d...@cvs.openbsd.org2018/11/25 12:03:11
Modified files:
www/py-requests/pkg: PLIST
Log message:
previous change was a mistake: remove one too many ${MODPY_COMMENT}
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: d...@cvs.openbsd.org2018/11/25 11:58:14 Modified files: www/py-requests: Makefile distinfo www/py-requests/pkg: PLIST Log message: Update to py-requests-2.20.1 "Fixed bug with unintended Authorization header stripping for redirects using default ports (http/80, https/443)."
Re: devel/py-virtualenv : update to 16.1.0
On Sun, 4 Nov 2018 14:08:56 +, wen heping wrote: > It both build and test well on my amd64 system. You don't have any difference in the test ouput between before and after the upgrade?
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: dan...@cvs.openbsd.org 2018/11/25 11:44:20 Modified files: lang/gcc/4.9 : Makefile lang/gcc/4.9/patches: patch-gcc_c-family_c-format_c Log message: Sync kprintf implementation with base gcc; ok pascal@ (MAINTAINER).
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: es...@cvs.openbsd.org 2018/11/25 10:51:04 Modified files: databases/sqlports/files/scripts: show-reverse-deps Log message: indicate that build_depends are not 100% yet
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: es...@cvs.openbsd.org 2018/11/25 10:45:57 Modified files: databases/sqlports: Makefile databases/sqlports/pkg: PLIST-compact Added files: databases/sqlports/files/scripts: show-reverse-deps Log message: now we're getting serious :)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: es...@cvs.openbsd.org 2018/11/25 10:08:48 Modified files: databases/sqlports: Makefile databases/sqlports/files: Inserter.pm Var.pm Log message: add a "canonical_depends" schema with normalized pkgpaths on both sides
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2018/11/25 09:30:37 Modified files: databases/strigi: Makefile distinfo databases/strigi/pkg: PLIST Log message: Update strigi-0.7.8 "go for it" kn@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: es...@cvs.openbsd.org 2018/11/25 09:28:32 Modified files: databases/sqlports: Makefile databases/sqlports/files: Var.pm databases/sqlports/files/scripts: print-ports-index databases/sqlports/pkg: PLIST-compact PLIST-main Log message: fix README/DESCR tables to actually contain the filename along with the contents. move print-ports-index to sqlports-compact, now that enough pieces of the puzzle are there. (still missing joins for all the *_ordered stuff in default _ports view)
Re: [WIP/NEW] 1oom - Master of Orion 1 engine
On 11/24/18 5:26 PM, Max Fillinger wrote: On Fri, Nov 23, 2018 at 09:40:41PM -0500, Brian Callahan wrote: On 11/23/18 7:05 PM, Max Fillinger wrote: Thanks for your help! * No MAINTAINER--do you want it? What does that entail? I want to keep this port working and up to date, if I can. But I won't be any help if someone has, for example, a problem on a non-i386/amd64 platform. * Made the building of your fixbugs.pbx more sane and in the appropriate places for the port. I added a comment explaining why we have a post-build and post-install. Your comment in the Makefile seems a bit misleading. fixbugs.pbx is for when you *don't* want the bugs of the original game. I'd suggest something like: # Create patch file to allow the user to disable bug-compatibility with # the original game. Alright, that's my misunderstanding of what the file does then. ~Brian Here's a new archive, essentially the same as before but with me written in as MAINTAINER and the comment fixed. Sure. I'm ok with this. ~Brian
Re: math/pari: remove unless updated
On 2018-11-24, George Koehler wrote: > The below diff for OpenBSD's math/p5-Math-Pari tries to be like > FreeBSD, but seems not correct. It passes `make test` on amd64, but I > suspect it doesn't use GMP even though I tried to enable GMP. Pari > has some assembly kernels (like alpha, ix86, ppc, ...) and a GMP > kernel; I wonder if the GMP kernel would fix the lld error. I can point out the specific problem: src/kernel/ix86/l0asm.c is preprocessed into level0.s, which uses absolute addressing to access the common variables "overflow" and "hiremainder". That causes the text relocations lld complains about. The corresponding current code is in src/kernel/ix86/asm0.h and has been rewritten as inline assembly that only uses registers and local variables: http://pari.math.u-bordeaux.fr/cgi-bin/gitweb.cgi?p=pari.git;a=blob;f=src/kernel/ix86/asm0.h -- Christian "naddy" Weisgerber na...@mips.inka.de
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: es...@cvs.openbsd.org 2018/11/25 08:04:10 Modified files: databases/sqlports: Makefile databases/sqlports/files: Column.pm Inserter.pm Var.pm Log message: minor tweaks and addition: - prepare to handle all columns in the main ports view. - add a PathId column to a few views where it makes sense. - reorg inserter to simplify all creation of tables and views thru a single common method instead of rolling my own several times.
Re: UPDATE: textproc/ripgrep-0.10.0 (with request for help)
Hi Sebastien,
Thank you for the tips.
I think the CONFIGURE_STYLE removal was simply an oversight on my part.
I regened the list of crates using the method you noted (which was quite
handy, and there were a lot of changes), and removed WANTLIB since this
version removes pledge for the time being. I am still interested in
where this gets applied if it gets added for a revision.
New diff attached using a tip (on another port) from Stuart Henderson.
It should hopefully be easier to apply now. I used `git diff --relative
.` in the port directory rather than from /usr/ports and specifying the
port.
All tests pass and builds/runs fine on amd64.
Thank you.
Edward Lopez-Acosta
On 11/25/18 3:22 AM, Sebastien Marie wrote:
Hi Edward,
On Sat, Nov 24, 2018 at 05:59:15PM -0600, Edward Lopez-Acosta wrote:
Version bump.
I had to remove the pledge patch as the code was majorly changed and it no
longer applied. I spent a couple hours trying to figure out where to apply
pledge into the updated code, but got stuck. Would someone be willing to
help with this please?
I think it is fine to remove pledge() and look to re-add it later (if possible).
For now, I will focus on the port update without pledge (so the "uses
pledge()" comment could be removed for now).
Otherwise:
Builds and runs successfully on amd64.
No maintainer listed in Makefile.
Nothing depends on this [1]
All tests pass [2]
it is on the right road.
Required crate versions match Cargo.lock [3]
https://github.com/BurntSushi/ripgrep/blob/master/Cargo.lock
how do you update the list of MODCARGO_CRATES in Makefile ?
port infrastructure has tools for helping regenerating MODCARGO_CRATES
lines.
on port-modules(5) man-page, see modcargo-gen-crates and
modcargo-gen-crates-licenses targets.
note the usage could be a bit tricky...
$ edit Makefile #remove all MODCARGO_CRATES lines
$ make clean && make patch
$ make modcargo-gen-crates > list
$ edit Makefile #include the list
$ make makesum
$ make clean && make patch
$ make modcargo-gen-crates-licenses > list
$ edit Makefile #replace all MODCARGO_CRATES by list
Ok?
Just a detail: if you are not a commiter, avoid asking for "ok". It is
usually used by an openbsd developer to ask review from another commiter,
in order to commit the change.
Regarding the diff itself, some questions.
diff --git a/textproc/ripgrep/Makefile b/textproc/ripgrep/Makefile
index 16d2c678d98..c8f3ea47967 100644
--- a/textproc/ripgrep/Makefile
+++ b/textproc/ripgrep/Makefile
@@ -22,53 +21,6 @@ MODULES =devel/cargo
BUILD_DEPENDS = lang/rust>=1.20 \
textproc/asciidoc
-MODCARGO_CRATES += aho-corasick-0.6.4 # Unlicense/MIT
[...]
-MODCARGO_CRATES += wincolor-0.1.6 # Unlicense/MIT
-CONFIGURE_STYLE = cargo
does the remove of CONFIGURE_STYLE is intented ?
without, the build will use network for retrieving dependencies.
$ make
[...]
===> Building for ripgrep-0.10.0
Updating crates.io index
warning: spurious network error (2 tries remaining): curl error: Could
not resolve host: github.com
; class=Net (12)
warning: spurious network error (1 tries remaining): curl error: Could
not resolve host: github.com
; class=Net (12)
error: failed to fetch `https://github.com/rust-lang/crates.io-index`
Caused by:
curl error: Could not resolve host: github.com
; class=Net (12)
PATCHORIG = .openbsd.orig
SEPARATE_BUILD = Yes
@@ -78,6 +30,92 @@ MODCARGO_RUSTFLAGS = -C debuginfo=0
RELEASE_DIR = ${MODCARGO_TARGET_DIR}/release
OUT_DIR = ${RELEASE_DIR}/build/ripgrep-*/out
+MODCARGO_CRATES += aho-corasick-0.6.8 # Unilicense/MIT
+MODCARGO_CRATES += arrayvec-0.4.7 # MIT/Apache2.0
[...]
and why moving MODCARGO_CRATES to the end ?
it doesn't help to review what changed and what is the same.
please avoid it if not necessary.
Thanks.
diff --git a/Makefile b/Makefile
index 16d2c678d98..70c845f69e6 100644
--- a/Makefile
+++ b/Makefile
@@ -4,17 +4,13 @@ COMMENT = line oriented search tool using Rust's regex library #'
GH_ACCOUNT = BurntSushi
GH_PROJECT = ripgrep
-GH_TAGNAME = 0.8.1
-REVISION = 2
+GH_TAGNAME = 0.10.0
CATEGORIES = textproc sysutils
# Unlicense/MIT
PERMIT_PACKAGE_CDROM = Yes
-# uses pledge()
-WANTLIB += c pthread
-
# as devel/cargo MODULES adds DISTFILES, GH_* didn't
DISTFILES += ${DISTNAME}${EXTRACT_SUFX}
@@ -22,52 +18,83 @@ MODULES = devel/cargo
BUILD_DEPENDS = lang/rust>=1.20 \
textproc/asciidoc
-MODCARGO_CRATES += aho-corasick-0.6.4 # Unlicense/MIT
-MODCARGO_CRATES += ansi_term-0.10.2 # MIT
-MODCARGO_CRATES += atty-0.2.6 # MIT
-MODCARGO_CRATES += bitflags-1.0.1 # MIT/Apache-2.0
-MODCARGO_CRATES += bytecount-0.3.1 # Apache-2.0/MIT
-MODCARGO_CRATES += cfg-if-0.1.2 # MIT/Apache-2.0
-MODCARGO_CRATES +=
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2018/11/25 05:41:35 Modified files: devel/git : Makefile distinfo Log message: Update to git-2.19.2 Sort RDEPs while here. OK benoit
Elastic stack update 6.4.3 -> 6.5.1
Dear all,
Please find the diffs for the latest elasticsearch/logstash/kibana ports
attached.
Many changes, see some highlights in Elastic blog:
https://www.elastic.co/blog/elastic-stack-6-5-0-released
Looking for OK's to commit.
--
With best regards,
Pavel Korovin
Index: Makefile
===
RCS file: /cvs/ports/textproc/elasticsearch/Makefile,v
retrieving revision 1.58
diff -u -p -r1.58 Makefile
--- Makefile12 Nov 2018 21:24:36 - 1.58
+++ Makefile25 Nov 2018 11:03:44 -
@@ -2,7 +2,7 @@
COMMENT = distributed RESTful search and analytics
-V =6.4.3
+V =6.5.1
DISTNAME = elasticsearch-oss-$V
PKGNAME = elasticsearch-$V
CATEGORIES = textproc
@@ -33,7 +33,7 @@ ES_HOME = ${PREFIX}/elasticsearch/
do-install:
${SUBST_CMD} ${WRKSRC}/bin/elasticsearch-env
${WRKSRC}/config/{elasticsearch.yml,jvm.options}
- rm ${WRKSRC}/bin/*.{bat,beforesubst,exe,orig} ${WRKSRC}/config/*.orig
+ rm ${WRKSRC}/bin/*.{bat,beforesubst,exe,orig}
${WRKSRC}/config/*.{beforesubst,orig}
sed -i 's,#!/bin/bash,#!/usr/bin/env bash,' ${WRKSRC}/bin/*
${INSTALL_DATA_DIR} ${ES_HOME}/{bin,lib,modules,plugins}/ \
${PREFIX}/share/{doc,examples}/elasticsearch/
Index: distinfo
===
RCS file: /cvs/ports/textproc/elasticsearch/distinfo,v
retrieving revision 1.42
diff -u -p -r1.42 distinfo
--- distinfo12 Nov 2018 21:24:36 - 1.42
+++ distinfo25 Nov 2018 11:03:44 -
@@ -1,2 +1,2 @@
-SHA256 (elasticsearch-oss-6.4.3.tar.gz) =
NPlEEHANov5FDO1ldj7DlWKl7MVWX6tM/MOFoZqz7EA=
-SIZE (elasticsearch-oss-6.4.3.tar.gz) = 33727639
+SHA256 (elasticsearch-oss-6.5.1.tar.gz) =
ersBFnLvFpyXfhEPjeQjsmpdpiamwgO4OALxTJgAeEg=
+SIZE (elasticsearch-oss-6.5.1.tar.gz) = 34259848
Index: pkg/PLIST
===
RCS file: /cvs/ports/textproc/elasticsearch/pkg/PLIST,v
retrieving revision 1.31
diff -u -p -r1.31 PLIST
--- pkg/PLIST 25 Sep 2018 08:50:49 - 1.31
+++ pkg/PLIST 25 Nov 2018 11:03:44 -
@@ -17,6 +17,7 @@ elasticsearch/bin/elasticsearch-cli
elasticsearch/bin/elasticsearch-env
elasticsearch/bin/elasticsearch-keystore
elasticsearch/bin/elasticsearch-plugin
+elasticsearch/bin/elasticsearch-shard
elasticsearch/bin/elasticsearch-translog
elasticsearch/lib/
elasticsearch/lib/HdrHistogram-2.1.9.jar
@@ -27,45 +28,46 @@ elasticsearch/lib/elasticsearch-launcher
elasticsearch/lib/elasticsearch-secure-sm-${V}.jar
elasticsearch/lib/elasticsearch-x-content-${V}.jar
elasticsearch/lib/hppc-0.7.1.jar
-elasticsearch/lib/jackson-core-2.8.10.jar
-elasticsearch/lib/jackson-dataformat-cbor-2.8.10.jar
-elasticsearch/lib/jackson-dataformat-smile-2.8.10.jar
-elasticsearch/lib/jackson-dataformat-yaml-2.8.10.jar
+elasticsearch/lib/jackson-core-2.8.11.jar
+elasticsearch/lib/jackson-dataformat-cbor-2.8.11.jar
+elasticsearch/lib/jackson-dataformat-smile-2.8.11.jar
+elasticsearch/lib/jackson-dataformat-yaml-2.8.11.jar
elasticsearch/lib/java-version-checker-${V}.jar
elasticsearch/lib/jna-4.5.1.jar
-elasticsearch/lib/joda-time-2.10.jar
+elasticsearch/lib/joda-time-2.10.1.jar
elasticsearch/lib/jopt-simple-5.0.2.jar
elasticsearch/lib/jts-core-1.15.0.jar
elasticsearch/lib/log4j-1.2-api-2.11.1.jar
elasticsearch/lib/log4j-api-2.11.1.jar
elasticsearch/lib/log4j-core-2.11.1.jar
-elasticsearch/lib/lucene-analyzers-common-7.4.0.jar
-elasticsearch/lib/lucene-backward-codecs-7.4.0.jar
-elasticsearch/lib/lucene-core-7.4.0.jar
-elasticsearch/lib/lucene-grouping-7.4.0.jar
-elasticsearch/lib/lucene-highlighter-7.4.0.jar
-elasticsearch/lib/lucene-join-7.4.0.jar
-elasticsearch/lib/lucene-memory-7.4.0.jar
-elasticsearch/lib/lucene-misc-7.4.0.jar
-elasticsearch/lib/lucene-queries-7.4.0.jar
-elasticsearch/lib/lucene-queryparser-7.4.0.jar
-elasticsearch/lib/lucene-sandbox-7.4.0.jar
-elasticsearch/lib/lucene-spatial-7.4.0.jar
-elasticsearch/lib/lucene-spatial-extras-7.4.0.jar
-elasticsearch/lib/lucene-spatial3d-7.4.0.jar
-elasticsearch/lib/lucene-suggest-7.4.0.jar
+elasticsearch/lib/lucene-analyzers-common-7.5.0.jar
+elasticsearch/lib/lucene-backward-codecs-7.5.0.jar
+elasticsearch/lib/lucene-core-7.5.0.jar
+elasticsearch/lib/lucene-grouping-7.5.0.jar
+elasticsearch/lib/lucene-highlighter-7.5.0.jar
+elasticsearch/lib/lucene-join-7.5.0.jar
+elasticsearch/lib/lucene-memory-7.5.0.jar
+elasticsearch/lib/lucene-misc-7.5.0.jar
+elasticsearch/lib/lucene-queries-7.5.0.jar
+elasticsearch/lib/lucene-queryparser-7.5.0.jar
+elasticsearch/lib/lucene-sandbox-7.5.0.jar
+elasticsearch/lib/lucene-spatial-7.5.0.jar
+elasticsearch/lib/lucene-spatial-extras-7.5.0.jar
+elasticsearch/lib/lucene-spatial3d-7.5.0.jar
+elasticsearch/lib/lucene-suggest-7.5.0.jar
elasticsearch/lib/plugin-classloader-${V}.jar
elasticsearch/lib/snakeyaml-1.17.jar
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: es...@cvs.openbsd.org 2018/11/25 05:01:27 Modified files: infrastructure/bin: dpb Log message: blah give it a knob
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: es...@cvs.openbsd.org 2018/11/25 04:51:25 Modified files: infrastructure/mk: bsd.port.mk Log message: to be used to speed up sqlports eventually: in multi-packages cases, most variables are actually identical per-subpackage, so do not list them if 'shorter' is specified as part of DPB.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: es...@cvs.openbsd.org 2018/11/25 04:40:20 Modified files: databases/sqlports/files/scripts: print-ports-index Log message: oopsie
Re: update: devel/subversion 1.11.0
On Sun, Nov 25, 2018 at 11:45:08AM +0100, Aham Brahmasmi wrote: > Danke Stefan for your response. > > > I like your idea. I suppose /var/svn is a sane default path, and there > > are already other cases where other parts create directories in /var. > > Yes, the Postgresql port uses /var/postgresql. > > I tried to find a best practice for the subversion directory. Most volks > seemed to use /var/svn. > > > Would you be able to submit a diff to the port which implements > > this idea? > > Unfortunately, I would not be able to as of now. But sometime in future, > I do hope to contribute. I am sorry for this. No problem. I'll see if I can find time to tweak the port myself. > While trying to determine the best practices, I encountered a few ideas. > Would it be possible for volks to please share their thoughts on them: > 1) Is it a good idea to make a separate disklabel partition /var/svn? Depends on your storage needs and configuration. > 2) If yes, would rw,nodev,nosuid,softdep,sync be appropriate fstab > options to mount /var/svn? Don't use softdep! It risks repository corruption during a system crash. Use the same mount flags as the defaults for /var. > 3) What is a good svn repository backup routine? Any gotchas that should > be kept in mind? The biggest concern is that backups should be created immediately after a change has been committed, and that your backup should preferrably go to a different physical machine. Use the post-commit hook to trigger a backup (and the post-revprop-change hook, too, if your repository is configured to allow revprop changes). As for getting a copy of repository data, there are a number of options. The fastest and smallest backup is provided by: svnadmin hotcopy --incremental /var/svn/repo /data/backup/repo It is safe to run this command in a post-commit hook. But a local mount point for the destination is required. Incremental hotcopy relies on file sizes and last-modified timestamps recorded in the filesystems of source and destination. If the destination is a network drive, make sure clocks between machine stay in sync. No harm will be done when the clocks are out of sync, but it can take a lot more time if timestamps don't match since data might be copied redundantly. If you need to backup a repository across a network connection, then take a look at 'svnsync' (requires a second SVN server) and 'svnrdump' (backup requires read-access over network, backup can be restored locally with 'svnadmin load'). There is also 'svnadmin freeze' but that is intended for use with an underlying filesystem which supports snapshots, and OpenBSD does not support any such filesystem.
Re: update: devel/subversion 1.11.0
Danke Stefan for your response. > I like your idea. I suppose /var/svn is a sane default path, and there > are already other cases where other parts create directories in /var. Yes, the Postgresql port uses /var/postgresql. I tried to find a best practice for the subversion directory. Most volks seemed to use /var/svn. > Would you be able to submit a diff to the port which implements > this idea? Unfortunately, I would not be able to as of now. But sometime in future, I do hope to contribute. I am sorry for this. While trying to determine the best practices, I encountered a few ideas. Would it be possible for volks to please share their thoughts on them: 1) Is it a good idea to make a separate disklabel partition /var/svn? 2) If yes, would rw,nodev,nosuid,softdep,sync be appropriate fstab options to mount /var/svn? 3) What is a good svn repository backup routine? Any gotchas that should be kept in mind? Regards, ab -|-|-|-|-|-|-|--
burp 2.2.12
I started to use burp 2.1 the other day and has the shortcoming that it can only listen on one port. And :: means IPv6 in OpenBSD, you don't magically get a v4 socket, too. 2.2.12 gained the feature of listening on multiple sockets, but the syntax changed: -address = :: -port = 4971 +listen = 0.0.0.0:4971 +listen = :::4971 max_children = 5 -status_address = localhost -status_port = 4972 +listen_status = 127.0.0.1:5972 +listen_status = ::1:5972 max_status_children = 5 I tried these combinations: server: 2.1.28 client: 2.2.12 server: 2.2.12 client: 2.1.28 (it warns that the client should be updated) server: 2.2.12 client: 2.2.12 So it seems like we could drop 2.1 once this is in. OKs, further tests? -- I'm not entirely sure you are real. burp-2.2.tgz Description: Binary data
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2018/11/25 03:09:25 Modified files: multimedia/mpv : Makefile Log message: Factorize the waf commands into a DO_WAF variable to simplify Makefile. from kn@ via Brad
Re: UPDATE: textproc/ripgrep-0.10.0 (with request for help)
Hi Edward,
On Sat, Nov 24, 2018 at 05:59:15PM -0600, Edward Lopez-Acosta wrote:
> Version bump.
>
> I had to remove the pledge patch as the code was majorly changed and it no
> longer applied. I spent a couple hours trying to figure out where to apply
> pledge into the updated code, but got stuck. Would someone be willing to
> help with this please?
I think it is fine to remove pledge() and look to re-add it later (if possible).
For now, I will focus on the port update without pledge (so the "uses
pledge()" comment could be removed for now).
> Otherwise:
>
> Builds and runs successfully on amd64.
> No maintainer listed in Makefile.
> Nothing depends on this [1]
> All tests pass [2]
it is on the right road.
> Required crate versions match Cargo.lock [3]
> https://github.com/BurntSushi/ripgrep/blob/master/Cargo.lock
how do you update the list of MODCARGO_CRATES in Makefile ?
port infrastructure has tools for helping regenerating MODCARGO_CRATES
lines.
on port-modules(5) man-page, see modcargo-gen-crates and
modcargo-gen-crates-licenses targets.
note the usage could be a bit tricky...
$ edit Makefile #remove all MODCARGO_CRATES lines
$ make clean && make patch
$ make modcargo-gen-crates > list
$ edit Makefile #include the list
$ make makesum
$ make clean && make patch
$ make modcargo-gen-crates-licenses > list
$ edit Makefile #replace all MODCARGO_CRATES by list
> Ok?
Just a detail: if you are not a commiter, avoid asking for "ok". It is
usually used by an openbsd developer to ask review from another commiter,
in order to commit the change.
Regarding the diff itself, some questions.
> diff --git a/textproc/ripgrep/Makefile b/textproc/ripgrep/Makefile
> index 16d2c678d98..c8f3ea47967 100644
> --- a/textproc/ripgrep/Makefile
> +++ b/textproc/ripgrep/Makefile
> @@ -22,53 +21,6 @@ MODULES = devel/cargo
> BUILD_DEPENDS = lang/rust>=1.20 \
> textproc/asciidoc
>
> -MODCARGO_CRATES += aho-corasick-0.6.4 # Unlicense/MIT
> [...]
> -MODCARGO_CRATES += wincolor-0.1.6 # Unlicense/MIT
> -CONFIGURE_STYLE =cargo
does the remove of CONFIGURE_STYLE is intented ?
without, the build will use network for retrieving dependencies.
$ make
[...]
===> Building for ripgrep-0.10.0
Updating crates.io index
warning: spurious network error (2 tries remaining): curl error: Could
not resolve host: github.com
; class=Net (12)
warning: spurious network error (1 tries remaining): curl error: Could
not resolve host: github.com
; class=Net (12)
error: failed to fetch `https://github.com/rust-lang/crates.io-index`
Caused by:
curl error: Could not resolve host: github.com
; class=Net (12)
> PATCHORIG = .openbsd.orig
> SEPARATE_BUILD = Yes
> @@ -78,6 +30,92 @@ MODCARGO_RUSTFLAGS = -C debuginfo=0
> RELEASE_DIR =${MODCARGO_TARGET_DIR}/release
> OUT_DIR =${RELEASE_DIR}/build/ripgrep-*/out
>
> +MODCARGO_CRATES += aho-corasick-0.6.8# Unilicense/MIT
> +MODCARGO_CRATES += arrayvec-0.4.7# MIT/Apache2.0
> [...]
and why moving MODCARGO_CRATES to the end ?
it doesn't help to review what changed and what is the same.
please avoid it if not necessary.
Thanks.
--
Sebastien Marie
Re: update git to 2.19.2
On 11/25/18 12:09 AM, Klemens Nanni wrote:
Lots of small changes, nothing big/critical.
https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/2.19.2.txt
Works.
Sort RDEP while here.
OK?
ok benoit@
Index: Makefile
===
RCS file: /cvs/ports/devel/git/Makefile,v
retrieving revision 1.194
diff -u -p -r1.194 Makefile
--- Makefile5 Oct 2018 21:54:41 - 1.194
+++ Makefile24 Nov 2018 23:01:36 -
@@ -4,7 +4,7 @@ COMMENT-main = GIT - Tree History Storag
COMMENT-svn = GIT - subversion interoperability tools
COMMENT-x11 = GIT - graphical tools
-V = 2.19.1
+V =2.19.2
DISTNAME =git-${V}
PKGNAME-main =${DISTNAME}
PKGNAME-svn = git-svn-${V}
@@ -42,8 +42,8 @@ MULTI_PACKAGES = -main -svn -x11
WANTLIB-main =c crypto curl expat iconv intl pthread ssl z
RUN_DEPENDS-main = net/rsync \
- devel/p5-Error \
- devel/cvsps
+ devel/cvsps \
+ devel/p5-Error
LIB_DEPENDS-main =devel/gettext \
net/curl
Index: distinfo
===
RCS file: /cvs/ports/devel/git/distinfo,v
retrieving revision 1.147
diff -u -p -r1.147 distinfo
--- distinfo5 Oct 2018 21:54:41 - 1.147
+++ distinfo24 Nov 2018 22:56:41 -
@@ -1,4 +1,4 @@
-SHA256 (git-2.19.1.tar.gz) = 7E3JZFZhLGW/bZRM7prGQBRexyRTdoMreBywPpfLt5Y=
-SHA256 (git-manpages-2.19.1.tar.gz) =
vSf1jckKZh4wgLlzZetzIr+hhd6VY0/FnZgxGSWn2JQ=
-SIZE (git-2.19.1.tar.gz) = 7708143
-SIZE (git-manpages-2.19.1.tar.gz) = 702313
+SHA256 (git-2.19.2.tar.gz) = 24k61pyayUmLCWd8WDl4frous7fvK8ML+6fmLnfPeFA=
+SHA256 (git-manpages-2.19.2.tar.gz) =
YDNOzVnuEDGa9KeBUXTRCZHRr6us07MSnVifA4vyVUI=
+SIZE (git-2.19.2.tar.gz) = 7720555
+SIZE (git-manpages-2.19.2.tar.gz) = 702847
