Attachment 144577 Details for Bug 191806 – calibre-1.44.0.diff

[patch] calibre-1.44.0.diff

calibre-1.44.0.diff (text/plain), 3.17 KB, created by rnejdl on 2014-07-11 15:16:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: rnejdl

Created: 2014-07-11 15:16:05 UTC

Size: 3.17 KB

patch

obsolete

>diff -ruN calibre/Makefile calibre.new/Makefile
>--- calibre/Makefile	2014-07-06 10:47:08.000000000 -0500
>+++ calibre.new/Makefile	2014-07-11 09:24:22.000000000 -0500
>@@ -2,7 +2,7 @@
> # $FreeBSD: head/deskutils/calibre/Makefile 360929 2014-07-06 15:47:08Z madpilot $
> 
> PORTNAME=	calibre
>-PORTVERSION=	1.43.0
>+PORTVERSION=	1.44.0
> CATEGORIES=	deskutils python
> MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION}/
> 
>diff -ruN calibre/distinfo calibre.new/distinfo
>--- calibre/distinfo	2014-07-06 10:47:08.000000000 -0500
>+++ calibre.new/distinfo	2014-07-11 09:27:20.000000000 -0500
>@@ -1,2 +1,2 @@
>-SHA256 (calibre-1.43.0.tar.xz) = 3c4ef17591e033e39ba804d18442f63c3ebc1683da776833d47d8aa2900f724d
>-SIZE (calibre-1.43.0.tar.xz) = 35549180
>+SHA256 (calibre-1.44.0.tar.xz) = b2a49485ece16454169dfdd9da7481fabf0ae644b8e53f3fd114de4ceecf6992
>+SIZE (calibre-1.44.0.tar.xz) = 36438768
>diff -ruN calibre/files/calibre.in calibre.new/files/calibre.in
>--- calibre/files/calibre.in	2013-07-01 13:34:45.000000000 -0500
>+++ calibre.new/files/calibre.in	2014-07-11 09:26:57.000000000 -0500
>@@ -14,6 +14,8 @@
> #				Default is 8080
> # calibre_user (string):	user that calibre_server runs as
> #				Default is calibre
>+# calibre_home (string):	home directory for calibre_server
>+#				Default is the home directory of calibre_user
> # calibre_username (string):	username for calibre authentication
> #				Default is calibre
> # calibre_password (string):	If set then access is restricted
>@@ -38,7 +40,7 @@
> 
> pidfile=/var/run/${name}/${name}.pid
> command=/usr/local/bin/calibre-server
>-command_interpreter=python2.7
>+command_interpreter=python2
> required_dirs=${calibre_library}
> 
> start_cmd=${name}_start
>@@ -57,9 +59,11 @@
> 		command_args="${command_args} --password=${calibre_password}"
> 	fi
> 	if [ ! -z "${calibre_url_prefix}" ]; then
>-		command_args="${command_args} --url_prefx=${calibre_url_prefix}"
>+		command_args="${command_args} --url-prefx=${calibre_url_prefix}"
> 	fi
> 
>+	calibre_home=${calibre_home:-$(getent passwd ${calibre_user} | awk -F: '{print $6}')}
>+	HOME=${calibre_home:-/nonexistent}
> 	/usr/sbin/daemon -f -u ${calibre_user} -p ${pidfile} ${command} ${command_args} --with-library ${calibre_library}
> }
> 
>diff -ruN calibre/pkg-plist calibre.new/pkg-plist
>--- calibre/pkg-plist	2014-06-30 02:00:36.000000000 -0500
>+++ calibre.new/pkg-plist	2014-07-11 09:30:06.000000000 -0500
>@@ -1767,7 +1767,6 @@
> %%DATADIR%%/localization/stats.pickle
> %%DATADIR%%/metadata_sqlite.sql
> %%DATADIR%%/mime.types
>-%%DATADIR%%/quick_start.epub
> %%DATADIR%%/scripts.pickle
> %%DATADIR%%/template-functions.json
> %%DATADIR%%/templates/book_details.css
>@@ -1978,7 +1977,6 @@
> %%DATADIR%%/viewer/mathjax/jax/output/SVG/fonts/TeX/fontdata.js
> %%DATADIR%%/viewer/mathjax/jax/output/SVG/jax.js
> %%DATADIR%%/viewer/referencing.js
>-share/bash-completion/calibre
> share/gnome/apps/calibre-ebook-edit.desktop
> share/gnome/apps/calibre-ebook-viewer.desktop
> share/gnome/apps/calibre-gui.desktop
>@@ -2007,7 +2005,6 @@
> share/mime/application/x-topaz-ebook.xml
> share/mime/packages/calibre-mimetypes.xml
> share/mime/text/lrs.xml
>-share/zsh/site-functions/_calibre
> @dirrmtry share/mime/text
> @dirrmtry share/mime/packages
> @dirrmtry share/mime/application
>--- calibre-1.44.0.diff ends here ---

Actions: View | Diff

Attachments on bug 191806: 144577