Re: Help update port 'mail/mlmmj' to the latest 1.3.0
On 17-11-02 10:04:23, Zhang Huangbin wrote: > > > On Nov 1, 2017, at 11:48 PM, viq wrote: > > > > If that was done in a CVS checkout, now run 'cvs diff -Nrud' and attach > > the result to mail to ports@ :) > > Thanks for the instruction. > > I checkout the CVS version today and generate a patch with ‘cvs diff -Naud’. > Note: the diff it generated didn’t mention directory ‘patches/‘ was removed. Ah, then you need `cvs rm` for each of the patch files.
[update] py-sql + python3
Hi,
The following diff updates py-sql from 0.8 to 0.9.
ChangeLog: Version 0.9 - 2017-04-24
- Add distinct_on on Select
- Allow to use Select as Column of Select query
- Support Select without from clause
I also added python3 flavor.
Thanks.
--
Sebastien Marie
Index: Makefile
===
RCS file: /cvs/ports/databases/py-sql/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- Makefile8 Jan 2016 13:07:34 - 1.7
+++ Makefile2 Nov 2017 08:31:47 -
@@ -2,10 +2,9 @@
COMMENT= library to write SQL queries
-MODPY_EGG_VERSION =0.8
+MODPY_EGG_VERSION =0.9
DISTNAME= python-sql-${MODPY_EGG_VERSION}
PKGNAME= py-sql-${MODPY_EGG_VERSION}
-REVISION= 1
CATEGORIES=databases
@@ -17,5 +16,8 @@ PERMIT_PACKAGE_CDROM= Yes
MODULES= lang/python
MODPY_SETUPTOOLS= Yes
+
+FLAVOR?=
+FLAVORS= python3
.include
Index: distinfo
===
RCS file: /cvs/ports/databases/py-sql/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo21 Sep 2015 08:32:35 - 1.3
+++ distinfo2 Nov 2017 08:31:47 -
@@ -1,2 +1,2 @@
-SHA256 (python-sql-0.8.tar.gz) = Ag7XjnfwMh8w5A9OMW6USySjuZXOavbuwtjhrtNIM3Y=
-SIZE (python-sql-0.8.tar.gz) = 29853
+SHA256 (python-sql-0.9.tar.gz) = B7Ucwcl371SA/mccrlB1rUtopvxn9FaXguBvASRW01w=
+SIZE (python-sql-0.9.tar.gz) = 30219
Index: pkg/PLIST
===
RCS file: /cvs/ports/databases/py-sql/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- pkg/PLIST 19 Sep 2015 10:52:58 - 1.2
+++ pkg/PLIST 2 Nov 2017 08:31:47 -
@@ -6,59 +6,61 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/python_sql-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
lib/python${MODPY_VERSION}/site-packages/sql/
lib/python${MODPY_VERSION}/site-packages/sql/__init__.py
-lib/python${MODPY_VERSION}/site-packages/sql/__init__.pyc
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sql/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sql/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sql/${MODPY_PYCACHE}aggregate.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sql/${MODPY_PYCACHE}conditionals.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sql/${MODPY_PYCACHE}functions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sql/${MODPY_PYCACHE}operators.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/sql/aggregate.py
-lib/python${MODPY_VERSION}/site-packages/sql/aggregate.pyc
lib/python${MODPY_VERSION}/site-packages/sql/conditionals.py
-lib/python${MODPY_VERSION}/site-packages/sql/conditionals.pyc
lib/python${MODPY_VERSION}/site-packages/sql/functions.py
-lib/python${MODPY_VERSION}/site-packages/sql/functions.pyc
lib/python${MODPY_VERSION}/site-packages/sql/operators.py
-lib/python${MODPY_VERSION}/site-packages/sql/operators.pyc
lib/python${MODPY_VERSION}/site-packages/sql/tests/
lib/python${MODPY_VERSION}/site-packages/sql/tests/__init__.py
-lib/python${MODPY_VERSION}/site-packages/sql/tests/__init__.pyc
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sql/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sql/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sql/tests/${MODPY_PYCACHE}test_aggregate.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sql/tests/${MODPY_PYCACHE}test_alias.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sql/tests/${MODPY_PYCACHE}test_as.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sql/tests/${MODPY_PYCACHE}test_cast.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sql/tests/${MODPY_PYCACHE}test_column.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sql/tests/${MODPY_PYCACHE}test_combining_query.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sql/tests/${MODPY_PYCACHE}test_conditionals.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sql/tests/${MODPY_PYCACHE}test_delete.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sql/tests/${MODPY_PYCACHE}test_for.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sql/tests/${MODPY_PYCACHE}test_functions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sql/tests/${MODPY_PYCACHE}test_insert.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sql/tests/${MODPY_PYCACHE}test_join.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sql/tests/${MODPY_PYCACHE}test_lateral.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/si
Re: security/gpgme (needs help)
On Wed, Nov 01, 2017 at 05:53:43PM +0100, Rafael Sadowski wrote:
> Hi porters,
>
> I need help with the gpgme update. Special thing here, I need the Qt
> bindings because kde-applications/gpgmepp is dead and all dependent
> programs work with gpgme-qt now.
Not really going to help you on the actual issue, but for consistency:
>
> -COMMENT= GnuPG Made Easy
> +COMMENT-main=GnuPG Made Easy
> +COMMENT-qt= Qt bindings for GPGme
> +COMMENT-py2= Python 2 bindings for GPGme
> +COMMENT-py3= Python 3 bindings for GPGme
Use -python and -python3 ?
> +
> +V = 1.9.0
> +DISTNAME=gpgme-$V
> +
> +PKGNAME-main = ${PKGNAME}
> +PKGNAME-qt= gpgme-qt-$V
> +PKGNAME-py2= gpgme-py2-$V
> +PKGNAME-py3= gpgme-py3-$V
That should be py-gpgme and py3-gpgme.
Re: correct PLIST for devel/py-future with Python 2
On Tuesday, October 31, 2017 20:56 CET, Remi Pointel wrote: > Hi, > > I have a problem to use py-future in Python 2, it seems that not all > files are installed. > > Are you ok with this diff? how could I miss that, py3 FLAVOR still works for me, OK sebastia@ > > Cheers, > > Remi.
UPDATE: math/octave
comments welcome.
can someone try to build this on something else than amd64?
Index: Makefile
===
RCS file: /cvs/ports/math/octave/Makefile,v
retrieving revision 1.97
diff -u -p -u -r1.97 Makefile
--- Makefile30 Oct 2017 13:55:10 - 1.97
+++ Makefile2 Nov 2017 09:30:57 -
@@ -2,14 +2,13 @@
COMMENT = high-level language for numerical computations
-VERSION = 4.0.2
+VERSION = 4.2.1
DISTNAME = octave-${VERSION}
-REVISION = 6
CATEGORIES = math
-SHARED_LIBS += octave 7.0 # 3.0
-SHARED_LIBS += octgui 1.0 # 1.0
-SHARED_LIBS += octinterp 6.0 # 3.0
+SHARED_LIBS += octave 8.0
+SHARED_LIBS += octgui 2.0
+SHARED_LIBS += octinterp 7.0
HOMEPAGE = https://www.gnu.org/software/octave/
@@ -19,22 +18,26 @@ MAINTAINER =Steven Mestdagh &6; }
+ ;;
+ 5)
+ QT_MODULES="Qt5Core Qt5Gui Qt5Network Qt5OpenGL Qt5PrintSupport"
+- octave_qscintilla_libnames="qscintilla2-qt5 qt5scintilla2"
++ octave_qscintilla_libnames="qscintilla2_qt5 qt5scintilla2"
+ ;;
+ *)
+ as_fn_error $? "Unrecognized Qt version $qt_version" "$LINENO" 5
+@@ -44617,13 +44617,13 @@ fi
ac_octave_save_LIBS="$LIBS"
LIBS="$TERM_LIBS"
@@ -21,7 +31,7 @@ Use GNU readline as our base readline la
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-@@ -39804,7 +39804,7 @@ fi
+@@ -44662,7 +44662,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result:
$ac_cv_lib_readline_rl_set_keyboard_input_timeout" >&5
$as_echo "$ac_cv_lib_readline_rl_set_keyboard_input_timeout" >&6; }
if test "x$ac_cv_lib_readline_rl_set_keyboard_input_timeout" = xyes; then :
Index: patches/patch-doc_interpreter_Makefile_in
===
RCS file: patches/patch-doc_interpreter_Makefile_in
diff -N patches/patch-doc_interpreter_Makefile_in
--- patches/patch-doc_interpreter_Makefile_in 22 Apr 2016 17:21:39 -
1.8
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,13 +0,0 @@
-$OpenBSD: patch-doc_interpreter_Makefile_in,v 1.8 2016/04/22 17:21:39 steven
Exp $
-avoid rebuilding info file
doc/interpreter/Makefile.in.orig Thu Apr 21 11:13:33 2016
-+++ doc/interpreter/Makefile.inThu Apr 21 11:13:47 2016
-@@ -2494,7 +2494,7 @@ install-html-am: $(HTMLS)
- done; }
- install-info: install-info-am
-
--install-info-am: $(INFO_DEPS)
-+install-info-am:
- @$(NORMAL_INSTALL)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- list='$(INFO_DEPS)'; test -n "$(infodir)" || list=; \
Index: patches/patch-doc_liboctave_Makefile_in
===
RCS file: patches/patch-doc_liboctave_Makefile_in
diff -N patches/patch-doc_liboctave_Makefile_in
--- patches/patch-doc_liboctave_Makefile_in 22 Apr 2016 17:21:39 -
1.8
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,13 +0,0 @@
-$OpenBSD: patch-doc_liboctave_Makefile_in,v 1.8 2016/04/22 17:21:39 steven Exp
$
-avoid rebuilding info file
doc/liboctave/Makefile.in.orig Thu Apr 21 12:39:41 2016
-+++ doc/liboctave/Makefile.in Thu Apr 21 12:39:59 2016
-@@ -2238,7 +2238,7 @@ install-html-am: $(HTMLS)
- done; }
- install-info: install-info-am
-
--install-info-am: $(INFO_DEPS)
-+install-info-am:
- @$(NORMAL_INSTALL)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- list='$(INFO_DEPS)'; test -n "$(infodir)" || list=; \
Index: patches/patch-liboctave_system_file-stat_cc
===
RCS file: patches/patch-liboctave_system_file-stat_cc
diff -N patches/patch-liboctave_system_file-stat_cc
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-liboctave_system_file-stat_cc 2 Nov 2017 09:30:57 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: liboctave/system/file-stat.cc
+--- liboctave/system/file-stat.cc.orig
liboctave/system/file-stat.cc
+@@ -174,7 +174,7 @@ namespace octave
+ update_internal ();
+ }
+
+-inline file_stat::~file_stat () { }
++file_stat::~file_stat () { }
+
+ void
+ file_stat::update_internal (bool force)
Index: patches/patch-scripts_pkg_private_configure_make_m
===
RCS file:
/cvs/ports/math/octave/patches/patch-scripts_pkg_private_configure_make_m,v
retrieving revision 1.1
diff -u -p -u -r1.1 patch-scripts_pkg_private_configure_make_m
--- patches/patch-scripts_pkg_private_configure_make_m 24 Jul 2015 14:54:01
- 1.1
+++ patches/patch-scripts_pkg_private_configure_make_m 2 Nov 2017 09:30:57
-
@@ -1,7 +1,8 @@
-$OpenBSD: patch-scripts_pkg_private_configure_make_m,v 1.1 2015/07/24 14:54:01
feinerer Exp $
scripts/pkg/private/configure_make.m.orig Thu Jul 23 12:27:30 2015
-+++ scripts/pkg/private/configure_make.m Thu Jul 23 12:27:15 2015
-
add relwithdebinfo support to cmake.port.mk ?
Hi,
i needed this for qgis which is a huge behemoth, and i dont want to
build it with fullblown debug... so is there any interest in the
following diff, or the way to specify (ie use
MODCMAKE_BUILD_TYPE=RelWithDebInfo in consumer Makefile) it looks wrong ?
Index: cmake.port.mk
===
RCS file: /cvs/ports/devel/cmake/cmake.port.mk,v
retrieving revision 1.58
diff -u -r1.58 cmake.port.mk
--- cmake.port.mk 29 Apr 2016 10:34:33 - 1.58
+++ cmake.port.mk 2 Nov 2017 09:59:29 -
@@ -78,6 +78,9 @@
.if defined(DEBUG)
CONFIGURE_ARGS += -DCMAKE_BUILD_TYPE:String=Debug
MODCMAKE_BUILD_SUFFIX =-debug.cmake
+.elif ${MODCMAKE_BUILD_TYPE:L} == "relwithdebinfo"
+CONFIGURE_ARGS += -DCMAKE_BUILD_TYPE:String=RelWithDebInfo
+MODCMAKE_BUILD_SUFFIX =-release.cmake
.else
CONFIGURE_ARGS += -DCMAKE_BUILD_TYPE:String=Release
MODCMAKE_BUILD_SUFFIX =-release.cmake
Re: add relwithdebinfo support to cmake.port.mk ?
On 2017/11/02 11:01, Landry Breuil wrote:
> Hi,
>
> i needed this for qgis which is a huge behemoth, and i dont want to
> build it with fullblown debug... so is there any interest in the
> following diff, or the way to specify (ie use
> MODCMAKE_BUILD_TYPE=RelWithDebInfo in consumer Makefile) it looks wrong ?
How about this?
Index: cmake.port.mk
===
RCS file: /cvs/ports/devel/cmake/cmake.port.mk,v
retrieving revision 1.58
diff -u -p -r1.58 cmake.port.mk
--- cmake.port.mk 29 Apr 2016 10:34:33 - 1.58
+++ cmake.port.mk 2 Nov 2017 10:25:44 -
@@ -75,12 +75,14 @@ MODCMAKE_configure= cd ${WRKBUILD} && ${
-DCMAKE_SKIP_INSTALL_ALL_DEPENDENCY:Bool=True \
-G ${_MODCMAKE_GEN} ${CONFIGURE_ARGS} ${WRKSRC}
-.if defined(DEBUG)
+.if ! ${CONFIGURE_ARGS:M*CMAKE_BUILD_TYPE*}
+. if defined(DEBUG)
CONFIGURE_ARGS += -DCMAKE_BUILD_TYPE:String=Debug
MODCMAKE_BUILD_SUFFIX =-debug.cmake
-.else
+. else
CONFIGURE_ARGS += -DCMAKE_BUILD_TYPE:String=Release
MODCMAKE_BUILD_SUFFIX =-release.cmake
+. endif
.endif
SUBST_VARS += MODCMAKE_BUILD_SUFFIX
Re: add relwithdebinfo support to cmake.port.mk ?
On Thu, Nov 02, 2017 at 10:26:02AM +, Stuart Henderson wrote: > On 2017/11/02 11:01, Landry Breuil wrote: > > Hi, > > > > i needed this for qgis which is a huge behemoth, and i dont want to > > build it with fullblown debug... so is there any interest in the > > following diff, or the way to specify (ie use > > MODCMAKE_BUILD_TYPE=RelWithDebInfo in consumer Makefile) it looks wrong ? > > How about this? Much betterer. Allows me to add -DCMAKE_BUILD_TYPE:String=RelWithDebInfo to CONFIGURE_ARGS... but then, i'm afraid MODCMAKE_BUILD_SUFFIX is undefined :)
Re: add relwithdebinfo support to cmake.port.mk ?
On 2017/11/02 11:40, Landry Breuil wrote: > On Thu, Nov 02, 2017 at 10:26:02AM +, Stuart Henderson wrote: > > On 2017/11/02 11:01, Landry Breuil wrote: > > > Hi, > > > > > > i needed this for qgis which is a huge behemoth, and i dont want to > > > build it with fullblown debug... so is there any interest in the > > > following diff, or the way to specify (ie use > > > MODCMAKE_BUILD_TYPE=RelWithDebInfo in consumer Makefile) it looks wrong ? > > > > How about this? > > Much betterer. Allows me to add -DCMAKE_BUILD_TYPE:String=RelWithDebInfo > to CONFIGURE_ARGS... but then, i'm afraid MODCMAKE_BUILD_SUFFIX is > undefined :) > I think that's OK isn't it? If you're taking control of build type in a port, it's reasonable that you handle that part yourself.
Re: add relwithdebinfo support to cmake.port.mk ?
On Thu, Nov 02, 2017 at 10:48:15AM +, Stuart Henderson wrote: > On 2017/11/02 11:40, Landry Breuil wrote: > > On Thu, Nov 02, 2017 at 10:26:02AM +, Stuart Henderson wrote: > > > On 2017/11/02 11:01, Landry Breuil wrote: > > > > Hi, > > > > > > > > i needed this for qgis which is a huge behemoth, and i dont want to > > > > build it with fullblown debug... so is there any interest in the > > > > following diff, or the way to specify (ie use > > > > MODCMAKE_BUILD_TYPE=RelWithDebInfo in consumer Makefile) it looks wrong > > > > ? > > > > > > How about this? > > > > Much betterer. Allows me to add -DCMAKE_BUILD_TYPE:String=RelWithDebInfo > > to CONFIGURE_ARGS... but then, i'm afraid MODCMAKE_BUILD_SUFFIX is > > undefined :) > > > > I think that's OK isn't it? If you're taking control of build type in a port, > it's reasonable that you handle that part yourself. Right. ok with your diff then :)
Re: Update: PostgreSQL 9.6.5 -> 10.0
On 2017/11/01 11:26, Jeremy Evans wrote: > Included at the bottom are necessary bumps for postgresql-pllua > and postgresql-plv8, since those always depend on specific > PostgreSQL versions. You can set "PKGSPEC-server=postgresql-server->=10,<11" in postgresql-server then this will happen automatically, you won't need to bump dependencies.
Re: add relwithdebinfo support to cmake.port.mk ?
On Thu, Nov 02 2017, Stuart Henderson wrote: > On 2017/11/02 11:40, Landry Breuil wrote: >> On Thu, Nov 02, 2017 at 10:26:02AM +, Stuart Henderson wrote: >> > On 2017/11/02 11:01, Landry Breuil wrote: >> > > Hi, >> > > >> > > i needed this for qgis which is a huge behemoth, and i dont want to >> > > build it with fullblown debug... so is there any interest in the >> > > following diff, or the way to specify (ie use >> > > MODCMAKE_BUILD_TYPE=RelWithDebInfo in consumer Makefile) it looks wrong ? >> > >> > How about this? >> >> Much betterer. Allows me to add -DCMAKE_BUILD_TYPE:String=RelWithDebInfo >> to CONFIGURE_ARGS... but then, i'm afraid MODCMAKE_BUILD_SUFFIX is >> undefined :) >> > > I think that's OK isn't it? If you're taking control of build type in a port, > it's reasonable that you handle that part yourself. Yep. I would propose to use -DCMAKE_BUILD_TYPE:String=Release even for DEBUG builds, for the same reason (but your diff looks fine as is). -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Add headers_more subpackage to nginx
This adds the headers-more module as an nginx subpackage. This module
extends nginx's default http headers module by allowing headers to be
set and cleared instead of just added.
Homepage for this module is:
https://github.com/openresty/headers-more-nginx-module
Among other things, it appears this module is necessary to correctly
proxy HTTP traffic for Microsoft Exchange.
Tested on amd64 making sure setting/clearing of request/response headers
works as advertised when proxying.
While here, bump the passenger subpackage and make sure it is buildable
after the default ruby version change.
OK?
Thanks,
Jeremy
Index: Makefile
===
RCS file: /cvs/ports/www/nginx/Makefile,v
retrieving revision 1.113
diff -u -p -u -p -r1.113 Makefile
--- Makefile27 Jul 2017 22:01:58 - 1.113
+++ Makefile2 Nov 2017 11:40:36 -
@@ -11,6 +11,7 @@ COMMENT-mailproxy=nginx mail proxy modu
COMMENT-stream=nginx TCP/UDP proxy module
COMMENT-naxsi= nginx web application firewall module
COMMENT-lua= nginx lua scripting module
+COMMENT-headers_more= nginx module for setting/adding/clearing headers
COMMENT-perl= nginx perl scripting module
COMMENT-passenger= nginx passenger (ruby/python/nodejs) integration module
@@ -26,19 +27,24 @@ PKGNAME-mailproxy= nginx-mailproxy-${VE
PKGNAME-stream=nginx-stream-${VERSION}
PKGNAME-naxsi= nginx-naxsi-${VERSION}
PKGNAME-lua= nginx-lua-${VERSION}
+PKGNAME-headers_more= nginx-headers-more-${VERSION}
PKGNAME-perl= nginx-perl-${VERSION}
PKGNAME-passenger= nginx-passenger-${VERSION}
+REVISION-passenger=0
+
MASTER_SITES= https://nginx.org/download/
MASTER_SITES0= https://github.com/simpl/ngx_devel_kit/archive/
MASTER_SITES1= https://github.com/nbs-system/naxsi/archive/
MASTER_SITES2= https://github.com/openresty/lua-nginx-module/archive/
MASTER_SITES3=
https://raw.githubusercontent.com/rnagy/nginx_chroot_patch/master/
+MASTER_SITES4= https://github.com/openresty/headers-more-nginx-module/archive/
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
ngx_devel_kit-v0.3.0.tar.gz{v0.3.0.tar.gz}:0 \
naxsi-0.55.1.tar.gz{0.55.1.tar.gz}:1 \
- lua-nginx-module-v0.10.6.tar.gz{v0.10.6.tar.gz}:2
+ lua-nginx-module-v0.10.6.tar.gz{v0.10.6.tar.gz}:2 \
+ headers-more-nginx-module-v0.32.tar.gz{v0.32.tar.gz}:4
HOMEPAGE= http://nginx.org/
@@ -50,7 +56,8 @@ PERMIT_PACKAGE_CDROM= yes
# XXX -lua removed following libressl api change; re-add to
# MULTI_PACKAGES when this is worked-around
-MULTI_PACKAGES = -main -image_filter -geoip -xslt -mailproxy -stream
-naxsi -perl -passenger # -lua
+MULTI_PACKAGES = -main -image_filter -geoip -xslt -mailproxy -stream \
+ -naxsi -perl -passenger -headers_more # -lua
FLAVOR ?=
PSEUDO_FLAVORS = no_lua
@@ -65,6 +72,7 @@ WANTLIB-geoip=GeoIP
WANTLIB-xslt= exslt xml2 xslt
WANTLIB-naxsi=
WANTLIB-lua= ${MODLUA_WANTLIB} m
+WANTLIB-headers_more=
WANTLIB-perl= c m perl
WANTLIB-passenger= m pthread ${COMPILER_LIBCXX}
@@ -84,9 +92,10 @@ RUN_DEPENDS-geoip= www/nginx,-main=${VER
RUN_DEPENDS-xslt= www/nginx,-main=${VERSION}
RUN_DEPENDS-naxsi= www/nginx,-main=${VERSION}
RUN_DEPENDS-lua= www/nginx,-main=${VERSION}
+RUN_DEPENDS-headers_more=www/nginx,-main=${VERSION}
RUN_DEPENDS-perl= www/nginx,-main=${VERSION}
RUN_DEPENDS-passenger= www/nginx,-main=${VERSION} \
-
ruby-passenger-*|ruby21-passenger-*|ruby22-passenger-*|ruby23-passenger-*:www/ruby-passenger
+ ruby23-passenger-*|ruby24-passenger-*:www/ruby-passenger
NGINX_DIR= /var/www
SUBST_VARS=NGINX_DIR
@@ -98,6 +107,7 @@ PREFIX-image_filter= ${NGINX_MODULES_DIR
PREFIX-geoip= ${NGINX_MODULES_DIR}
PREFIX-xslt= ${NGINX_MODULES_DIR}
PREFIX-lua=${NGINX_MODULES_DIR}
+PREFIX-headers_more= ${NGINX_MODULES_DIR}
PREFIX-passenger= ${NGINX_MODULES_DIR}
CFLAGS+= -Wall -Wpointer-arith \
@@ -151,6 +161,7 @@ CONFIGURE_ARGS+=--prefix=${NGINX_DIR} \
--with-stream=dynamic \
--add-dynamic-module=${WRKSRC}/naxsi/naxsi_src/ \
--add-dynamic-module=${WRKSRC}/ngx_devel_kit \
+
--add-dynamic-module=${WRKSRC}/headers-more-nginx-module \
--add-dynamic-module=${LOCALBASE}/lib/phusion-passenger${GEM_BIN_SUFFIX}/src/nginx_module
SUBSTFILES=conf/nginx.conf \
@@ -164,7 +175,8 @@ pre-patch:
mv ../naxsi-* naxsi
cd ${WRKSRC} && \
mv ../ngx_devel_kit-* ngx_devel_kit && \
- mv ../lua-nginx-module-* lua-nginx-module
+ mv ../lua-nginx-module-* lua-nginx-module && \
+ mv ../headers-
Re: Add headers_more subpackage to nginx
On 2017/11/02 04:43, Jeremy Evans wrote: > This adds the headers-more module as an nginx subpackage. This module > extends nginx's default http headers module by allowing headers to be > set and cleared instead of just added. > > Homepage for this module is: > https://github.com/openresty/headers-more-nginx-module > > Among other things, it appears this module is necessary to correctly > proxy HTTP traffic for Microsoft Exchange. > > Tested on amd64 making sure setting/clearing of request/response headers > works as advertised when proxying. > > While here, bump the passenger subpackage and make sure it is buildable > after the default ruby version change. > > OK? OK with me. headers_more parts are pretty similar to what I have locally.
py-polib python3 FLAVOR
Hi,
The following diff adds a python3 FLAVOR to py-polib.
I added devel/gettext-tools to BUILD_DEPENDS whereas it is only required
on TEST_DEPENDS. but bsd.port.mk poison it if not present on
BUILD_DEPENDS.
Thanks.
--
Sebastien Marie
Index: Makefile
===
RCS file: /cvs/ports/textproc/py-polib/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- Makefile8 Jan 2016 13:17:15 - 1.10
+++ Makefile2 Nov 2017 12:50:36 -
@@ -5,7 +5,7 @@ COMMENT=Python library to manipulate ge
MODPY_EGG_VERSION =1.0.6
DISTNAME = polib-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
-REVISION = 1
+REVISION = 2
CATEGORIES=textproc devel
@@ -18,7 +18,18 @@ MODPY_PI=Yes
MODPY_SETUPTOOLS = Yes
-TEST_DEPENDS = devel/py-coverage
+FLAVOR ?=
+FLAVORS = python3
+
+# only used on test, but poisoned if not in BUILD_DEPENDS
+BUILD_DEPENDS =devel/gettext-tools
+
+TEST_DEPENDS = devel/py-coverage${MODPY_FLAVOR}
+
+SUBST_VARS += MODPY_MAJOR_VERSION
+
+post-patch:
+ ${SUBST_CMD} ${WRKSRC}/runtests.sh
do-test: fake
@cd ${WRKSRC} && ${MAKE_ENV} ./runtests.sh
Index: patches/patch-runtests_sh
===
RCS file: patches/patch-runtests_sh
diff -N patches/patch-runtests_sh
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-runtests_sh 2 Nov 2017 12:50:36 -
@@ -0,0 +1,16 @@
+$OpenBSD$
+use the right version of coverage
+Index: runtests.sh
+--- runtests.sh.orig
runtests.sh
+@@ -1,7 +1,7 @@
+ #!/bin/sh
+-if which coverage > /dev/null; then
+-coverage run tests/tests.py
+-coverage report
++if which coverage${MODPY_MAJOR_VERSION} > /dev/null; then
++coverage${MODPY_MAJOR_VERSION} run tests/tests.py
++coverage${MODPY_MAJOR_VERSION} report
+ else
+ /usr/bin/env python tests/tests.py
+ fi
Index: pkg/PLIST
===
RCS file: /cvs/ports/textproc/py-polib/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- pkg/PLIST 11 Jun 2015 11:44:01 - 1.2
+++ pkg/PLIST 2 Nov 2017 12:50:36 -
@@ -1,8 +1,8 @@
@comment $OpenBSD: PLIST,v 1.2 2015/06/11 11:44:01 jasper Exp $
+lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}polib.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/polib-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
lib/python${MODPY_VERSION}/site-packages/polib-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
lib/python${MODPY_VERSION}/site-packages/polib-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
lib/python${MODPY_VERSION}/site-packages/polib-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
lib/python${MODPY_VERSION}/site-packages/polib-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
lib/python${MODPY_VERSION}/site-packages/polib.py
-lib/python${MODPY_VERSION}/site-packages/polib.pyc
Re: py-polib python3 FLAVOR
On 2017/11/02 13:52, Sebastien Marie wrote: > Hi, > > The following diff adds a python3 FLAVOR to py-polib. > > I added devel/gettext-tools to BUILD_DEPENDS whereas it is only required > on TEST_DEPENDS. but bsd.port.mk poison it if not present on > BUILD_DEPENDS. Thanks, committed. I considered changing the poison instead of the workaround, but then we won't notice if a TEST_DEPENDS=gettext-tools port starts using it during build,
[UPDATE] sysutils/libfsntfs
Hi,
this is the diff to update libfsntfs to latest release.
Ok?
Cheers,
Remi.Index: Makefile
===
RCS file: /cvs/ports/sysutils/libfsntfs/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 Makefile
--- Makefile 12 Feb 2017 10:57:34 - 1.1.1.1
+++ Makefile 2 Nov 2017 12:57:46 -
@@ -2,7 +2,7 @@
COMMENT = library and tools to access NTFS
-VERSION = 20160418
+VERSION = 20170315
DISTNAME = libfsntfs-experimental-${VERSION}
PKGNAME = ${DISTNAME:S/-experimental//}
Index: distinfo
===
RCS file: /cvs/ports/sysutils/libfsntfs/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 distinfo
--- distinfo 12 Feb 2017 10:57:34 - 1.1.1.1
+++ distinfo 2 Nov 2017 12:57:46 -
@@ -1,2 +1,2 @@
-SHA256 (libfsntfs-experimental-20160418.tar.gz) = 8SXMZtFqXRBguPCh+Nv2uNiAcP7nPP/rysDs3FiGCJM=
-SIZE (libfsntfs-experimental-20160418.tar.gz) = 1652286
+SHA256 (libfsntfs-experimental-20170315.tar.gz) = 928+zzAuUAIQ0qb7ZvQK9g1SCwn7W5RibU6lgDnj/4U=
+SIZE (libfsntfs-experimental-20170315.tar.gz) = 1685861
Re: security/gpgme (needs help)
Should you promote gpgme-qt to be the default flavor over others FLAVOR ?= should default to no_qt no_python2 no_python3, that is the default as before. Building with qt should be an extra, in fact use of this sort of complex PSEUDO_FLAVOR causes problems especially with something as large as qt5, which means dpb can't be used for build a subset of packages. I dpb tries to build security/gpgme,no_qt,no_py2,no_py3,-main as effectively used by all current ports using gpgme which would have to be changed in the ports tree. The existing dpb xxx/yyy or list that built a subset of packages, this change on seeing reference to security/gpgme will build not only the packages as before, but all the packages for the included modules, that is python2 and sub packages, python3 and sub packages, and the whole of qt5. This is enforcing qt5 on those who don't want and don't need qt5. python2 / python3 I can live with. qt5 I can live without. For those wanting a small light weight system, qt5 - everywhere - everything just isn't what they want. Just why should if we want a small light weight system should we need to go around adding in no_qt,no_py2,no_py3,-main to everything? Maybe here also there would be less objections on my part if dpb didn't try to build every possible flavor, until it does. I suggest using a separate security/qt-gpgme and security/gpgme also strictly python2 and python3 flavor should default to no_qt rather than with qt5. The main choice for python isn't qt5 it's Tk, and a Tk flavor of gpgme would tie in with the use of python2/3. Littering qt5 around just about everything is bad as is the whole qt mind set of having to put anything and everything into it's own wrappers. On 11/01/17 16:53, Rafael Sadowski wrote: > Hi porters, > > I need help with the gpgme update. Special thing here, I need the Qt > bindings because kde-applications/gpgmepp is dead and all dependent > programs work with gpgme-qt now. > > But I always trap into the following link issue: > > libtool: link: cc -shared -fPIC -DPIC -o .libs/libgpgme.so.20.0 > -I/usr/local/include -O2 -pipe -Wall -Wcast-align -Wshadow > -Wstrict-prototypes .libs/conversion.o .libs/b64dec.o .libs/get-env.o > .libs/parsetlv.o .libs/mbox-util.o .libs/data.o .libs/data-fd.o > .libs/data-stream.o .libs/data-mem.o .libs/data-user.o .libs/data-compat.o > .libs/data-identify.o .libs/signers.o .libs/sig-notation.o .libs/wait.o > .libs/wait-global.o .libs/wait-private.o .libs/wait-user.o .libs/op-support.o > .libs/encrypt.o .libs/encrypt-sign.o .libs/decrypt.o .libs/decrypt-verify.o > .libs/verify.o .libs/sign.o .libs/passphrase.o .libs/progress.o .libs/key.o > .libs/keylist.o .libs/keysign.o .libs/trust-item.o .libs/trustlist.o > .libs/tofupolicy.o .libs/import.o .libs/export.o .libs/genkey.o > .libs/delete.o .libs/edit.o .libs/getauditlog.o .libs/opassuan.o > .libs/passwd.o .libs/spawn.o .libs/assuan-support.o .libs/engine.o > .libs/engine-gpg.o .libs/status-table.o .libs/engine-gpgsm.o > .libs/engine-assuan.o .libs/engine-gpgconf.o .libs/engine-uiserver.o > .libs/engine-g13.o .libs/vfs-mount.o .libs/vfs-create.o .libs/engine-spawn.o > .libs/gpgconf.o .libs/queryswdb.o .libs/posix-util.o .libs/posix-io.o > .libs/dirinfo.o .libs/debug.o .libs/gpgme.o .libs/version.o .libs/error.o > .libs/ath.o -L.libs -lassuan -lgpg-error -lintl -liconv > libtool: link: ar cru .libs/libgpgme.a conversion.o b64dec.o get-env.o > parsetlv.o mbox-util.o data.o data-fd.o data-stream.o data-mem.o data-user.o > data-compat.o data-identify.o signers.o sig-notation.o wait.o wait-global.o > wait-private.o wait-user.o op-support.o encrypt.o encrypt-sign.o decrypt.o > decrypt-verify.o verify.o sign.o passphrase.o progress.o key.o keylist.o > keysign.o trust-item.o trustlist.o tofupolicy.o import.o export.o genkey.o > delete.o edit.o getauditlog.o opassuan.o passwd.o spawn.o assuan-support.o > engine.o engine-gpg.o status-table.o engine-gpgsm.o engine-assuan.o > engine-gpgconf.o engine-uiserver.o engine-g13.o vfs-mount.o vfs-create.o > engine-spawn.o gpgconf.o queryswdb.o posix-util.o posix-io.o dirinfo.o > debug.o gpgme.o version.o error.o ath.o > libtool: link: ranlib .libs/libgpgme.a > cc -DHAVE_CONFIG_H -I. -I.. -I/usr/local/include -I/usr/local/include -O2 > -pipe -Wall -Wcast-align -Wshadow -Wstrict-prototypes -MT gpgme-tool.o -MD > -MP -MF .deps/gpgme-tool.Tpo -c -o gpgme-tool.o gpgme-tool.c > mv -f .deps/gpgme-tool.Tpo .deps/gpgme-tool.Po > cc -DHAVE_CONFIG_H -I. -I.. -I/usr/local/include -I/usr/local/include -O2 > -pipe -Wall -Wcast-align -Wshadow -Wstrict-prototypes -MT argparse.o -MD -MP > -MF .deps/argparse.Tpo -c -o argparse.o argparse.c > mv -f .deps/argparse.Tpo .deps/argparse.Po > c++ gpgme-tool.o argparse.o libgpgme.la -lassuan -L/usr/local/lib -lgpg-error > libgpgme.la: file not recognized: File format not recognized > c++: error: linker command failed with exit code 1 (use -v to see invocation) > > Help, Feedback i
add python2 and python3 links
Hi.
We have never provided a default 'python' utility with our packages and for
good reasons. That said, I would really like if we could provide a default
symlink to the default major versions of python. That is: python2 and python3.
The rational behind this is that a lot of upstreams have "fixed" their hardcoded
shebangs from #!/usr/bin/python... to #!/usr/bin/env python2 or
#!/usr/bin/env python3.
This would allow us to drop lots of patches, substitutions and MODPY_ADJ_FILES
from our ports tree and make things easier for us in general.
People willing to use another version as the default major are pretty much on
their own but that's already the case today since we have substituting
everything anyway.
I am putting this into a bulk right now...
What do you guys think?
Index: Makefile.inc
===
RCS file: /cvs/ports/lang/python/Makefile.inc,v
retrieving revision 1.123
diff -u -p -u -p -r1.123 Makefile.inc
--- Makefile.inc16 Jul 2017 19:18:59 - 1.123
+++ Makefile.inc2 Nov 2017 13:49:47 -
@@ -167,6 +167,12 @@ post-install:
${INSTALL_DATA} ${FILESDIR}/CHANGES.OpenBSD \
${PREFIX}/share/doc/python${VERSION}/CHANGES.OpenBSD
+# add a link to the *default* python versions
+.if ${VERSION} == "2.7" || ${VERSION} == "3.6"
+ cd ${PREFIX} && ln -sf python${VERSION} python${VERSION:R}
+.endif
+
+
TEST_TARGET= test
TEST_FLAGS="EXTRATESTOPTS=-w"
# Some regress tests write to $HOME
Index: 2.7/Makefile
===
RCS file: /cvs/ports/lang/python/2.7/Makefile,v
retrieving revision 1.53
diff -u -p -u -p -r1.53 Makefile
--- 2.7/Makefile20 Sep 2017 18:44:48 - 1.53
+++ 2.7/Makefile2 Nov 2017 13:49:47 -
@@ -9,6 +9,7 @@ VERSION = 2.7
PATCHLEVEL = .14
SHARED_LIBS = python2.7 0.0
VERSION_SPEC = >=2.7,<2.8
+REVISION = 0
CONFIGURE_ARGS += --with-ensurepip=no
Index: 2.7/pkg/PLIST-main
===
RCS file: /cvs/ports/lang/python/2.7/pkg/PLIST-main,v
retrieving revision 1.20
diff -u -p -u -p -r1.20 PLIST-main
--- 2.7/pkg/PLIST-main 20 Sep 2017 18:44:48 - 1.20
+++ 2.7/pkg/PLIST-main 2 Nov 2017 13:49:47 -
@@ -14,6 +14,7 @@ bin/pydoc2.7
@comment bin/python-config
@comment bin/python2
@comment bin/python2-config
+bin/python2
@bin bin/python2.7
bin/python2.7-2to3
bin/python2.7-config
Index: 3.6/Makefile
===
RCS file: /cvs/ports/lang/python/3.6/Makefile,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 Makefile
--- 3.6/Makefile15 Oct 2017 16:31:45 - 1.6
+++ 3.6/Makefile2 Nov 2017 13:49:47 -
@@ -9,6 +9,7 @@ VERSION = 3.6
PATCHLEVEL = .3
SHARED_LIBS = python3.6m 0.0
VERSION_SPEC = >=3.6,<3.7
+REVISION = 0
CONFIGURE_ARGS += --with-ensurepip=no
Index: 3.6/pkg/PLIST-main
===
RCS file: /cvs/ports/lang/python/3.6/pkg/PLIST-main,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 PLIST-main
--- 3.6/pkg/PLIST-main 15 Oct 2017 16:31:45 - 1.4
+++ 3.6/pkg/PLIST-main 2 Nov 2017 13:49:47 -
@@ -10,6 +10,7 @@ bin/2to3-3.6
bin/pydoc3.6
@comment @bin bin/python3
@comment bin/python3-config
+bin/python3
@bin bin/python3.6
bin/python3.6-config
@bin bin/python3.6m
--
Antoine
Update xapian from 1.2.15 to 1.4.5
This updates xapian from 1.2.15 to 1.4.5. Among other things, it
adds support for getting snippets in search results.
This also enables the ruby bindings for xapian and builds a
package for them. I've tested the ruby binding on amd64 and it
appears to work correctly including the use of the new snippets
feature.
Looks like the perl module changed from Search/Xapian to just
Xapian.
In xapian-core, I had to disable the use of timer_create, as the
related code actually depends on sigevent(7) which I don't think
is currently supported.
OKs?
Thanks,
Jeremy
Index: databases/xapian-bindings/Makefile
===
RCS file: /cvs/ports/databases/xapian-bindings/Makefile,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 Makefile
--- databases/xapian-bindings/Makefile 23 Sep 2017 10:53:07 - 1.7
+++ databases/xapian-bindings/Makefile 2 Nov 2017 13:41:57 -
@@ -2,18 +2,19 @@
COMMENT-main= perl bindings for Xapian
COMMENT-python=python bindings for Xapian
+COMMENT-ruby= ruby bindings for Xapian
-V= 1.2.15
+V= 1.4.5
DISTNAME= xapian-bindings-${V}
-REVISION-main =3
-REVISION-python = 1
PKGNAME-main= xapian-bindings-perl-${V}
PKGNAME-python=xapian-bindings-python-${V}
+PKGNAME-ruby= ruby${MODRUBY_BINREV}-xapian-${V}
-MODULES= lang/python
+MODULES= lang/python \
+ lang/ruby
-MULTI_PACKAGES=-main -python
+MULTI_PACKAGES=-main -python -ruby
CATEGORIES=databases textproc
@@ -23,16 +24,24 @@ HOMEPAGE= http://xapian.org/
PERMIT_PACKAGE_CDROM= Yes
MASTER_SITES= http://oligarchy.co.uk/xapian/${V}/
+EXTRACT_SUFX= .tar.xz
LIB_DEPENDS= databases/xapian-core
WANTLIB += ${COMPILER_LIBCXX} m uuid z xapian
WANTLIB-main = ${WANTLIB} c perl
+RUN_DEPENDS-ruby = ${MODRUBY_RUN_DEPENDS}
+SUBST_VARS+= MODRUBY_BINREV
+
AUTOCONF_VERSION= 2.68
CONFIGURE_STYLE= autoconf
-CONFIGURE_ARGS=--without-php --without-ruby \
+CONFIGURE_ENV= RUBY="${RUBY}" RDOC="${RUBY:S/ruby/rdoc/}"
+CONFIGURE_ARGS=--without-php \
--without-tcl --without-csharp \
--without-java --without-lua
+
+post-install:
+ mv ${PREFIX}/share/doc/xapian-bindings/ruby{,${MODRUBY_BINREV}}
.include
Index: databases/xapian-bindings/distinfo
===
RCS file: /cvs/ports/databases/xapian-bindings/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 distinfo
--- databases/xapian-bindings/distinfo 5 Apr 2015 21:41:02 - 1.1.1.1
+++ databases/xapian-bindings/distinfo 2 Nov 2017 13:20:41 -
@@ -1,2 +1,2 @@
-SHA256 (xapian-bindings-1.2.15.tar.gz) =
idMMvTjc+52eD8zI5Lp9ZFL/rUWvs/HpYUo74KOjPnc=
-SIZE (xapian-bindings-1.2.15.tar.gz) = 1484058
+SHA256 (xapian-bindings-1.4.5.tar.xz) =
ZHiGcwpxvMDp9mb81wK3FB1OmoLhCF5E60RwYk4anTM=
+SIZE (xapian-bindings-1.4.5.tar.xz) = 1118884
Index: databases/xapian-bindings/patches/patch-perl_Makefile_in
===
RCS file: /cvs/ports/databases/xapian-bindings/patches/patch-perl_Makefile_in,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-perl_Makefile_in
--- databases/xapian-bindings/patches/patch-perl_Makefile_in5 Apr 2015
21:41:02 - 1.1.1.1
+++ databases/xapian-bindings/patches/patch-perl_Makefile_in2 Nov 2017
13:23:16 -
@@ -1,12 +1,13 @@
$OpenBSD: patch-perl_Makefile_in,v 1.1.1.1 2015/04/05 21:41:02 robert Exp $
perl/Makefile.in.orig Sun Apr 5 20:52:56 2015
-+++ perl/Makefile.in Sun Apr 5 20:53:06 2015
-@@ -966,7 +966,7 @@ clean-local:
+Index: perl/Makefile.in
+--- perl/Makefile.in.orig
perl/Makefile.in
+@@ -1480,7 +1480,7 @@ clean-local:
- auto/Search/Xapian/Xapian$(PERL_SO): Xapian.la
- @$(MKDIR_P) auto/Search/Xapian
+ auto/Xapian/Xapian$(PERL_SO): Xapian.la
+ @$(MKDIR_P) auto/Xapian
- $(LIBTOOL) --config > libtoolconfig.tmp
+ $(LIBTOOL) --config | grep -v pic > libtoolconfig.tmp
- . ./libtoolconfig.tmp; cp "$$objdir/Xapian$(PERL_SO)" auto/Search/Xapian
+ . ./libtoolconfig.tmp; cp "$$objdir/Xapian$(PERL_SO)" auto/Xapian
rm -f libtoolconfig.tmp
Index: databases/xapian-bindings/patches/patch-python_Makefile_in
===
RCS file:
/cvs/ports/databases/xapian-bindings/patches/patch-python_Makefile_in,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-python_Makefile_in
--- databases/xapian-bindings/patches/patch-python_Makefile_in 5 Apr 2015
21:41:02 - 1.1.1.1
+++ databases/xapian-bindings/patches/patch-python_Makefile_in 2 Nov 2017
13:23:16 -
@@ -1,12 +1,13 @@
$OpenBSD: patch-python_Makefile_in,v 1.1.1.1 2015/04/05 21:41:02 robert Exp $
python/Makefile.in.origSun Apr 5 20:46
Re: add python2 and python3 links
On Thu, 2 Nov 2017 14:51:09 +0100, Antoine Jacoutot
wrote:
> +.if ${VERSION} == "2.7" || ${VERSION} == "3.6"
Wouldn't it be better to use MODPY_DEFAULT_VERSION_2 and
MODPY_DEFAULT_VERSION_3?
Cheers,
Daniel
Re: add python2 and python3 links
On Thu, Nov 02, 2017 at 02:05:22PM +, Daniel Jakots wrote:
> On Thu, 2 Nov 2017 14:51:09 +0100, Antoine Jacoutot
> wrote:
>
> > +.if ${VERSION} == "2.7" || ${VERSION} == "3.6"
>
> Wouldn't it be better to use MODPY_DEFAULT_VERSION_2 and
> MODPY_DEFAULT_VERSION_3?
python does not use these.
Anyway I have a better diff pending after rpointel feedback.
--
Antoine
Re: add python2 and python3 links
On 2017/11/02 14:51, Antoine Jacoutot wrote: > Hi. > > We have never provided a default 'python' utility with our packages and for > good reasons. That said, I would really like if we could provide a default > symlink to the default major versions of python. That is: python2 and python3. > The rational behind this is that a lot of upstreams have "fixed" their > hardcoded > shebangs from #!/usr/bin/python... to #!/usr/bin/env python2 or > #!/usr/bin/env python3. > This would allow us to drop lots of patches, substitutions and MODPY_ADJ_FILES > from our ports tree and make things easier for us in general. > > People willing to use another version as the default major are pretty much on > their own but that's already the case today since we have substituting > everything anyway. > > I am putting this into a bulk right now... > What do you guys think? Sounds sane to me. Some users may already have their own symlink that they'll have to remove first before they update. Related: what does anyone think about moving these? lang/python/2.7 -> lang/python/2 lang/python/3.6 -> lang/python/3 The further split used to be helpful in the days of 2.4/5/6/7 when they language changed all the time, but it doesn't seem particularly useful these days, and makes version updates (like 3.4 to 3.6) harder due to the bumps.
Re: add python2 and python3 links
On Thu, Nov 02, 2017 at 02:10:21PM +, Stuart Henderson wrote: > On 2017/11/02 14:51, Antoine Jacoutot wrote: > > Hi. > > > > We have never provided a default 'python' utility with our packages and for > > good reasons. That said, I would really like if we could provide a default > > symlink to the default major versions of python. That is: python2 and > > python3. > > The rational behind this is that a lot of upstreams have "fixed" their > > hardcoded > > shebangs from #!/usr/bin/python... to #!/usr/bin/env python2 or > > #!/usr/bin/env python3. > > This would allow us to drop lots of patches, substitutions and > > MODPY_ADJ_FILES > > from our ports tree and make things easier for us in general. > > > > People willing to use another version as the default major are pretty much > > on > > their own but that's already the case today since we have substituting > > everything anyway. > > > > I am putting this into a bulk right now... > > What do you guys think? > > Sounds sane to me. Some users may already have their own symlink that they'll > have to remove first before they update. > > Related: what does anyone think about moving these? > > lang/python/2.7 -> lang/python/2 > lang/python/3.6 -> lang/python/3 > > The further split used to be helpful in the days of 2.4/5/6/7 when they > language > changed all the time, but it doesn't seem particularly useful these days, and > makes > version updates (like 3.4 to 3.6) harder due to the bumps. I fullu support this move. It'll bring us closer to everyone does. -- Antoine
Re: add python2 and python3 links
On 2017/11/02 15:11, Antoine Jacoutot wrote: > On Thu, Nov 02, 2017 at 02:10:21PM +, Stuart Henderson wrote: > > On 2017/11/02 14:51, Antoine Jacoutot wrote: > > > Hi. > > > > > > We have never provided a default 'python' utility with our packages and > > > for > > > good reasons. That said, I would really like if we could provide a default > > > symlink to the default major versions of python. That is: python2 and > > > python3. > > > The rational behind this is that a lot of upstreams have "fixed" their > > > hardcoded > > > shebangs from #!/usr/bin/python... to #!/usr/bin/env python2 or > > > #!/usr/bin/env python3. > > > This would allow us to drop lots of patches, substitutions and > > > MODPY_ADJ_FILES > > > from our ports tree and make things easier for us in general. > > > > > > People willing to use another version as the default major are pretty > > > much on > > > their own but that's already the case today since we have substituting > > > everything anyway. > > > > > > I am putting this into a bulk right now... > > > What do you guys think? > > > > Sounds sane to me. Some users may already have their own symlink that > > they'll > > have to remove first before they update. > > > > Related: what does anyone think about moving these? > > > > lang/python/2.7 -> lang/python/2 > > lang/python/3.6 -> lang/python/3 > > > > The further split used to be helpful in the days of 2.4/5/6/7 when they > > language > > changed all the time, but it doesn't seem particularly useful these days, > > and makes > > version updates (like 3.4 to 3.6) harder due to the bumps. > > I fullu support this move. It'll bring us closer to everyone does. I realised now that it doesn't actually help with bumps because the library filenames change :(
Re: add python2 and python3 links
On Thu, Nov 02, 2017 at 01:51:09PM +, Antoine Jacoutot wrote:
> Hi.
>
> We have never provided a default 'python' utility with our packages and for
> good reasons. That said, I would really like if we could provide a default
> symlink to the default major versions of python. That is: python2 and python3.
> The rational behind this is that a lot of upstreams have "fixed" their
> hardcoded
> shebangs from #!/usr/bin/python... to #!/usr/bin/env python2 or
> #!/usr/bin/env python3.
> This would allow us to drop lots of patches, substitutions and MODPY_ADJ_FILES
> from our ports tree and make things easier for us in general.
>
> People willing to use another version as the default major are pretty much on
> their own but that's already the case today since we have substituting
> everything anyway.
>
> I am putting this into a bulk right now...
> What do you guys think?
Better diff after rpointel's feedback.
Uncomment a few more things to be consistent with what everyone else does.
Going into a bulk soonish.
Index: Makefile.inc
===
RCS file: /cvs/ports/lang/python/Makefile.inc,v
retrieving revision 1.123
diff -u -p -r1.123 Makefile.inc
--- Makefile.inc16 Jul 2017 19:18:59 - 1.123
+++ Makefile.inc2 Nov 2017 14:40:13 -
@@ -158,6 +158,8 @@ post-install:
@sed -e "s,@VERSION@,${VERSION},g" -e "s,@LOCALBASE@,${LOCALBASE},g" \
${FILESDIR}/idle > ${WRKSRC}/idle
${INSTALL_SCRIPT} ${WRKSRC}/idle ${PREFIX}/bin/idle${VERSION}
+ cd ${PREFIX}/bin && ln -sf idle${VERSION} idle${VERSION:R}
+ mv ${PREFIX}/bin/pydoc ${PREFIX}/bin/pydoc2
@cd ${WRKSRC}; tar -cf - Tools | (cd ${PREFIX}/lib/python${VERSION}; \
tar -xf -)
${INSTALL_SCRIPT} ${WRKSRC}/Tools/scripts/2to3 \
Index: 2.7/Makefile
===
RCS file: /cvs/ports/lang/python/2.7/Makefile,v
retrieving revision 1.53
diff -u -p -r1.53 Makefile
--- 2.7/Makefile20 Sep 2017 18:44:48 - 1.53
+++ 2.7/Makefile2 Nov 2017 14:40:13 -
@@ -9,6 +9,8 @@ VERSION = 2.7
PATCHLEVEL = .14
SHARED_LIBS = python2.7 0.0
VERSION_SPEC = >=2.7,<2.8
+REVISION-main =0
+REVISION-idle =0
CONFIGURE_ARGS += --with-ensurepip=no
Index: 2.7/pkg/PLIST-idle
===
RCS file: /cvs/ports/lang/python/2.7/pkg/PLIST-idle,v
retrieving revision 1.8
diff -u -p -r1.8 PLIST-idle
--- 2.7/pkg/PLIST-idle 3 Jul 2016 18:16:00 - 1.8
+++ 2.7/pkg/PLIST-idle 2 Nov 2017 14:40:13 -
@@ -3,6 +3,7 @@
@option is-branch
@conflict python-idle->=2.7,<2.8
@comment bin/idle
+bin/idle2
bin/idle2.7
lib/python2.7/idlelib/
lib/python2.7/idlelib/AutoComplete.py
Index: 2.7/pkg/PLIST-main
===
RCS file: /cvs/ports/lang/python/2.7/pkg/PLIST-main,v
retrieving revision 1.20
diff -u -p -r1.20 PLIST-main
--- 2.7/pkg/PLIST-main 20 Sep 2017 18:44:48 - 1.20
+++ 2.7/pkg/PLIST-main 2 Nov 2017 14:40:13 -
@@ -7,13 +7,14 @@
@pkgpath lang/python/2.7,-bz2
@pkgpath lang/python/2.7,-sqlite
@pkgpath lang/python/2.7,-expat
-@comment bin/2to3
@comment bin/pydoc
+@comment bin/2to3
+bin/pydoc2
bin/pydoc2.7
@comment bin/python
@comment bin/python-config
-@comment bin/python2
-@comment bin/python2-config
+bin/python2
+bin/python2-config
@bin bin/python2.7
bin/python2.7-2to3
bin/python2.7-config
@@ -2497,7 +2498,7 @@ lib/python2.7/zipfile.py
lib/python2.7/zipfile.pyc
lib/python2.7/zipfile.pyo
@comment man/man1/python.1
-@comment man/man1/python2.1
+@man man/man1/python2.1
@man man/man1/python2.7.1
share/doc/python2.7/
share/doc/python2.7/CHANGES.OpenBSD
Index: 3.6/Makefile
===
RCS file: /cvs/ports/lang/python/3.6/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- 3.6/Makefile15 Oct 2017 16:31:45 - 1.6
+++ 3.6/Makefile2 Nov 2017 14:40:13 -
@@ -9,6 +9,8 @@ VERSION = 3.6
PATCHLEVEL = .3
SHARED_LIBS = python3.6m 0.0
VERSION_SPEC = >=3.6,<3.7
+REVISION-main =0
+REVISION-idle =0
CONFIGURE_ARGS += --with-ensurepip=no
Index: 3.6/pkg/PLIST-idle
===
RCS file: /cvs/ports/lang/python/3.6/pkg/PLIST-idle,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST-idle
--- 3.6/pkg/PLIST-idle 15 Oct 2017 16:31:45 - 1.2
+++ 3.6/pkg/PLIST-idle 2 Nov 2017 14:40:13 -
@@ -3,7 +3,7 @@
@option is-branch
@conflict python-idle->=3.6,<3.7
@pkgpath lang/python3/3.6,-idle
-@comment bin/idle3
+bin/idle3
bin/idle3.6
lib/python3.6/idlelib/
lib/python3.6/idlelib/CREDITS.txt
Index: 3.6/pkg/PLIST-main
=
UPDATE: math/plplot
a long overdue update. comments / ok?
Index: Makefile
===
RCS file: /cvs/ports/math/plplot/Makefile,v
retrieving revision 1.58
diff -u -p -u -r1.58 Makefile
--- Makefile26 Jul 2017 22:45:26 - 1.58
+++ Makefile2 Nov 2017 14:39:24 -
@@ -2,22 +2,20 @@
COMMENT-main = advanced 2D and 3D scientific plotting library
COMMENT-c++ = C++ interface to plplot
-COMMENT-f77 = Fortran 77 interface to plplot
+COMMENT-fortran = Fortran 77 interface to plplot
-VERSION = 5.8.0
+VERSION = 5.13.0
DISTNAME = plplot-${VERSION}
-SHARED_LIBS = csirocsa3.0 \
- plplotcxxd 12.0\
- plplotd 13.0\
- plplotf77cd 11.0\
- plplotf77d 11.0
+SHARED_LIBS = csirocsa4.0 \
+ csironn 0.0 \
+ plplot 15.0\
+ plplotcxx 13.0\
+ plplotfortran 0.0 \
+ qsastime0.0
PKGNAME-main = ${DISTNAME}
PKGNAME-c++ = plplot-c++-${VERSION}
-PKGNAME-f77 = plplot-f77-${VERSION}
-REVISION-main =10
-REVISION-c++ = 11
-REVISION-f77 = 13
+PKGNAME-fortran = plplot-fortran-${VERSION}
CATEGORIES = math graphics
@@ -33,7 +31,7 @@ MASTER_SITES =${MASTER_SITE_SOURCEFORGE
MODULES = devel/gettext \
fortran
-MODFORTRAN_COMPILER = g77
+MODFORTRAN_COMPILER = gfortran
BUILD_DEPENDS =print/ghostscript/gnu-fonts \
${MODFORTRAN_BUILD_DEPENDS}
@@ -42,51 +40,54 @@ myRUN_DEPENDS = print/ghostscript/gnu-fo
MODULES += devel/cmake
-# Until such time as the cmake ninja generator supports fortran
+# Until the cmake ninja generator supports fortran
USE_NINJA =No
-CONFIGURE_ARGS = -D ENABLE_java=OFF \
- -D ENABLE_f77=ON \
- -D ENABLE_f95=OFF \
- -D ENABLE_itcl=OFF \
+CONFIGURE_ARGS = -D ENABLE_ada=OFF \
+ -D ENABLE_cxx=ON \
+ -D ENABLE_d=OFF \
+ -D ENABLE_fortran=ON \
+ -D ENABLE_java=OFF \
+ -D ENABLE_lua=OFF \
+ -D ENABLE_ocaml=OFF \
+ -D ENABLE_octave=OFF \
-D ENABLE_pdl=OFF \
-D ENABLE_python=OFF \
- -D PLD_gcw=OFF \
+ -D ENABLE_qt=OFF \
+ -D ENABLE_pyqt4=OFF \
-D ENABLE_tcl=OFF \
+ -D ENABLE_itcl=OFF \
-D ENABLE_tk=OFF \
- -D ENABLE_wxwidgets=OFF \
- -D ENABLE_gnome2=OFF \
- -D ENABLE_octave=OFF \
- -D PLD_wxwidgets=OFF
+ -D ENABLE_itk=OFF \
+ -D ENABLE_wxwidgets=OFF
DOCSRC = ${WRKSRC}/doc/docbook/src
-MULTI_PACKAGES = -main -c++ -f77
+MULTI_PACKAGES = -main -c++ -fortran
-myWANTLIB += ICE SM X11 Xext cairo fontconfig freetype gd glib-2.0
-myWANTLIB += gobject-2.0 jpeg m pango-1.0 pangocairo-1.0 pangoft2-1.0
-myWANTLIB += png z ${MODGETTEXT_WANTLIB}
+myWANTLIB += ICE SM X11 Xext cairo glib-2.0
+myWANTLIB += gobject-2.0 m pango-1.0 pangocairo-1.0
+myWANTLIB += qhull ${MODGETTEXT_WANTLIB} ltdl
WANTLIB-main = ${myWANTLIB} c pthread
-WANTLIB-c++ = ${myWANTLIB} csirocsa plplotd ${COMPILER_LIBCXX}
-WANTLIB-f77 += ${myWANTLIB} csirocsa plplotd ${MODFORTRAN_WANTLIB}
+WANTLIB-c++ = plplot m ${COMPILER_LIBCXX}
+WANTLIB-fortran = plplot m ${MODFORTRAN_WANTLIB}
myLIB_DEPENDS =devel/glib2 \
devel/pango \
graphics/cairo \
- graphics/gd \
+ math/qhull \
+ devel/libtool,-ltdl \
${MODGETTEXT_LIB_DEPENDS}
LIB_DEPENDS-main = ${myLIB_DEPENDS}
-LIB_DEPENDS-c++ = math/plplot,-main \
- ${myLIB_DEPENDS}
-LIB_DEPENDS-f77 = math/plplot,-main \
- ${myLIB_DEPENDS} \
+LIB_DEPENDS-c++ = math/plplot,-main
+LIB_DEPENDS-fortran = math/plplot,-main \
${MODFORTRAN_LIB_DEPENDS}
RUN_DEPENDS-main = ${myRUN_DEPENDS}
RUN_DEPENDS-c++ =
-RUN_DEPENDS-f77 =
+RUN_DEPENDS-fortran =
pre-configure:
@sed -i 's/3plplot/3/g' ${DOCSRC}/*.3plplot
Index: distinfo
===
RCS file: /cvs/ports/math/plplot/distinfo,v
retrieving revision 1.5
diff -u -p -u -r1.5 distinfo
--- distinfo17 Mar 2014 23:21:43 - 1.5
+++ distinfo2 Nov 2017 14:39:24 -
@@ -1,2 +1,2 @@
-SHA256 (plplot-5.8.0.tar.gz) = WVvMAhtBW6GRl5WGVD+VKF8D9bVO139FKXaomtKFCHc=
-SIZE (plplot-5.8.0.tar.gz) = 7582217
+SHA256 (plplot-5.13.0.tar.gz) = 7Da77osD2dHJj4/Yj33DQVVg5Vm1PrGqmR
alpha bulk build report
bulk build on alpha-1.ports.openbsd.org started on Thu Oct 19 04:05:42 MDT 2017 finished at Thu Nov 2 08:43:39 MDT 2017 lasted 14D21h37m done with kern.version=OpenBSD 6.2-current (GENERIC.MP) #145: Wed Oct 18 11:30:21 MDT 2017 built packages:7305 Oct 19:731 Oct 20:12 Oct 21:546 Oct 22:366 Oct 23:381 Oct 24:259 Oct 25:224 Oct 26:288 Oct 27:339 Oct 28:317 Oct 29:430 Oct 30:367 Oct 31:489 Nov 1:1163 Nov 2:1392 build failures: 21 http://build-failures.rhaalovely.net//alpha/2017-10-19/archivers/woff2.log http://build-failures.rhaalovely.net//alpha/2017-10-19/cad/openscad.log http://build-failures.rhaalovely.net//alpha/2017-10-19/databases/py-psycopg2,python3.log http://build-failures.rhaalovely.net//alpha/2017-10-19/devel/gtest.log http://build-failures.rhaalovely.net//alpha/2017-10-19/devel/reposurgeon.log http://build-failures.rhaalovely.net//alpha/2017-10-19/devel/spidermonkey38.log http://build-failures.rhaalovely.net//alpha/2017-10-19/emulators/vice.log http://build-failures.rhaalovely.net//alpha/2017-10-19/fonts/fira-fonts.log http://build-failures.rhaalovely.net//alpha/2017-10-19/graphics/freeimage.log http://build-failures.rhaalovely.net//alpha/2017-10-19/lang/gcc/4.6.log http://build-failures.rhaalovely.net//alpha/2017-10-19/lang/mruby.log http://build-failures.rhaalovely.net//alpha/2017-10-19/lang/verilator.log http://build-failures.rhaalovely.net//alpha/2017-10-19/math/p5-Math-Pari.log http://build-failures.rhaalovely.net//alpha/2017-10-19/net/freeradius3.log http://build-failures.rhaalovely.net//alpha/2017-10-19/net/owncloudclient.log http://build-failures.rhaalovely.net//alpha/2017-10-19/net/powerdns.log http://build-failures.rhaalovely.net//alpha/2017-10-19/net/telegram-purple.log http://build-failures.rhaalovely.net//alpha/2017-10-19/print/poppler.log http://build-failures.rhaalovely.net//alpha/2017-10-19/telephony/asterisk.log http://build-failures.rhaalovely.net//alpha/2017-10-19/textproc/link-grammar,-main.log http://build-failures.rhaalovely.net//alpha/2017-10-19/x11/tint2.log recurrent failures failures/cad/openscad.log failures/databases/py-psycopg2,python3.log failures/devel/gtest.log failures/devel/reposurgeon.log failures/devel/spidermonkey38.log failures/emulators/vice.log failures/graphics/freeimage.log failures/lang/mruby.log failures/math/p5-Math-Pari.log failures/net/freeradius3.log failures/net/owncloudclient.log new failures +++ ls-failures Thu Nov 2 08:44:03 2017 +failures/archivers/woff2.log +failures/fonts/fira-fonts.log +failures/lang/gcc/4.6.log +failures/lang/verilator.log resolved failures --- ../old/alpha/last//ls-failures Mon Oct 16 15:14:10 2017 -failures/lang/gcc/4.6,-c++.log Base libs: c.90.0 crypto.42.0 X libs:
Re: UPDATE: net/wget -current,-stable (CVE-2017-13089, CVE-2017-13090)
On Tue Oct 31, 2017 at 01:02:44PM +0100, Rafael Sadowski wrote:
> On Tue Oct 31, 2017 at 12:20:26PM +0100, Rafael Sadowski wrote:
> > Hi All,
> >
> > Update Wget to the latest stable version 1.19.1. This version includes
> > the following CVE patches:
> >
> > "Fix stack overflow in HTTP protocol handling (CVE-2017-13089)"
> > http://git.savannah.gnu.org/cgit/wget.git/commit/?id=d892291fb8ace4c3b734ea5125770989c215df3f
> >
> > "Fix heap overflow in HTTP protocol handling (CVE-2017-13090)"
> > http://git.savannah.gnu.org/cgit/wget.git/commit/?id=ba6b44f6745b14dce414761a8e4b35d31b176bba
> >
> > 1.19.1 provide only .tar.lz and tar.gz. Since we don't support *.lz, I
> > have decided to *.gz
> >
> > Also please find attached a diff for -stable.
> >
>
> Forget the attachment, so here it is inline:
>
*ping-stable*
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/net/wget/Makefile,v
> retrieving revision 1.72
> diff -u -p -u -p -r1.72 Makefile
> --- Makefile 22 Feb 2017 02:49:25 - 1.72
> +++ Makefile 31 Oct 2017 11:09:04 -
> @@ -4,6 +4,7 @@ COMMENT = retrieve files from the web vi
>
> DISTNAME = wget-1.19.1
> CATEGORIES = net
> +REVISION = 0
>
> HOMEPAGE = https://www.gnu.org/software/wget/
>
> Index: patches/patch-src_http_c
> ===
> RCS file: patches/patch-src_http_c
> diff -N patches/patch-src_http_c
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-src_http_c 31 Oct 2017 11:09:04 -
> @@ -0,0 +1,16 @@
> +$OpenBSD$
> +Fix stack overflow in HTTP protocol handling (CVE-2017-13089)
> +Commit from upstream d892291fb8ace4c3b734ea5125770989c215df3f
> +Index: src/http.c
> +--- src/http.c.orig
> src/http.c
> +@@ -973,6 +973,9 @@ skip_short_body (int fd, wgint contlen, bool chunked)
> + remaining_chunk_size = strtol (line, &endl, 16);
> + xfree (line);
> +
> ++ if (remaining_chunk_size < 0)
> ++ return false;
> ++
> + if (remaining_chunk_size == 0)
> + {
> + line = fd_read_line (fd);
> Index: patches/patch-src_retr_c
> ===
> RCS file: patches/patch-src_retr_c
> diff -N patches/patch-src_retr_c
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-src_retr_c 31 Oct 2017 11:09:04 -
> @@ -0,0 +1,19 @@
> +$OpenBSD$
> +Fix heap overflow in HTTP protocol handling (CVE-2017-13090)
> +Commit from upstream ba6b44f6745b14dce414761a8e4b35d31b176bba
> +Index: src/retr.c
> +--- src/retr.c.orig
> src/retr.c
> +@@ -320,6 +320,12 @@ fd_read_body (const char *downloaded_filename, int fd,
> + remaining_chunk_size = strtol (line, &endl, 16);
> + xfree (line);
> +
> ++ if (remaining_chunk_size < 0)
> ++ {
> ++ ret = -1;
> ++ break;
> ++ }
> ++
> + if (remaining_chunk_size == 0)
> + {
> + ret = 0;
>
UPDATE: devel/libivykis
update to a version used by newer syslog-ng
Index: Makefile
===
RCS file: /cvs/ports/devel/libivykis/Makefile,v
retrieving revision 1.7
diff -u -p -u -r1.7 Makefile
--- Makefile25 Jul 2015 08:18:20 - 1.7
+++ Makefile2 Nov 2017 14:52:26 -
@@ -2,11 +2,11 @@
COMMENT = asynchronous I/O readiness notification library
-V =0.36.3
+V =0.42
DISTNAME = ivykis-$V
PKGNAME = lib${DISTNAME}
-SHARED_LIBS = ivykis 1.0
+SHARED_LIBS = ivykis 2.0
CATEGORIES = devel
Index: distinfo
===
RCS file: /cvs/ports/devel/libivykis/distinfo,v
retrieving revision 1.4
diff -u -p -u -r1.4 distinfo
--- distinfo25 Jul 2015 08:18:20 - 1.4
+++ distinfo2 Nov 2017 14:52:26 -
@@ -1,2 +1,2 @@
-SHA256 (ivykis-0.36.3.tar.gz) = qnDlSHz20cmWH0h9ULGNFqkh3fRPvc0iZemFvrrEIj0=
-SIZE (ivykis-0.36.3.tar.gz) = 401979
+SHA256 (ivykis-0.42.tar.gz) = 9jxNuUW+aa/U0S/zAsJtY5mpG8ivqjS+VkQbtIYgqbI=
+SIZE (ivykis-0.42.tar.gz) = 649882
Re: UPDATE: devel/libivykis
On Thu, Nov 02, 2017 at 03:07:45PM +, Steven Mestdagh wrote:
> update to a version used by newer syslog-ng
OK
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/devel/libivykis/Makefile,v
> retrieving revision 1.7
> diff -u -p -u -r1.7 Makefile
> --- Makefile 25 Jul 2015 08:18:20 - 1.7
> +++ Makefile 2 Nov 2017 14:52:26 -
> @@ -2,11 +2,11 @@
>
> COMMENT =asynchronous I/O readiness notification library
>
> -V = 0.36.3
> +V = 0.42
> DISTNAME = ivykis-$V
> PKGNAME =lib${DISTNAME}
>
> -SHARED_LIBS =ivykis 1.0
> +SHARED_LIBS =ivykis 2.0
>
> CATEGORIES = devel
>
> Index: distinfo
> ===
> RCS file: /cvs/ports/devel/libivykis/distinfo,v
> retrieving revision 1.4
> diff -u -p -u -r1.4 distinfo
> --- distinfo 25 Jul 2015 08:18:20 - 1.4
> +++ distinfo 2 Nov 2017 14:52:26 -
> @@ -1,2 +1,2 @@
> -SHA256 (ivykis-0.36.3.tar.gz) = qnDlSHz20cmWH0h9ULGNFqkh3fRPvc0iZemFvrrEIj0=
> -SIZE (ivykis-0.36.3.tar.gz) = 401979
> +SHA256 (ivykis-0.42.tar.gz) = 9jxNuUW+aa/U0S/zAsJtY5mpG8ivqjS+VkQbtIYgqbI=
> +SIZE (ivykis-0.42.tar.gz) = 649882
>
--
Antoine
Re: Help update port 'mail/mlmmj' to the latest 1.3.0
> On Nov 2, 2017, at 4:21 PM, viq wrote: > > Ah, then you need `cvs rm` for each of the patch files. Thanks for the instruction. Here’s the full patch. mlmmj-1.3.0.patch Description: Binary data Zhang Huangbin, founder of iRedMail project: http://www.iredmail.org/ Time zone: GMT+8 (China/Beijing). Available on Telegram: https://t.me/iredmail
NEW: devel/xtensa-elf
Hi, Attached is a port for a new cross-compiler, xtensa-elf-gcc, in order to eventually compile some firmwares. ok? -- Anthony J. Bentley xtensa-elf.tar.gz Description: GNU Zip compressed data
UPDATE: databases/pgpool
Hi,
this updates pgpool from 3.2.12 to 3.6.6.
Yesterdays 3.6.7 requires OpenSSL 1.1 or at least some patching, so i would
like to get this commited first before taking care of openssl and postgres
10).
ok?
/Benno
Index: Makefile
===
RCS file: /cvs/ports/databases/pgpool/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- Makefile4 Apr 2016 22:57:45 - 1.7
+++ Makefile10 Oct 2017 14:43:08 -
@@ -2,8 +2,7 @@
COMMENT= connection pool server for PostgreSQL
-DISTNAME= pgpool-II-3.2.12
-REVISION= 0
+DISTNAME= pgpool-II-3.6.6
CATEGORIES=databases
@@ -21,7 +20,7 @@ MASTER_SITES= http://www.pgpool.net/med
WANTLIB= c crypto m pq ssl pthread
CONFIGURE_STYLE= gnu
-CONFIGURE_ARGS=--with-openssl
+CONFIGURE_ARGS=--with-openssl
USE_GMAKE= Yes
FAKE_FLAGS=sysconfdir=${PREFIX}/share/examples/pgpool-II/
@@ -30,11 +29,12 @@ BUILD_DEPENDS = databases/postgresql,-s
LIB_DEPENDS = databases/postgresql
post-install:
- @cd ${WRKSRC}/sql/pgpool-regclass && \
+ @cd ${WRKSRC}/src/sql/pgpool-regclass && \
env -i ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} \
-f ${MAKE_FILE} ${ALL_TARGET} && \
env -i ${MAKE_ENV} \
PREFIX=${WRKINST}${PREFIX} ${DESTDIRNAME}=${WRKINST}
TRUEPREFIX=${PREFIX} \
${MAKE_PROGRAM} ${ALL_FAKE_FLAGS} -f ${MAKE_FILE} ${FAKE_TARGET}
+ ${INSTALL_MAN} ${WRKDIST}/./doc/src/sgml/man8/pgpool.8
${PREFIX}/man/man8/
.include
Index: distinfo
===
RCS file: /cvs/ports/databases/pgpool/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo4 Oct 2015 20:22:21 - 1.5
+++ distinfo10 Oct 2017 14:43:08 -
@@ -1,2 +1,2 @@
-SHA256 (pgpool-II-3.2.12.tar.gz) = 2ynh2OUX9qoDTehobSpAqPtCtWJOEXrKV3DIBWysbog=
-SIZE (pgpool-II-3.2.12.tar.gz) = 1626485
+SHA256 (pgpool-II-3.6.6.tar.gz) = X72sFKB7T0yr74vSJL4fuwdw2apHMdj6eQWHjcTCL7w=
+SIZE (pgpool-II-3.6.6.tar.gz) = 3171264
Index: patches/patch-pool_lobj_c
===
RCS file: patches/patch-pool_lobj_c
diff -N patches/patch-pool_lobj_c
--- patches/patch-pool_lobj_c 21 Dec 2011 15:51:04 - 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,11 +0,0 @@
-$OpenBSD: patch-pool_lobj_c,v 1.1.1.1 2011/12/21 15:51:04 pea Exp $
pool_lobj.c.orig Thu Nov 24 15:43:49 2011
-+++ pool_lobj.cThu Nov 24 15:44:02 2011
-@@ -27,6 +27,7 @@
- #include
- #include
- #include
-+#include
-
- #include "pool.h"
- #include "pool_lobj.h"
Index: patches/patch-pool_memqcache_c
===
RCS file: patches/patch-pool_memqcache_c
diff -N patches/patch-pool_memqcache_c
--- patches/patch-pool_memqcache_c 24 Sep 2012 19:39:59 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,11 +0,0 @@
-$OpenBSD: patch-pool_memqcache_c,v 1.1 2012/09/24 19:39:59 pea Exp $
pool_memqcache.c.orig Sun Sep 16 12:23:15 2012
-+++ pool_memqcache.c Sun Sep 16 12:23:26 2012
-@@ -36,6 +36,7 @@
- #include
- #include
- #include
-+#include
-
- #ifdef USE_MEMCACHED
- #include
Index: patches/patch-pool_select_walker_c
===
RCS file: patches/patch-pool_select_walker_c
diff -N patches/patch-pool_select_walker_c
--- patches/patch-pool_select_walker_c 24 Sep 2012 19:39:59 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,11 +0,0 @@
-$OpenBSD: patch-pool_select_walker_c,v 1.1 2012/09/24 19:39:59 pea Exp $
pool_select_walker.c.orig Sun Sep 16 12:30:03 2012
-+++ pool_select_walker.c Sun Sep 16 12:30:16 2012
-@@ -22,6 +22,7 @@
- #include
- #include
- #include
-+#include
-
- #include "pool.h"
- #include "pool_config.h"
Index: patches/patch-src_include_watchdog_wd_utils_h
===
RCS file: patches/patch-src_include_watchdog_wd_utils_h
diff -N patches/patch-src_include_watchdog_wd_utils_h
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_include_watchdog_wd_utils_h 10 Oct 2017 14:43:08
-
@@ -0,0 +1,13 @@
+$OpenBSD$
+
+Index: src/include/watchdog/wd_utils.h
+--- src/include/watchdog/wd_utils.h.orig
src/include/watchdog/wd_utils.h
+@@ -26,6 +26,7 @@
+ #define WD_UTILS_H
+
+ #include
++#include
+ #include "parser/pg_list.h"
+
+ #define WD_NG (0)
Index: patches/patch-src_pcp_con_pcp_worker_c
===
RCS file: patches/patch-src_pcp_con_pcp_worker_c
diff -N patches/patch-src_pcp_con_pcp_worker_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_pcp_con_pcp_worker_c 10 Oct 2017 14:43:08 -
@@ -0,0 +1,16 @@
+$OpenBS
[UPDATE] sysutils/libfvde
Hi,
this is the diff to update libfvde to latest release.
Ok?
Cheers,
Remi.Index: Makefile
===
RCS file: /cvs/ports/sysutils/libfvde/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 Makefile
--- Makefile 12 Feb 2017 06:58:29 - 1.1.1.1
+++ Makefile 2 Nov 2017 16:17:01 -
@@ -2,11 +2,11 @@
COMMENT = library and tools to access FileVault Drive Encryption
-VERSION = 20160918
+VERSION = 20170930
DISTNAME = libfvde-experimental-${VERSION}
PKGNAME = ${DISTNAME:S/-experimental//}
-SHARED_LIBS += fvde 0.0 # 1.0
+SHARED_LIBS += fvde 0.1 # 1.0
CATEGORIES = sysutils security
Index: distinfo
===
RCS file: /cvs/ports/sysutils/libfvde/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 distinfo
--- distinfo 12 Feb 2017 06:58:29 - 1.1.1.1
+++ distinfo 2 Nov 2017 16:17:01 -
@@ -1,2 +1,2 @@
-SHA256 (libfvde-experimental-20160918.tar.gz) = aGOumRFjrAaJlCAdxFAoYnqOYAdt1XS3z1lLXzMCQq8=
-SIZE (libfvde-experimental-20160918.tar.gz) = 1643264
+SHA256 (libfvde-experimental-20170930.tar.gz) = Bph/0zh1MdPnflInnEBjUw36L6V0/+VsoZp+B0cCqRM=
+SIZE (libfvde-experimental-20170930.tar.gz) = 1678823
Re: UPDATE: math/plplot
Steven Mestdagh [2017-11-02, 15:41:25]:
> a long overdue update. comments / ok?
better without the gettext module, as pointed out by naddy.
Index: Makefile
===
RCS file: /cvs/ports/math/plplot/Makefile,v
retrieving revision 1.58
diff -u -p -u -r1.58 Makefile
--- Makefile26 Jul 2017 22:45:26 - 1.58
+++ Makefile2 Nov 2017 16:24:53 -
@@ -2,22 +2,20 @@
COMMENT-main = advanced 2D and 3D scientific plotting library
COMMENT-c++ = C++ interface to plplot
-COMMENT-f77 = Fortran 77 interface to plplot
+COMMENT-fortran = Fortran 77 interface to plplot
-VERSION = 5.8.0
+VERSION = 5.13.0
DISTNAME = plplot-${VERSION}
-SHARED_LIBS = csirocsa3.0 \
- plplotcxxd 12.0\
- plplotd 13.0\
- plplotf77cd 11.0\
- plplotf77d 11.0
+SHARED_LIBS = csirocsa4.0 \
+ csironn 0.0 \
+ plplot 15.0\
+ plplotcxx 13.0\
+ plplotfortran 0.0 \
+ qsastime0.0
PKGNAME-main = ${DISTNAME}
PKGNAME-c++ = plplot-c++-${VERSION}
-PKGNAME-f77 = plplot-f77-${VERSION}
-REVISION-main =10
-REVISION-c++ = 11
-REVISION-f77 = 13
+PKGNAME-fortran = plplot-fortran-${VERSION}
CATEGORIES = math graphics
@@ -30,10 +28,9 @@ PERMIT_PACKAGE_CDROM = Yes
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=plplot/}
-MODULES = devel/gettext \
- fortran
+MODULES = fortran
-MODFORTRAN_COMPILER = g77
+MODFORTRAN_COMPILER = gfortran
BUILD_DEPENDS =print/ghostscript/gnu-fonts \
${MODFORTRAN_BUILD_DEPENDS}
@@ -42,51 +39,54 @@ myRUN_DEPENDS = print/ghostscript/gnu-fo
MODULES += devel/cmake
-# Until such time as the cmake ninja generator supports fortran
+# Until the cmake ninja generator supports fortran
USE_NINJA =No
-CONFIGURE_ARGS = -D ENABLE_java=OFF \
- -D ENABLE_f77=ON \
- -D ENABLE_f95=OFF \
- -D ENABLE_itcl=OFF \
+CONFIGURE_ARGS = -D ENABLE_ada=OFF \
+ -D ENABLE_cxx=ON \
+ -D ENABLE_d=OFF \
+ -D ENABLE_fortran=ON \
+ -D ENABLE_java=OFF \
+ -D ENABLE_lua=OFF \
+ -D ENABLE_ocaml=OFF \
+ -D ENABLE_octave=OFF \
-D ENABLE_pdl=OFF \
-D ENABLE_python=OFF \
- -D PLD_gcw=OFF \
+ -D ENABLE_qt=OFF \
+ -D ENABLE_pyqt4=OFF \
-D ENABLE_tcl=OFF \
+ -D ENABLE_itcl=OFF \
-D ENABLE_tk=OFF \
- -D ENABLE_wxwidgets=OFF \
- -D ENABLE_gnome2=OFF \
- -D ENABLE_octave=OFF \
- -D PLD_wxwidgets=OFF
+ -D ENABLE_itk=OFF \
+ -D ENABLE_wxwidgets=OFF
DOCSRC = ${WRKSRC}/doc/docbook/src
-MULTI_PACKAGES = -main -c++ -f77
+MULTI_PACKAGES = -main -c++ -fortran
-myWANTLIB += ICE SM X11 Xext cairo fontconfig freetype gd glib-2.0
-myWANTLIB += gobject-2.0 jpeg m pango-1.0 pangocairo-1.0 pangoft2-1.0
-myWANTLIB += png z ${MODGETTEXT_WANTLIB}
+myWANTLIB += ICE SM X11 Xext cairo glib-2.0
+myWANTLIB += gobject-2.0 m pango-1.0 pangocairo-1.0
+myWANTLIB += qhull intl ltdl
WANTLIB-main = ${myWANTLIB} c pthread
-WANTLIB-c++ = ${myWANTLIB} csirocsa plplotd ${COMPILER_LIBCXX}
-WANTLIB-f77 += ${myWANTLIB} csirocsa plplotd ${MODFORTRAN_WANTLIB}
+WANTLIB-c++ = plplot m ${COMPILER_LIBCXX}
+WANTLIB-fortran = plplot m ${MODFORTRAN_WANTLIB}
myLIB_DEPENDS =devel/glib2 \
+ devel/gettext \
devel/pango \
graphics/cairo \
- graphics/gd \
- ${MODGETTEXT_LIB_DEPENDS}
+ math/qhull \
+ devel/libtool,-ltdl
LIB_DEPENDS-main = ${myLIB_DEPENDS}
-LIB_DEPENDS-c++ = math/plplot,-main \
- ${myLIB_DEPENDS}
-LIB_DEPENDS-f77 = math/plplot,-main \
- ${myLIB_DEPENDS} \
+LIB_DEPENDS-c++ = math/plplot,-main
+LIB_DEPENDS-fortran = math/plplot,-main \
${MODFORTRAN_LIB_DEPENDS}
RUN_DEPENDS-main = ${myRUN_DEPENDS}
RUN_DEPENDS-c++ =
-RUN_DEPENDS-f77 =
+RUN_DEPENDS-fortran =
pre-configure:
@sed -i 's/3plplot/3/g' ${DOCSRC}/*.3plplot
Index: distinfo
===
RCS file: /cvs/ports/math/plplot/distinfo,v
retrieving revision 1.5
diff -u -p -u -r1.5 distinfo
--- distinfo17 Mar 2014 23:21:43 - 1.5
+++ distinfo2 Nov 2017 16:24:53 -
@@ -1,2
UPDATE: sysutils/syslog-ng
seems to be fine on amd64. comments welcome.
Index: Makefile
===
RCS file: /cvs/ports/sysutils/syslog-ng/Makefile,v
retrieving revision 1.57
diff -u -p -u -r1.57 Makefile
--- Makefile13 Jun 2017 00:22:33 - 1.57
+++ Makefile2 Nov 2017 18:40:53 -
@@ -1,11 +1,10 @@
# $OpenBSD: Makefile,v 1.57 2017/06/13 00:22:33 schwarze Exp $
-COMMENT= syslogd replacement
+COMMENT= log management solution
-V =3.9.1
-REL = 3.9
+V =3.12.1
+REL = 3.12
DISTNAME = syslog-ng-$V
-REVISION = 0
CATEGORIES = sysutils
MAINTAINER = Steven Mestdagh
@@ -17,8 +16,8 @@ PERMIT_PACKAGE_CDROM =Yes
MASTER_SITES =
http://github.com/balabit/syslog-ng/releases/download/${DISTNAME}/
-SHARED_LIBS = syslog-ng 4.0 \
- syslog-ng-${REL}4.0
+SHARED_LIBS = syslog-ng 5.0 \
+ syslog-ng-${REL}5.0
MODULES = devel/gettext
@@ -36,6 +35,7 @@ LIB_DEPENDS = devel/glib2 \
CONFIGURE_STYLE = gnu
CONFIGURE_ARGS += --disable-tcp-wrapper \
+ --with-module-dir=${PREFIX}/lib/syslog-ng \
--with-pidfile-dir=/var/run \
--enable-json \
--with-mongoc=no \
@@ -54,7 +54,10 @@ CONFIGURE_ENV += OPENSSL_CFLAGS="-I/usr/
OPENSSL_LIBS="-lssl -lcrypto"
# json-c only installs libjson-c.pc; syslog-ng checks for libjson.pc
CONFIGURE_ENV += JSON_C_CFLAGS="`pkg-config json-c --cflags`" \
- JSON_C_LIBS="`pkg-config json-c --libs`"
+ JSON_C_LIBS="`pkg-config json-c --libs`" \
+ EVTLOG_LIBS="-L${LOCALBASE}/lib -levtlog" \
+ EVTLOG_CFLAGS="-I${LOCALBASE}/include/eventlog"
+
USE_GMAKE =Yes
SYSCONFDIR = ${BASESYSCONFDIR}/syslog-ng
Index: distinfo
===
RCS file: /cvs/ports/sysutils/syslog-ng/distinfo,v
retrieving revision 1.25
diff -u -p -u -r1.25 distinfo
--- distinfo8 Jun 2017 18:19:37 - 1.25
+++ distinfo2 Nov 2017 18:40:53 -
@@ -1,2 +1,2 @@
-SHA256 (syslog-ng-3.9.1.tar.gz) = VniFalUK55Bhj6venRRH+TLOepCA1V3Kj8XfEgLHChc=
-SIZE (syslog-ng-3.9.1.tar.gz) = 8312677
+SHA256 (syslog-ng-3.12.1.tar.gz) = EtKsuOKS0WBo3rrn+aaZ55HKSXVA0ogzppSpoczXj0M=
+SIZE (syslog-ng-3.12.1.tar.gz) = 8905646
Index: files/syslog-ng.conf
===
RCS file: /cvs/ports/sysutils/syslog-ng/files/syslog-ng.conf,v
retrieving revision 1.10
diff -u -p -u -r1.10 syslog-ng.conf
--- files/syslog-ng.conf8 Jun 2017 18:19:37 - 1.10
+++ files/syslog-ng.conf2 Nov 2017 18:40:53 -
@@ -1,8 +1,7 @@
# syslog-ng configuration file for OpenBSD.
-# This should provide the same behavior as OpenBSD's syslog.conf(5).
-# 2010-07-18 ste...@openbsd.org
+# This should provide behavior similar to OpenBSD's syslog.conf(5).
-@version: 3.9
+@version: 3.12
options {
use_dns(no);
@@ -12,15 +11,9 @@ options {
source s_local {
unix-dgram ("/dev/log");
- unix-dgram ("/var/empty/dev/log");
internal();
};
-#source s_local_all {
-# unix-dgram ("/dev/log");
-# unix-dgram ("/var/empty/dev/log");
-# unix-dgram ("/var/www/dev/log");
-# internal();
-#};
+
#source s_net {
# udp(port(514));
#};
@@ -108,7 +101,6 @@ log { source(s_local); filter(f_daemonin
log { source(s_local); filter(f_ftpinfo); destination(d_xferlog); };
log { source(s_local); filter(f_lprdebug); destination(d_lpderrs); };
log { source(s_local); filter(f_mailinfo); destination(d_maillog); };
-#log { source(s_local); filter(f_uucpinfo);destination(d_uucplog); };
# Uncomment this line to send "important" messages to the system
# console: be aware that this could create lots of output.
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/sysutils/syslog-ng/patches/patch-Makefile_in,v
retrieving revision 1.10
diff -u -p -u -r1.10 patch-Makefile_in
--- patches/patch-Makefile_in 8 Jun 2017 18:19:37 - 1.10
+++ patches/patch-Makefile_in 2 Nov 2017 18:40:53 -
@@ -1,8 +1,52 @@
$OpenBSD: patch-Makefile_in,v 1.10 2017/06/08 18:19:37 steven Exp $
-temporary hack until libtool is fixed.
Makefile.in.orig Wed Dec 21 16:00:32 2016
-+++ Makefile.inSun Feb 5 23:53:33 2017
-@@ -6203,7 +6203,7 @@ lib/str-repr/lib_libsyslog_ng_la-encode.lo: \
+- temporary hack until libtool is fixed.
+- work around different getent API, adapted from
+https://github.com/balabit/syslog-ng/commit/8b33cbe143b00d6af72cb5145fecd67e6158a9dd
+- avoid rebuilding libeventlog, already in devel/eventlog
+
+Index: Makefile.in
+--- Makefile.in.orig
Makefile.in
+@@ -3572,7 +3572,7 @@
Re: UPDATE: php revamp
Hi Martijn did a very good job with this. This makes OpenBSD's PHP setup incredibly better. I tested yesterdays patch and it works fine (I had trouble with the other ones). I built everything and tested 7.1, 7.0, 5.6 with cli and fpm + extensions (opcache, curl, intl, etc.). So, looks good. I hope it gets committed soon. Thanks Marijn! Tom Van Looy
Re: UPDATE: php revamp
On 2017/11/02 21:41, Tom Van Looy wrote: > Hi > > Martijn did a very good job with this. This makes OpenBSD's PHP setup > incredibly better. I > tested yesterdays patch and it works fine (I had trouble with the other > ones). I built > everything and tested 7.1, 7.0, 5.6 with cli and fpm + extensions (opcache, > curl, intl, etc.). > > So, looks good. I hope it gets committed soon. Thanks Marijn! > > Tom Van Looy > > It's a matter of opinion. I will cope but I really don't like the FreeBSD-style micro splitting.
Ruby extension gem updates
This diff updates our ruby gem extension ports to their latest versions,
for the 15 ports that weren't already at their latest version.
For the gems that include tests, the tests pass. For other gems, I've
tried to test them manually where I could. I maintain about half of
these gems, and the other half are unmaintained.
I've checked and the dependencies of these ports should still work
with these updated versions.
These changes are mostly routine. The most significant change is
the removal of the gcc4 module from capybara-webkit, since it now
seems to work fine without that.
I plan to do some more testing of the database ports, but the rest
of these I plan to commit in a day or so unless I hear objections.
After a review of the extension ports, I would also like to remove
audio/ruby-id3lib. It hasn't been updated in about 7.5 years, and
users should be able to switch to audio/ruby-taglib for similar
features. OKs for removing that?
Thanks,
Jeremy
Index: databases/ruby-mysql2/Makefile
===
RCS file: /cvs/ports/databases/ruby-mysql2/Makefile,v
retrieving revision 1.23
diff -u -p -u -p -r1.23 Makefile
--- databases/ruby-mysql2/Makefile 4 Nov 2016 21:29:27 - 1.23
+++ databases/ruby-mysql2/Makefile 2 Nov 2017 16:34:44 -
@@ -2,7 +2,7 @@
COMMENT= modern, simple and very fast MySQL library for Ruby
-DISTNAME= mysql2-0.4.5
+DISTNAME= mysql2-0.4.9
CATEGORIES=databases
HOMEPAGE= https://github.com/brianmario/mysql2
Index: databases/ruby-mysql2/distinfo
===
RCS file: /cvs/ports/databases/ruby-mysql2/distinfo,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 distinfo
--- databases/ruby-mysql2/distinfo 4 Nov 2016 21:29:27 - 1.10
+++ databases/ruby-mysql2/distinfo 2 Nov 2017 16:34:54 -
@@ -1,2 +1,2 @@
-SHA256 (mysql2-0.4.5.gem) = lGlnPQkSJTdWmoppYTb2m43YJf6Clt+a8lybNG43Cc4=
-SIZE (mysql2-0.4.5.gem) = 76288
+SHA256 (mysql2-0.4.9.gem) = iviz07WqM9imhqHKofis2SmMvrQLCfjCR1puz5CxpiI=
+SIZE (mysql2-0.4.9.gem) = 77312
Index: databases/ruby-pg/Makefile
===
RCS file: /cvs/ports/databases/ruby-pg/Makefile,v
retrieving revision 1.34
diff -u -p -u -p -r1.34 Makefile
--- databases/ruby-pg/Makefile 4 Apr 2017 21:40:40 - 1.34
+++ databases/ruby-pg/Makefile 2 Nov 2017 16:37:55 -
@@ -2,7 +2,7 @@
COMMENT = PostgreSQL database interface for ruby
-DISTNAME = pg-0.20.0
+DISTNAME = pg-0.21.0
CATEGORIES = databases
MAINTAINER = Jeremy Evans
Index: databases/ruby-pg/distinfo
===
RCS file: /cvs/ports/databases/ruby-pg/distinfo,v
retrieving revision 1.20
diff -u -p -u -p -r1.20 distinfo
--- databases/ruby-pg/distinfo 4 Apr 2017 21:40:40 - 1.20
+++ databases/ruby-pg/distinfo 2 Nov 2017 16:38:02 -
@@ -1,2 +1,2 @@
-SHA256 (pg-0.20.0.gem) = hV96D4souy73HBs7BWEr5VFFLb3CdRmQjl05oyV/rA8=
-SIZE (pg-0.20.0.gem) = 230400
+SHA256 (pg-0.21.0.gem) = ELfMBXgiNvuEDCR6TsuFn0t3ABQWd04WRskRxrFWcAM=
+SIZE (pg-0.21.0.gem) = 214016
Index: databases/ruby-pg/pkg/PLIST
===
RCS file: /cvs/ports/databases/ruby-pg/pkg/PLIST,v
retrieving revision 1.13
diff -u -p -u -p -r1.13 PLIST
--- databases/ruby-pg/pkg/PLIST 8 Jan 2015 19:00:19 - 1.13
+++ databases/ruby-pg/pkg/PLIST 2 Nov 2017 16:39:03 -
@@ -22,31 +22,13 @@ ${GEM_LIB}/gems/${DISTNAME}/lib/pg/basic
${GEM_LIB}/gems/${DISTNAME}/lib/pg/coder.rb
${GEM_LIB}/gems/${DISTNAME}/lib/pg/connection.rb
${GEM_LIB}/gems/${DISTNAME}/lib/pg/constants.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/pg/deprecated_constants.rb
${GEM_LIB}/gems/${DISTNAME}/lib/pg/exceptions.rb
${GEM_LIB}/gems/${DISTNAME}/lib/pg/result.rb
${GEM_LIB}/gems/${DISTNAME}/lib/pg/text_decoder.rb
${GEM_LIB}/gems/${DISTNAME}/lib/pg/text_encoder.rb
${GEM_LIB}/gems/${DISTNAME}/lib/pg/type_map_by_column.rb
${GEM_LIB}/gems/${DISTNAME}/lib/pg_ext.so
-${GEM_LIB}/gems/${DISTNAME}/sample/
-${GEM_LIB}/gems/${DISTNAME}/sample/array_insert.rb
-${GEM_LIB}/gems/${DISTNAME}/sample/async_api.rb
-${GEM_LIB}/gems/${DISTNAME}/sample/async_copyto.rb
-${GEM_LIB}/gems/${DISTNAME}/sample/async_mixed.rb
-${GEM_LIB}/gems/${DISTNAME}/sample/check_conn.rb
-${GEM_LIB}/gems/${DISTNAME}/sample/copyfrom.rb
-${GEM_LIB}/gems/${DISTNAME}/sample/copyto.rb
-${GEM_LIB}/gems/${DISTNAME}/sample/cursor.rb
-${GEM_LIB}/gems/${DISTNAME}/sample/disk_usage_report.rb
-${GEM_LIB}/gems/${DISTNAME}/sample/issue-119.rb
-${GEM_LIB}/gems/${DISTNAME}/sample/losample.rb
-${GEM_LIB}/gems/${DISTNAME}/sample/minimal-testcase.rb
-${GEM_LIB}/gems/${DISTNAME}/sample/notify_wait.rb
-${GEM_LIB}/gems/${DISTNAME}/sample/pg_statistics.rb
-${GEM_LIB}/gems/${DISTNAME}/sample/replication_monitor.rb
-${GEM_LIB}/gems/${DISTNAME}/sample/test_binary_values.rb
-${G
Re: UPDATE: php revamp
On Thu, Nov 02, 2017 at 09:30:34PM +, Stuart Henderson wrote: > On 2017/11/02 21:41, Tom Van Looy wrote: > > Hi > > > > Martijn did a very good job with this. This makes OpenBSD's PHP setup > > incredibly better. I > > tested yesterdays patch and it works fine (I had trouble with the other > > ones). I built > > everything and tested 7.1, 7.0, 5.6 with cli and fpm + extensions (opcache, > > curl, intl, etc.). > > > > So, looks good. I hope it gets committed soon. Thanks Marijn! > > > > Tom Van Looy > > > > > > It's a matter of opinion. I will cope but I really don't like the > FreeBSD-style > micro splitting. +1 -- Antoine
UPDATE: games/chromium-bsu
Hi,
Here's an update to chromium-bsu-0.9.16.1.
For the life of me I can't figure out why glpng detection has started
failing or how to fix it. But as glpng's latest release was 17 years
ago, I'm perfectly happy to drop it as a renderer in favor of SDL2.
ok?
--
Anthony J. Bentley
Index: Makefile
===
RCS file: /cvs/ports/games/chromium-bsu/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- Makefile26 Jul 2017 22:45:20 - 1.10
+++ Makefile2 Nov 2017 22:31:13 -
@@ -1,32 +1,32 @@
# $OpenBSD: Makefile,v 1.10 2017/07/26 22:45:20 sthen Exp $
COMMENT = fast paced arcade-style space shooter
-DISTNAME = chromium-bsu-0.9.15.1
+DISTNAME = chromium-bsu-0.9.16.1
CATEGORIES = games x11
HOMEPAGE = http://chromium-bsu.sourceforge.net/
-REVISION = 3
# Clarified Artistic License
PERMIT_PACKAGE_CDROM = Yes
-WANTLIB += GL GLU SDL SDL_image alut c fontconfig freetype ftgl glpng
-WANTLIB += jpeg m openal png pthread ${COMPILER_LIBCXX} tiff webp z
+WANTLIB += GL GLU SDL2 SDL2_image alut c fontconfig freetype ftgl
+WANTLIB += m openal pthread ${COMPILER_LIBCXX} z
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=chromium-bsu/}
+USE_GMAKE =Yes
+
MODULES = devel/gettext
RUN_DEPENDS = devel/desktop-file-utils \
x11/gtk+3,-guic
-LIB_DEPENDS = graphics/ftgl \
- graphics/glpng \
- audio/freealut \
- devel/sdl-image
+LIB_DEPENDS = graphics/ftgl \
+ devel/sdl2-image \
+ audio/freealut
SEPARATE_BUILD = Yes
CONFIGURE_STYLE = gnu
-CONFIGURE_ENV =LDFLAGS="$$(pkg-config --libs sdl libpng)
-liconv" \
- CPPFLAGS="-pthread"
+CONFIGURE_ENV =CPPFLAGS="-I${LOCALBASE}/include
-I${X11BASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
NO_TEST = Yes
Index: distinfo
===
RCS file: /cvs/ports/games/chromium-bsu/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo4 Jun 2013 22:07:32 - 1.2
+++ distinfo2 Nov 2017 22:31:13 -
@@ -1,2 +1,2 @@
-SHA256 (chromium-bsu-0.9.15.1.tar.gz) =
hhtNwBtmLz09A6jiDnaxtKvTNpEOBbdw5ubfDOKshAU=
-SIZE (chromium-bsu-0.9.15.1.tar.gz) = 1689634
+SHA256 (chromium-bsu-0.9.16.1.tar.gz) =
ocFBo00ZpZYHroEWahmGTrjITPhrFVRi/tMabVbhYko=
+SIZE (chromium-bsu-0.9.16.1.tar.gz) = 1709898
Index: patches/patch-misc_Makefile_in
===
RCS file: patches/patch-misc_Makefile_in
diff -N patches/patch-misc_Makefile_in
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-misc_Makefile_in 2 Nov 2017 22:31:13 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: misc/Makefile.in
+--- misc/Makefile.in.orig
misc/Makefile.in
+@@ -609,7 +609,7 @@ uninstall-man: uninstall-man6
+ msgfmt --desktop -d $(top_srcdir)/po --template $< -o $@
+
+ chromium-bsu.png: $(top_srcdir)/data/png/hero.png
+- cp -a $< $@
++ cp $< $@
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
Index: patches/patch-src_MainSDL_Event_cpp
===
RCS file: patches/patch-src_MainSDL_Event_cpp
diff -N patches/patch-src_MainSDL_Event_cpp
--- patches/patch-src_MainSDL_Event_cpp 4 May 2017 22:09:18 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,13 +0,0 @@
-$OpenBSD: patch-src_MainSDL_Event_cpp,v 1.1 2017/05/04 22:09:18 espie Exp $
-
-Index: src/MainSDL_Event.cpp
src/MainSDL_Event.cpp.orig
-+++ src/MainSDL_Event.cpp
-@@ -18,6 +18,7 @@
-
- #include
- #include
-+#include
- #include
-
- #include "Config.h"
Index: pkg/PLIST
===
RCS file: /cvs/ports/games/chromium-bsu/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST 4 Jun 2013 22:07:33 - 1.3
+++ pkg/PLIST 2 Nov 2017 22:31:13 -
@@ -81,7 +81,7 @@ share/chromium-bsu/wav/music_game.wav
share/chromium-bsu/wav/music_menu.wav
share/chromium-bsu/wav/power.wav
share/doc/chromium-bsu/
-share/doc/chromium-bsu/faq.htm
+share/doc/chromium-bsu/faq.html
share/doc/chromium-bsu/images/
share/doc/chromium-bsu/images/heroAmmo00.jpg
share/doc/chromium-bsu/images/heroAmmo01.jpg
@@ -90,17 +90,14 @@ share/doc/chromium-bsu/images/powerUp00.
share/doc/chromium-bsu/images/powerUp01.jpg
share/doc/chromium-bsu/images/powerUp02.jpg
share/doc/chromium-bsu/images/useItem00.jpg
-share/doc/chromium-bsu/info.htm
-share/icons/
-share/icons/hicolor/
-share/icons/hicolor/64x64/
-share/icons/hicolor/64x64/apps/
+sh
new: security/hs-ed25519
Hi, I'd loke to import this new port (and two addtitional ports I'll send soon). It's a requirement for newer versions of cabal-install. Unffortunately, it's rpobably already out-of-date, and it probably doesn't build with the ghc in our tree, but I'm not going to send patches for ghc (only 8.0 so far) and hundreds of other ports. So all I ask for is wether it's ok to import it (portswise). pkg/DESCR: This package provides a simple, fast, self-contained copy of the Ed25519 public-key signature system with a clean interface. It also includes support for detached signatures, and thorough documentation on the design and implementation, including usage guidelines. Ciao, Kili security_hs-ed25519.tgz Description: application/tar-gz
new: security/hs-cryptohash-sha256
Hi, next requirement for a newer cabal-install. ok (portswise) to import? pkg/DESCR: A practical incremental and one-pass, pure API to the SHA-256 hash algorithm (including HMAC support) with performance close to the fastest implementations available in other languages. The implementation is made in C with a haskell FFI wrapper that hides the C implementation. Ciao, Kili security_hs-cryptohash-sha256.tgz Description: application/tar-gz
new: security/hs-hackage-security
Hi, third and last new requirement for cabal-install. ok (portswise)? pkg/DESCR: The hackage security library provides both server and client utilities for securing the Hackage package server (http://hackage.haskell.org/). It is based on The Update Framework (http://theupdateframework.com/), a set of recommendations developed by security researchers at various universities in the US as well as developers on the Tor project (https://www.torproject.org/). The current implementation supports only index signing, thereby enabling untrusted mirrors. It does not yet provide facilities for author package signing. Ciao, Kili security_hs-hackage-security.tgz Description: application/tar-gz
devel/gmp and malloc.conf -> S
So gmp has this configure test that fails (fatal failure) with strict
malloc options. It's supposed to catch buggy compilers, but it relies
on malloc returning zeroed memory. Using calloc fixes the test.
automake and libtool don't seem to be needed after the .m4 patch.
ok?
Index: Makefile
===
RCS file: /d/cvs/ports/devel/gmp/Makefile,v
retrieving revision 1.35
diff -u -p -r1.35 Makefile
--- Makefile26 Jul 2017 22:45:17 - 1.35
+++ Makefile2 Nov 2017 22:59:47 -
@@ -21,7 +21,8 @@ WANTLIB= m ${COMPILER_LIBCXX}
MASTER_SITES= https://gmplib.org/download/gmp/ \
${MASTER_SITE_GNU:=gmp/}
-CONFIGURE_STYLE=gnu
+CONFIGURE_STYLE=autoconf
+AUTOCONF_VERSION=2.69
CONFIGURE_ARGS=--enable-cxx
# Don't try to optimize for the local CPU submodel
CONFIGURE_ARGS+=--build=${MACHINE_ARCH}-unknown-openbsd${OSrev}
Index: patches/patch-acinclude_m4
===
RCS file: patches/patch-acinclude_m4
diff -N patches/patch-acinclude_m4
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-acinclude_m4 2 Nov 2017 23:38:37 -
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Zero out the memory before testing for overwrite bug.
+
+Index: acinclude.m4
+--- acinclude.m4.orig
acinclude.m4
+@@ -741,7 +741,7 @@ main ()
+ long i;
+ for (i = 0; i < 88 + 1; i++)
+ a[i] = ~0L;
+- r = malloc (1 * sizeof (unsigned long));
++ r = calloc (1, sizeof (unsigned long));
+ r2 = r;
+ for (i = 0; i < 528; i += 23)
+ {
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: new: security/hs-ed25519
On Fri, Nov 03, 2017 at 12:09:18AM +0100, Matthias Kilian wrote: > I'd loke to import this new port (and two addtitional ports I'll > send soon). It's a requirement for newer versions of cabal-install. > > Unffortunately, it's rpobably already out-of-date, and it probably > doesn't build with the ghc in our tree, but I'm not going to send > patches for ghc (only 8.0 so far) and hundreds of other ports. So > all I ask for is wether it's ok to import it (portswise). To avoid any confusion: this (and the other two new hs-ports) will not yet be hooked into security/Makefile, because this can't be done before lang/ghc and a couple of other hs-ports get updated. Some tependencies in the new ports don't yet match (for example, hs-tar>=0.5,<0.6, used in hs-hackage-security, as jca@ pointed out to me). Ciao, KIli
