Date: Wed, 1 Dec 2010 00:43:53 +0100 (CET) From: Klaus Aehlig <aehlig@linta.de> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/152728: [maintainer][patch] www/uzbl update to Version 2010.11.25 Message-ID: <20101130234353.6CE121CC1D@curry.linta.de> Resent-Message-ID: <201012010020.oB10KAIm009955@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 152728
>Category: ports
>Synopsis: [maintainer][patch] www/uzbl update to Version 2010.11.25
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Wed Dec 01 00:20:10 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator: Klaus Aehlig
>Release: FreeBSD 8.1-STABLE amd64
>Organization:
>Environment:
System: FreeBSD curry.linta.de 8.1-STABLE FreeBSD 8.1-STABLE #7: Sat Sep 25 11:25:43 CEST 2010 aehlig@curry.linta.de:/usr/obj/usr/src/sys/CURRY amd64
>Description:
Update to the version of 2010.11.25
>How-To-Repeat:
>Fix:
Apply the following patch (cd uzbl && patch -p0 < ../uzbl.diff).
Note: this patch will add the following new files
files/patch-examples__uzbl-cookie-manager.c
files/patch-src__cookie-jar.c
files/patch-src__util.c
files/patch-src__uzbl-browser
--- uzbl.diff begins here ---
diff -ruN uzbl.orig/Makefile uzbl/Makefile
--- uzbl.orig/Makefile 2010-12-01 00:24:14.000000000 +0100
+++ uzbl/Makefile 2010-12-01 00:26:50.000000000 +0100
@@ -20,8 +20,8 @@
USE_LDCONFIG= yes
USE_GMAKE= yes
-GITDATE= 2010.08.05
-GITVERSION= 9cc39cb
+GITDATE= 2010.11.25
+GITVERSION= 5180049
WRKSRC= ${WRKDIR}/Dieterbe-uzbl-${GITVERSION}
@@ -30,7 +30,7 @@
.if !defined(NOPORTDOCS)
PORTDOCS= AUTHORS README COMMUNITY CONTRIBUTING FAQ INSTALL TODO config-syntax \
- multiple-instances-management performance url-editing config.h
+ multiple-instances-management performance url-editing config.h vim README.cookies
.endif
.if !defined(NOPORTDATA)
@@ -54,6 +54,7 @@
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/uzbl-core ${PREFIX}/bin
+ ${INSTALL_PROGRAM} ${WRKSRC}/uzbl-cookie-manager ${PREFIX}/bin
${INSTALL_SCRIPT} ${WRKSRC}/src/uzbl-browser ${PREFIX}/bin
.for f in uzbl-event-manager uzbl-cookie-daemon uzbl-tabbed
${INSTALL_SCRIPT} ${WRKSRC}/examples/data/scripts/${f} ${PREFIX}/bin
@@ -62,17 +63,17 @@
${MKDIR} ${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/src/config.h ${DOCSDIR}
.for f in COMMUNITY CONTRIBUTING FAQ INSTALL TODO config-syntax \
- multiple-instances-management performance url-editing
+ multiple-instances-management performance url-editing README.cookies
${INSTALL_DATA} ${WRKSRC}/docs/${f} ${DOCSDIR}/${f}
.endfor
.for f in AUTHORS README
${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}/${f}
.endfor
+ (cd ${WRKSRC}/extras && ${COPYTREE_SHARE} vim ${DOCSDIR})
.endif
.if !defined(NOPORTDATA)
${MKDIR} ${DATADIR}/examples/data/dforms ${DATADIR}/examples/config
-.for f in config/cookies \
- data/bookmarks \
+.for f in data/bookmarks \
data/dforms/bbs.archlinux.org \
data/style.css data/uzbl.png
${INSTALL_DATA} ${WRKSRC}/examples/${f} ${DATADIR}/examples/${f}
diff -ruN uzbl.orig/distinfo uzbl/distinfo
--- uzbl.orig/distinfo 2010-12-01 00:24:14.000000000 +0100
+++ uzbl/distinfo 2010-12-01 00:24:34.000000000 +0100
@@ -1,3 +1,3 @@
-MD5 (uzbl-0.0.0.2010.08.05.tar.gz) = b6e3323337d2093e55c7d85648bab3aa
-SHA256 (uzbl-0.0.0.2010.08.05.tar.gz) = 9a04e835990519b039a35a7652672f4235890af86699aafe73a71a3e1dc9971f
-SIZE (uzbl-0.0.0.2010.08.05.tar.gz) = 136797
+MD5 (uzbl-0.0.0.2010.11.25.tar.gz) = 5afe6129765dede6f59a36e879e3db9a
+SHA256 (uzbl-0.0.0.2010.11.25.tar.gz) = 715163193b1c15377a1caaf2e993ef56584e356e6e62e74184b0acdb0c76bbd3
+SIZE (uzbl-0.0.0.2010.11.25.tar.gz) = 145473
diff -ruN uzbl.orig/files/patch-examples__uzbl-cookie-manager.c uzbl/files/patch-examples__uzbl-cookie-manager.c
--- uzbl.orig/files/patch-examples__uzbl-cookie-manager.c 1970-01-01 01:00:00.000000000 +0100
+++ uzbl/files/patch-examples__uzbl-cookie-manager.c 2010-12-01 00:24:34.000000000 +0100
@@ -0,0 +1,26 @@
+--- examples/uzbl-cookie-manager.c.orig 2010-11-25 05:56:44.000000000 +0100
++++ examples/uzbl-cookie-manager.c 2010-12-01 00:18:04.000000000 +0100
+@@ -1,5 +1,3 @@
+-#define _POSIX_SOURCE
+-
+ #include <stdio.h>
+ #include <errno.h>
+ #include <string.h>
+@@ -10,7 +8,7 @@
+ #include <sys/socket.h>
+ #include <sys/un.h>
+ #include <sys/select.h>
+-#include <sys/unistd.h>
++#include <unistd.h>
+
+ #include <sys/stat.h>
+ #include <sys/file.h>
+@@ -36,7 +34,7 @@
+ /* delete the cookie socket if it was left behind on a previous run */
+ unlink(cookied_socket_path);
+
+- int socket_fd = socket(AF_UNIX, SOCK_SEQPACKET, 0);
++ int socket_fd = socket(AF_UNIX, SOCK_STREAM, 0);
+
+ if(socket_fd < 0) {
+ fprintf(stderr, "socket failed (%s)\n", strerror(errno));
diff -ruN uzbl.orig/files/patch-src__cookie-jar.c uzbl/files/patch-src__cookie-jar.c
--- uzbl.orig/files/patch-src__cookie-jar.c 1970-01-01 01:00:00.000000000 +0100
+++ uzbl/files/patch-src__cookie-jar.c 2010-12-01 00:24:34.000000000 +0100
@@ -0,0 +1,11 @@
+--- src/cookie-jar.c.orig 2010-11-29 21:00:58.000000000 +0100
++++ src/cookie-jar.c 2010-11-29 21:01:17.000000000 +0100
+@@ -211,7 +211,7 @@
+ sa.sun_family = AF_UNIX;
+
+ /* create socket file descriptor and connect it to path */
+- fd = socket(AF_UNIX, SOCK_SEQPACKET, 0);
++ fd = socket(AF_UNIX, SOCK_STREAM, 0);
+ if(fd == -1) {
+ g_printerr("connect_cookie_socket: creating socket failed (%s)\n", strerror(errno));
+ return;
diff -ruN uzbl.orig/files/patch-src__util.c uzbl/files/patch-src__util.c
--- uzbl.orig/files/patch-src__util.c 1970-01-01 01:00:00.000000000 +0100
+++ uzbl/files/patch-src__util.c 2010-12-01 00:24:34.000000000 +0100
@@ -0,0 +1,8 @@
+--- src/util.c.orig 2010-11-30 23:22:23.000000000 +0100
++++ src/util.c 2010-11-30 23:23:09.000000000 +0100
+@@ -1,5 +1,3 @@
+-#define _POSIX_SOURCE
+-
+ #include <stdlib.h>
+ #include <unistd.h>
+ #include <string.h>
diff -ruN uzbl.orig/files/patch-src__uzbl-browser uzbl/files/patch-src__uzbl-browser
--- uzbl.orig/files/patch-src__uzbl-browser 1970-01-01 01:00:00.000000000 +0100
+++ uzbl/files/patch-src__uzbl-browser 2010-12-01 00:24:34.000000000 +0100
@@ -0,0 +1,11 @@
+--- src/uzbl-browser.orig 2010-12-01 00:06:50.000000000 +0100
++++ src/uzbl-browser 2010-12-01 00:07:09.000000000 +0100
+@@ -74,7 +74,7 @@
+ DAEMON_SOCKET="$XDG_CACHE_HOME"/uzbl/event_daemon
+ #if [ ! -f "$DAEMON_SOCKET".pid ]
+ #then
+- ${UZBL_EVENT_MANAGER:-uzbl-event-manager -va start}
++ ${UZBL_EVENT_MANAGER:-uzbl-event-manager} -va start
+ #fi
+
+ exec uzbl-core "$@" ${config_file:+--config "$config_file"} --connect-socket $DAEMON_SOCKET
diff -ruN uzbl.orig/files/patch-uzbl-core.c uzbl/files/patch-uzbl-core.c
--- uzbl.orig/files/patch-uzbl-core.c 2010-12-01 00:24:14.000000000 +0100
+++ uzbl/files/patch-uzbl-core.c 2010-12-01 00:24:34.000000000 +0100
@@ -1,5 +1,5 @@
---- src/uzbl-core.c.orig 2010-01-05 20:17:29.000000000 +0100
-+++ src/uzbl-core.c 2010-01-08 10:13:45.000000000 +0100
+--- src/uzbl-core.c.orig 2010-11-29 20:00:45.000000000 +0100
++++ src/uzbl-core.c 2010-11-29 19:59:16.000000000 +0100
@@ -29,6 +29,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
@@ -8,12 +8,3 @@
#include "uzbl-core.h"
#include "callbacks.h"
#include "events.h"
-@@ -1436,7 +1437,7 @@
- sa.sun_family = AF_UNIX;
-
- /* create socket file descriptor and connect it to path */
-- fd = socket(AF_UNIX, SOCK_SEQPACKET, 0);
-+ fd = socket(AF_UNIX, SOCK_STREAM, 0);
- if(fd == -1) {
- g_printerr("talk_to_socket: creating socket failed (%s)\n", strerror(errno));
- return;
diff -ruN uzbl.orig/pkg-plist uzbl/pkg-plist
--- uzbl.orig/pkg-plist 2010-12-01 00:24:14.000000000 +0100
+++ uzbl/pkg-plist 2010-12-01 00:24:34.000000000 +0100
@@ -1,5 +1,6 @@
bin/uzbl-core
bin/uzbl-browser
bin/uzbl-cookie-daemon
+bin/uzbl-cookie-manager
bin/uzbl-event-manager
bin/uzbl-tabbed
--- uzbl.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20101130234353.6CE121CC1D>