Attachment 190843 Details for Bug 226055 – patch

[patch] patch

py-searx.patch (text/plain), 6.89 KB, created by Yuri Victorovich on 2018-02-21 02:28:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yuri Victorovich

Created: 2018-02-21 02:28:29 UTC

Size: 6.89 KB

patch

obsolete

>Index: www/py-searx/Makefile
>===================================================================
>--- www/py-searx/Makefile	(revision 462469)
>+++ www/py-searx/Makefile	(working copy)
>@@ -2,36 +2,46 @@
> # $FreeBSD$
> 
> PORTNAME=	searx
>-PORTVERSION=	0.12.0
>-DISTVERSIONPREFIX=	v
>+DISTVERSION=	0.14.0
> CATEGORIES=	www python
>+MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
> 
> MAINTAINER=	loic.blot@unix-experience.fr
>-COMMENT=	Searx / a privacy-respecting, hackable metasearch engine
>+COMMENT=	Privacy-respecting, hackable metasearch engine
> 
> LICENSE=	AGPLv3
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>=2.5.0:devel/py-dateutil@${FLAVOR} \
>-		${PYTHON_PKGNAMEPREFIX}Flask-Babel>=0.11.1:devel/py-flask-babel@${FLAVOR} \
>-		${PYTHON_PKGNAMEPREFIX}lxml>=3.6.0:devel/py-lxml@${FLAVOR} \
>-		${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${FLAVOR} \
>-		${PYTHON_PKGNAMEPREFIX}ndg_httpsclient>=0.4.1:net/py-ndg_httpsclient@${FLAVOR} \
>-		${PYTHON_PKGNAMEPREFIX}openssl>=0.15.1:security/py-openssl@${FLAVOR} \
>-		${PYTHON_PKGNAMEPREFIX}pygments>=2.1.3:textproc/py-pygments@${FLAVOR} \
>-		${PYTHON_PKGNAMEPREFIX}Flask>=0.11.1:www/py-flask@${FLAVOR} \
>-		${PYTHON_PKGNAMEPREFIX}requests>=2.10:www/py-requests@${FLAVOR} \
>-		${PYTHON_PKGNAMEPREFIX}werkzeug>0:www/py-werkzeug@${FLAVOR} \
>-		${PYTHON_PKGNAMEPREFIX}certifi>=2016.2.28:security/py-certifi@${FLAVOR}
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}certifi>0:security/py-certifi@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}Flask>0:www/py-flask@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}Flask-Babel>0:devel/py-flask-babel@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}ndg_httpsclient>0:net/py-ndg_httpsclient@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}openssl>0:security/py-openssl@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}splinter>0:www/py-splinter@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}werkzeug>0:www/py-werkzeug@${PY_FLAVOR}
> 
>+USES=		python
>+USE_PYTHON=	distutils autoplist noflavors
>+NO_ARCH=	yes
> USE_RC_SUBR=	searx
> 
>-USE_GITHUB=	yes
>-GH_ACCOUNT=	asciimoo
>-GH_PROJECT=	searx
>+SUB_FILES=	searx pkg-message
>+SUB_LIST=	PYTHON_CMD=${PYTHON_CMD} PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR}
> 
>-USES=		python
>-NO_ARCH=	yes
>-USE_PYTHON=	autoplist distutils concurrent
>+post-patch: # expect dependencies to be backwards-compatible, otherwise it is difficult to have a port
>+	@${REINPLACE_CMD} -e 's|==|>=|' ${WRKSRC}/requirements.txt
> 
>+post-install:
>+	# workaround for https://github.com/asciimoo/searx/issues/1208
>+	@${RM} -r ${STAGEDIR}${PYTHON_SITELIBDIR}/tests
>+	@${REINPLACE_CMD} -e 's|.*/tests/.*||' ${_PYTHONPKGLIST}
>+	# move settings to etc/ /usr/local/lib/python2.7/site-packages/searx/settings.yml
>+	@${MV} ${STAGEDIR}${PYTHON_SITELIBDIR}/searx/settings.yml ${STAGEDIR}${PREFIX}/etc/${PORTNAME}-settings.yml.sample
>+	@${LN} -s ${PREFIX}/etc/${PORTNAME}-settings.yml ${STAGEDIR}${PYTHON_SITELIBDIR}/searx/settings.yml
>+
> .include <bsd.port.mk>
>Index: www/py-searx/distinfo
>===================================================================
>--- www/py-searx/distinfo	(revision 462469)
>+++ www/py-searx/distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1496607289
>-SHA256 (asciimoo-searx-v0.12.0_GH0.tar.gz) = afb2f8acd82b31dd9305a06b26dfb61985b5ccbfd1d94f711764b2fa7b4b57f4
>-SIZE (asciimoo-searx-v0.12.0_GH0.tar.gz) = 1315894
>+TIMESTAMP = 1519173150
>+SHA256 (searx-0.14.0.tar.gz) = 0efa8e6359e933dc63f6922e201bdd7b21c30f7ed43edb308a2312e57b45dc83
>+SIZE (searx-0.14.0.tar.gz) = 1591201
>Index: www/py-searx/files/pkg-message.in
>===================================================================
>--- www/py-searx/files/pkg-message.in	(nonexistent)
>+++ www/py-searx/files/pkg-message.in	(working copy)
>@@ -0,0 +1,15 @@
>+======================================================================
>+You installed Searx: privacy-respecting, hackable metasearch engine.
>+
>+It is recommended to run Searx as a service:
>+# sysrc searx_enable="YES"
>+# service searx start
>+
>+It allows you to search the Internet through the local website at
>+http://localhost:8888
>+
>+By default, Searx uses the network of long running Searx instances.
>+You can see the list here: http://stats.searx.oe5tpo.com
>+
>+Please adjust Searx settings in %%PREFIX%%/etc/searx-settings.yml
>+======================================================================
>
>Property changes on: www/py-searx/files/pkg-message.in
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: www/py-searx/files/searx.in
>===================================================================
>--- www/py-searx/files/searx.in	(revision 462469)
>+++ www/py-searx/files/searx.in	(working copy)
>@@ -31,8 +31,8 @@
> 
> # daemon
> searx_pidfile="/var/run/${name}.pid"
>-python="%%PREFIX%%/bin/python2.7"
>-procname="%%PREFIX%%/lib/python2.7/site-packages/${name}/webapp.py"
>+python="%%PYTHON_CMD%%"
>+procname="%%PYTHON_SITELIBDIR%%/${name}/webapp.py"
> command=/usr/sbin/daemon
> command_args=" -c -f -P ${searx_pidfile} ${python} ${procname}"
> start_precmd="searx_precmd"
>Index: www/py-searx/pkg-descr
>===================================================================
>--- www/py-searx/pkg-descr	(revision 462469)
>+++ www/py-searx/pkg-descr	(working copy)
>@@ -1,3 +1,19 @@
>-A privacy-respecting, hackable metasearch engine.
>+Searx is a free internet metasearch engine which aggregates results
>+from more than 70 search services. Users are neither tracked nor profiled.
>+Additionally, searx can be used over Tor for online anonymity.
> 
>+Get started with searx by using one of the public instances. If you don't
>+trust anyone, you can set up your own service.
>+
>+Features:
>+* Self hosted
>+* No user tracking
>+* No user profiling
>+* About 70 supported search engines
>+* Easy integration with any search engine
>+* Cookies are not used by default
>+* Secure, encrypted connections (HTTPS/SSL)
>+* Hosted by organisations, such as La Quadrature du Net, which promote
>+  digital rights
>+
> WWW: https://github.com/asciimoo/searx
>Index: www/py-searx/pkg-plist
>===================================================================
>--- www/py-searx/pkg-plist	(nonexistent)
>+++ www/py-searx/pkg-plist	(working copy)
>@@ -0,0 +1 @@
>+@sample etc/searx-settings.yml.sample
>
>Property changes on: www/py-searx/pkg-plist
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 226055: 190818 | 190841 | 190843