Attachment 151933 Details for Bug 196941 – yours-1.7.patch

[patch] yours-1.7.patch

yourls-1.7-corrected.patch (text/plain), 10.40 KB, created by Chip Marshall on 2015-01-20 21:56:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chip Marshall

Created: 2015-01-20 21:56:43 UTC

Size: 10.40 KB

patch

obsolete

>diff --git a/www/yourls/Makefile b/www/yourls/Makefile
>index 49e5114..9dd513d 100644
>--- a/www/yourls/Makefile
>+++ b/www/yourls/Makefile
>@@ -2,22 +2,22 @@
> # $FreeBSD$
> 
> PORTNAME=	yourls
>-DISTVERSION=	1.5.1
>+DISTVERSION=	1.7
> CATEGORIES=	www
>-MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	chip@2bithacker.net
> COMMENT=	Your Own URL Shortener
> 
> LICENSE=	GPLv3
> 
>-WRKSRC=		${WRKDIR}/${PORTNAME}
>-EXTRACT_AFTER_ARGS=	-d ${WRKSRC}
>+USE_GITHUB=	yes
>+GH_ACCOUNT=	YOURLS
>+GH_PROJECT=	YOURLS
>+GH_COMMIT=	68cdac8
> 
>-USES=		zip:infozip
> NO_BUILD=	YES
> 
>-USE_PHP=	bcmath curl json mysql pcre xml
>+USE_PHP=	bcmath curl json mysql pcre xml filter
> 
> SUB_LIST+=	PKGNAME=${PKGNAME}
> SUB_FILES+=	pkg-message
>diff --git a/www/yourls/distinfo b/www/yourls/distinfo
>index 625dfe7..0649dcf 100644
>--- a/www/yourls/distinfo
>+++ b/www/yourls/distinfo
>@@ -1,2 +1,2 @@
>-SHA256 (yourls-1.5.1.zip) = a326e2a4d272c53646adb46395c9d2fcfe41d445e42a619221f21f7546a74884
>-SIZE (yourls-1.5.1.zip) = 1333523
>+SHA256 (yourls-1.7.tar.gz) = b43a6311730545fb2f02e2a757b03d2017c48ac09b368e33e2e4eb9810d9ff04
>+SIZE (yourls-1.7.tar.gz) = 1750857
>diff --git a/www/yourls/pkg-plist b/www/yourls/pkg-plist
>index ab9dd5e..adde584 100644
>--- a/www/yourls/pkg-plist
>+++ b/www/yourls/pkg-plist
>@@ -1,12 +1,18 @@
> @owner %%WWWOWN%%
> @group %%WWWGRP%%
>+%%WWWDIR%%/.gitattributes
>+%%WWWDIR%%/.gitignore
>+%%WWWDIR%%/.travis.yml
>+%%WWWDIR%%/CHANGELOG.md
>+%%WWWDIR%%/CONTRIBUTING.md
>+%%WWWDIR%%/LICENSE.md
>+%%WWWDIR%%/README.md
> %%WWWDIR%%/admin/admin-ajax.php
> %%WWWDIR%%/admin/index.php
> %%WWWDIR%%/admin/install.php
> %%WWWDIR%%/admin/plugins.php
> %%WWWDIR%%/admin/tools.php
> %%WWWDIR%%/admin/upgrade.php
>-%%WWWDIR%%/changelog.txt
> %%WWWDIR%%/css/cal.css
> %%WWWDIR%%/css/infos.css
> %%WWWDIR%%/css/palette.png
>@@ -34,20 +40,90 @@
> %%WWWDIR%%/images/share.png
> %%WWWDIR%%/images/twitter.png
> %%WWWDIR%%/images/yourls-logo.png
>+%%WWWDIR%%/includes/Requests/README.md
>+%%WWWDIR%%/includes/Requests/Requests.php
>+%%WWWDIR%%/includes/Requests/Requests/Auth.php
>+%%WWWDIR%%/includes/Requests/Requests/Auth/Basic.php
>+%%WWWDIR%%/includes/Requests/Requests/Cookie.php
>+%%WWWDIR%%/includes/Requests/Requests/Cookie/Jar.php
>+%%WWWDIR%%/includes/Requests/Requests/Exception.php
>+%%WWWDIR%%/includes/Requests/Requests/Exception/HTTP.php
>+%%WWWDIR%%/includes/Requests/Requests/Exception/HTTP/400.php
>+%%WWWDIR%%/includes/Requests/Requests/Exception/HTTP/401.php
>+%%WWWDIR%%/includes/Requests/Requests/Exception/HTTP/402.php
>+%%WWWDIR%%/includes/Requests/Requests/Exception/HTTP/403.php
>+%%WWWDIR%%/includes/Requests/Requests/Exception/HTTP/404.php
>+%%WWWDIR%%/includes/Requests/Requests/Exception/HTTP/405.php
>+%%WWWDIR%%/includes/Requests/Requests/Exception/HTTP/406.php
>+%%WWWDIR%%/includes/Requests/Requests/Exception/HTTP/407.php
>+%%WWWDIR%%/includes/Requests/Requests/Exception/HTTP/408.php
>+%%WWWDIR%%/includes/Requests/Requests/Exception/HTTP/409.php
>+%%WWWDIR%%/includes/Requests/Requests/Exception/HTTP/410.php
>+%%WWWDIR%%/includes/Requests/Requests/Exception/HTTP/411.php
>+%%WWWDIR%%/includes/Requests/Requests/Exception/HTTP/412.php
>+%%WWWDIR%%/includes/Requests/Requests/Exception/HTTP/413.php
>+%%WWWDIR%%/includes/Requests/Requests/Exception/HTTP/414.php
>+%%WWWDIR%%/includes/Requests/Requests/Exception/HTTP/415.php
>+%%WWWDIR%%/includes/Requests/Requests/Exception/HTTP/416.php
>+%%WWWDIR%%/includes/Requests/Requests/Exception/HTTP/417.php
>+%%WWWDIR%%/includes/Requests/Requests/Exception/HTTP/418.php
>+%%WWWDIR%%/includes/Requests/Requests/Exception/HTTP/428.php
>+%%WWWDIR%%/includes/Requests/Requests/Exception/HTTP/429.php
>+%%WWWDIR%%/includes/Requests/Requests/Exception/HTTP/431.php
>+%%WWWDIR%%/includes/Requests/Requests/Exception/HTTP/500.php
>+%%WWWDIR%%/includes/Requests/Requests/Exception/HTTP/501.php
>+%%WWWDIR%%/includes/Requests/Requests/Exception/HTTP/502.php
>+%%WWWDIR%%/includes/Requests/Requests/Exception/HTTP/503.php
>+%%WWWDIR%%/includes/Requests/Requests/Exception/HTTP/504.php
>+%%WWWDIR%%/includes/Requests/Requests/Exception/HTTP/505.php
>+%%WWWDIR%%/includes/Requests/Requests/Exception/HTTP/511.php
>+%%WWWDIR%%/includes/Requests/Requests/Exception/HTTP/Unknown.php
>+%%WWWDIR%%/includes/Requests/Requests/Hooker.php
>+%%WWWDIR%%/includes/Requests/Requests/Hooks.php
>+%%WWWDIR%%/includes/Requests/Requests/IDNAEncoder.php
>+%%WWWDIR%%/includes/Requests/Requests/IPv6.php
>+%%WWWDIR%%/includes/Requests/Requests/IRI.php
>+%%WWWDIR%%/includes/Requests/Requests/Proxy.php
>+%%WWWDIR%%/includes/Requests/Requests/Proxy/HTTP.php
>+%%WWWDIR%%/includes/Requests/Requests/Response.php
>+%%WWWDIR%%/includes/Requests/Requests/Response/Headers.php
>+%%WWWDIR%%/includes/Requests/Requests/SSL.php
>+%%WWWDIR%%/includes/Requests/Requests/Session.php
>+%%WWWDIR%%/includes/Requests/Requests/Transport.php
>+%%WWWDIR%%/includes/Requests/Requests/Transport/cURL.php
>+%%WWWDIR%%/includes/Requests/Requests/Transport/cacert.pem
>+%%WWWDIR%%/includes/Requests/Requests/Transport/fsockopen.php
>+%%WWWDIR%%/includes/Requests/Requests/Utility/CaseInsensitiveDictionary.php
>+%%WWWDIR%%/includes/Requests/Requests/Utility/FilteredIterator.php
> %%WWWDIR%%/includes/auth.php
> %%WWWDIR%%/includes/class-mysql.php
>+%%WWWDIR%%/includes/ezSQL/README.md
>+%%WWWDIR%%/includes/ezSQL/ez_sql_core.php
>+%%WWWDIR%%/includes/ezSQL/ez_sql_core_yourls.php
>+%%WWWDIR%%/includes/ezSQL/ez_sql_mysql.php
>+%%WWWDIR%%/includes/ezSQL/ez_sql_mysql_yourls.php
>+%%WWWDIR%%/includes/ezSQL/ez_sql_mysqli.php
>+%%WWWDIR%%/includes/ezSQL/ez_sql_mysqli_yourls.php
>+%%WWWDIR%%/includes/ezSQL/ez_sql_pdo.php
>+%%WWWDIR%%/includes/ezSQL/ez_sql_pdo_yourls.php
>+%%WWWDIR%%/includes/functions-api.php
> %%WWWDIR%%/includes/functions-auth.php
> %%WWWDIR%%/includes/functions-compat.php
>+%%WWWDIR%%/includes/functions-deprecated.php
> %%WWWDIR%%/includes/functions-formatting.php
> %%WWWDIR%%/includes/functions-html.php
> %%WWWDIR%%/includes/functions-http.php
> %%WWWDIR%%/includes/functions-infos.php
> %%WWWDIR%%/includes/functions-install.php
>+%%WWWDIR%%/includes/functions-kses.php
>+%%WWWDIR%%/includes/functions-l10n.php
> %%WWWDIR%%/includes/functions-plugins.php
> %%WWWDIR%%/includes/functions-upgrade.php
> %%WWWDIR%%/includes/functions-xml.php
> %%WWWDIR%%/includes/functions.php
> %%WWWDIR%%/includes/geo/GeoIP.dat
>+%%WWWDIR%%/includes/geo/GeoIPv6.dat
>+%%WWWDIR%%/includes/geo/README.md
> %%WWWDIR%%/includes/geo/flags/flag_.gif
> %%WWWDIR%%/includes/geo/flags/flag_a1.gif
> %%WWWDIR%%/includes/geo/flags/flag_a2.gif
>@@ -312,8 +388,15 @@
> %%WWWDIR%%/includes/geo/flags/flag_zw.gif
> %%WWWDIR%%/includes/geo/flags/flag_zz.gif
> %%WWWDIR%%/includes/geo/geoip.inc
>-%%WWWDIR%%/includes/geo/readme.txt
> %%WWWDIR%%/includes/load-yourls.php
>+%%WWWDIR%%/includes/phpass/PasswordHash.php
>+%%WWWDIR%%/includes/phpass/README.md
>+%%WWWDIR%%/includes/phpass/test.php
>+%%WWWDIR%%/includes/pomo/entry.php
>+%%WWWDIR%%/includes/pomo/mo.php
>+%%WWWDIR%%/includes/pomo/po.php
>+%%WWWDIR%%/includes/pomo/streams.php
>+%%WWWDIR%%/includes/pomo/translations.php
> %%WWWDIR%%/includes/version.php
> %%WWWDIR%%/js/ZeroClipboard.swf
> %%WWWDIR%%/js/common.js
>@@ -322,25 +405,27 @@
> %%WWWDIR%%/js/jquery-1.3.2.min.js
> %%WWWDIR%%/js/jquery-1.4.3.min.js
> %%WWWDIR%%/js/jquery-1.6.1.min.js
>+%%WWWDIR%%/js/jquery-1.8.2.min.js
>+%%WWWDIR%%/js/jquery-1.9.1.min.js
> %%WWWDIR%%/js/jquery.cal.js
> %%WWWDIR%%/js/jquery.notifybar.js
> %%WWWDIR%%/js/jquery.tablesorter.min.js
> %%WWWDIR%%/js/jquery.zclip.min.js
> %%WWWDIR%%/js/share.js
>-%%WWWDIR%%/license.txt
> %%WWWDIR%%/pages/examplepage.php
> %%WWWDIR%%/pages/index.html
> %%WWWDIR%%/readme.html
>-%%WWWDIR%%/sample-public-api.php.txt
>-%%WWWDIR%%/sample-public-front-page.php.txt
>-%%WWWDIR%%/sample-remote-api-call.php.txt
>+%%WWWDIR%%/sample-public-api.txt
>+%%WWWDIR%%/sample-public-front-page.txt
>+%%WWWDIR%%/sample-remote-api-call.txt
> %%WWWDIR%%/sample-robots.txt
> %%WWWDIR%%/user/config-sample.php
> %%WWWDIR%%/user/index.html
>-%%WWWDIR%%/user/plugins/hyphens-in-urls/README.txt
>+%%WWWDIR%%/user/languages/index.html
>+%%WWWDIR%%/user/plugins/hyphens-in-urls/README.md
> %%WWWDIR%%/user/plugins/hyphens-in-urls/plugin.php
> %%WWWDIR%%/user/plugins/index.html
>-%%WWWDIR%%/user/plugins/random-bg/README.txt
>+%%WWWDIR%%/user/plugins/random-bg/README.md
> %%WWWDIR%%/user/plugins/random-bg/img/bg_ants.png
> %%WWWDIR%%/user/plugins/random-bg/img/bg_boobs.png
> %%WWWDIR%%/user/plugins/random-bg/img/bg_circles.png
>@@ -351,11 +436,11 @@
> %%WWWDIR%%/user/plugins/random-bg/img/bg_life.png
> %%WWWDIR%%/user/plugins/random-bg/img/bg_yourls.png
> %%WWWDIR%%/user/plugins/random-bg/plugin.php
>-%%WWWDIR%%/user/plugins/sample-page/README.txt
>+%%WWWDIR%%/user/plugins/sample-page/README.md
> %%WWWDIR%%/user/plugins/sample-page/plugin.php
>-%%WWWDIR%%/user/plugins/sample-plugin/README.txt
>+%%WWWDIR%%/user/plugins/sample-plugin/README.md
> %%WWWDIR%%/user/plugins/sample-plugin/plugin.php
>-%%WWWDIR%%/user/plugins/sample-toolbar/README.txt
>+%%WWWDIR%%/user/plugins/sample-toolbar/README.md
> %%WWWDIR%%/user/plugins/sample-toolbar/css/toolbar.css
> %%WWWDIR%%/user/plugins/sample-toolbar/img/close_button.gif
> %%WWWDIR%%/user/plugins/sample-toolbar/img/close_button_red.gif
>@@ -370,22 +455,35 @@
> @dir %%WWWDIR%%/admin
> @dir %%WWWDIR%%/css
> @dir %%WWWDIR%%/images
>-@dir %%WWWDIR%%/includes/geo/flags
>-@dir %%WWWDIR%%/includes/geo
> @dir %%WWWDIR%%/includes
>+@dir %%WWWDIR%%/includes/Requests
>+@dir %%WWWDIR%%/includes/Requests/Requests
>+@dir %%WWWDIR%%/includes/Requests/Requests/Auth
>+@dir %%WWWDIR%%/includes/Requests/Requests/Cookie
>+@dir %%WWWDIR%%/includes/Requests/Requests/Exception
>+@dir %%WWWDIR%%/includes/Requests/Requests/Exception/HTTP
>+@dir %%WWWDIR%%/includes/Requests/Requests/Proxy
>+@dir %%WWWDIR%%/includes/Requests/Requests/Response
>+@dir %%WWWDIR%%/includes/Requests/Requests/Transport
>+@dir %%WWWDIR%%/includes/Requests/Requests/Utility
>+@dir %%WWWDIR%%/includes/ezSQL
>+@dir %%WWWDIR%%/includes/geo
>+@dir %%WWWDIR%%/includes/geo/flags
>+@dir %%WWWDIR%%/includes/phpass
>+@dir %%WWWDIR%%/includes/pomo
> @dir %%WWWDIR%%/js
> @dir %%WWWDIR%%/pages
>+@dir %%WWWDIR%%/user
>+@dir %%WWWDIR%%/user/languages
>+@dir %%WWWDIR%%/user/plugins
> @dir %%WWWDIR%%/user/plugins/hyphens-in-urls
>-@dir %%WWWDIR%%/user/plugins/random-bg/img
> @dir %%WWWDIR%%/user/plugins/random-bg
>+@dir %%WWWDIR%%/user/plugins/random-bg/img
> @dir %%WWWDIR%%/user/plugins/sample-page
> @dir %%WWWDIR%%/user/plugins/sample-plugin
>+@dir %%WWWDIR%%/user/plugins/sample-toolbar
> @dir %%WWWDIR%%/user/plugins/sample-toolbar/css
> @dir %%WWWDIR%%/user/plugins/sample-toolbar/img
> @dir %%WWWDIR%%/user/plugins/sample-toolbar/js
>-@dir %%WWWDIR%%/user/plugins/sample-toolbar
>-@dir %%WWWDIR%%/user/plugins
>-@dir %%WWWDIR%%/user
>-@dir %%WWWDIR%%
> @owner root
> @group wheel

Actions: View | Diff

Attachments on bug 196941: 151911 | 151933 | 152822