[SM-Commit] GIT changes to stable-rc-0.61 grimoire by Vlad Glagolev (e26a75e3ba36692576f5e01b6147c78e5d39696b)

Vlad Glagolev scm at sourcemage.org
Tue May 15 15:12:22 EDT 2012


GIT changes to stable-rc-0.61 grimoire by Vlad Glagolev <stealth at sourcemage.org>:

 disk/fuse/DETAILS      |    5 ++-
 disk/fuse/HISTORY      |    8 +++++
 disk/fuse/PRE_BUILD    |    4 ++
 disk/fuse/unlock.patch |   71 +++++++++++++++++++++++++++++++++++++++++++++++++
 http/lynx/BUILD        |    4 ++
 http/lynx/CONFIGURE    |    3 ++
 http/lynx/DEPENDS      |   32 +++++++++++++++++++++-
 http/lynx/HISTORY      |    5 +++
 8 files changed, 128 insertions(+), 4 deletions(-)

New commits:
commit e26a75e3ba36692576f5e01b6147c78e5d39696b
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    lynx: added missing options
    (cherry picked from commit b3333f549668e84b9eb44c3b36e9b8ebe55a12f3)

commit 2c6876544a73d4008eeda07cbccd2d277cd00197
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    fuse: temporary solution for #393
    (cherry picked from commit 3a7b1e7288b43bf3621926568abe189a5c13d59d)

commit 401273edf37c89ada3e267fca62fcd0d187e157b
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    Revert "Revert "fuse: => 2.9.0""
    
    This reverts commit d928820818bc9233cd07bd0723b837b1d61712aa.
    (cherry picked from commit f16f1c516c32dc52fae0fc60bdff9eaf38689a5f)

diff --git a/disk/fuse/DETAILS b/disk/fuse/DETAILS
index a29c6db..c9ece06 100755
--- a/disk/fuse/DETAILS
+++ b/disk/fuse/DETAILS
@@ -1,7 +1,8 @@
            SPELL=fuse
 if [ "$FUSE_BRANCH" != "scm" ]; then
-         VERSION=2.8.7
-     SOURCE_HASH=sha512:c20fc2af3f3b19d86d68acf44e74555205ecb448a7e4d4ef4361a7520b01837ee39409400697e70b7e38cd8e6a1a24eb01f4ba4e5cb9a901dd170b52ee30a29c
+         VERSION=2.9.0
+      PATCHLEVEL=1
+     SOURCE_HASH=sha512:bee17f24299b96af956fa2620d3d6764ac742197fd5e5b168f495d8b046d9954ccf7fbbdadc0087f52cf341cc90a31bd0404108403eb6dcabed5508c5f2d1918
           SOURCE=$SPELL-$VERSION.tar.gz
    SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/disk/fuse/HISTORY b/disk/fuse/HISTORY
index 91f70e3..4abdced 100644
--- a/disk/fuse/HISTORY
+++ b/disk/fuse/HISTORY
@@ -1,3 +1,11 @@
+2012-05-15 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: PATCHLEVEL=1
+	* PRE_BUILD: apply the patch
+	* unlock.patch: added, to fix work with castfs 0.6.1; see #393
+
+2012-05-06 Sukneet Basuta <sukneet at sourcemage.org>
+	* DETAILS: updated spell to 2.9.0
+
 2012-02-15 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: updated spell to 2.8.7
 
diff --git a/disk/fuse/PRE_BUILD b/disk/fuse/PRE_BUILD
index a2bb535..c677cfb 100755
--- a/disk/fuse/PRE_BUILD
+++ b/disk/fuse/PRE_BUILD
@@ -2,6 +2,10 @@ default_pre_build         &&
 
 cd "$SOURCE_DIRECTORY"    &&
 
+# part of revert of official commit 3743f3fe
+# that brakes our castfs staging system 
+patch -p1 < "$SPELL_DIRECTORY/unlock.patch" &&
+
 if [ "$FUSE_BRANCH" != "scm" ]; then
   patch -p0 < "$SPELL_DIRECTORY/init.patch"
 fi  &&
diff --git a/disk/fuse/unlock.patch b/disk/fuse/unlock.patch
new file mode 100644
index 0000000..44ea382
--- /dev/null
+++ b/disk/fuse/unlock.patch
@@ -0,0 +1,71 @@
+reverted:
+--- b/lib/fuse.c
++++ a/lib/fuse.c
+@@ -495,26 +495,6 @@
+ 	}
+ }
+ 
+-static void release_tickets(struct fuse *f, fuse_ino_t nodeid,
+-			    struct node *wnode, int ticket)
+-{
+-	struct node *node;
+-
+-	if (wnode) {
+-		if (wnode->ticket != ticket)
+-			return;
+-
+-		wnode->ticket = 0;
+-	}
+-
+-	for (node = get_node(f, nodeid);
+-	     node->nodeid != FUSE_ROOT_ID; node = node->parent) {
+-		if (node->ticket != ticket)
+-			return;
+-		node->ticket = 0;
+-	}
+-}
+-
+ static int try_get_path(struct fuse *f, fuse_ino_t nodeid, const char *name,
+ 			char **path, struct node **wnodep, int ticket)
+ {
+@@ -527,10 +507,9 @@
+ 
+ 	*path = NULL;
+ 
+-	err = -ENOMEM;
+ 	buf = malloc(bufsize);
+ 	if (buf == NULL)
++		return -ENOMEM;
+-		goto out_err;
+ 
+ 	s = buf + bufsize - 1;
+ 	*s = '\0';
+@@ -598,10 +577,6 @@
+  out_free:
+ 	free(buf);
+ 
+- out_err:
+-	if (ticket && err != -EAGAIN)
+-		release_tickets(f, nodeid, wnode, ticket);
+-
+ 	return err;
+ }
+ 
+@@ -736,14 +711,9 @@
+ 	err = try_get_path(f, nodeid1, name1, path1, wnode1, ticket);
+ 	if (!err) {
+ 		err = try_get_path(f, nodeid2, name2, path2, wnode2, ticket);
++		if (err)
++			unlock_path(f, nodeid1, wnode1 ? *wnode1 : NULL, NULL,
++				    ticket);
+-		if (err) {
+-			struct node *wn1 = wnode1 ? *wnode1 : NULL;
+-
+-			unlock_path(f, nodeid1, wn1, NULL, ticket);
+-			free(path1);
+-			if (ticket && err != -EAGAIN)
+-				release_tickets(f, nodeid1, wn1, ticket);
+-		}
+ 	}
+ 	return err;
+ }
diff --git a/http/lynx/BUILD b/http/lynx/BUILD
index 56d9395..132d044 100755
--- a/http/lynx/BUILD
+++ b/http/lynx/BUILD
@@ -1,4 +1,6 @@
-mkdir  -p  /var/lib/lynx
+mkdir  -p  /var/lib/lynx &&
+
+OPTS="$LYNX_OPTS $OPTS" &&
 
 ./configure   --host=$BUILD                         \
               --prefix=$INSTALL_ROOT/usr            \
diff --git a/http/lynx/CONFIGURE b/http/lynx/CONFIGURE
new file mode 100755
index 0000000..b853e84
--- /dev/null
+++ b/http/lynx/CONFIGURE
@@ -0,0 +1,3 @@
+config_query_option LYNX_OPTS "Enable IPv6?" y \
+                              "--enable-ipv6" \
+                              "--disable-ipv6"
diff --git a/http/lynx/DEPENDS b/http/lynx/DEPENDS
index 82ca091..1d0f864 100755
--- a/http/lynx/DEPENDS
+++ b/http/lynx/DEPENDS
@@ -1 +1,31 @@
-optional_depends  "openssl"  "--with-ssl"  ""  "encryption for HTTPS"
+depends ncurses &&
+
+optional_depends gettext \
+                 "--enable-nls --without-included-gettext" \
+                 "--disable-nls" \
+                 "for Native Language Support" &&
+
+optional_depends openssl \
+                 "--with-ssl" \
+                 "--without-ssl" \
+                 "for HTTPS support via OpenSSL" &&
+
+optional_depends gnutls \
+                 "--with-gnutls" \
+                 "--without-gnutls" \
+                 "for HTTPS support via GNUTLS" &&
+
+optional_depends SYSTEM-LOGGER \
+                 "--enable-syslog" \
+                 "--disable-syslog" \
+                 "to log URL requests via syslog" &&
+
+optional_depends zlib \
+                 "--with-zlib" \
+                 "--without-zlib" \
+                 "for decompression of some gzip files" &&
+
+optional_depends bzip2 \
+                 "--with-bzlib" \
+                 "--without-bzlib" \
+                 "for decompression of some bzip2 files"
diff --git a/http/lynx/HISTORY b/http/lynx/HISTORY
index 86126e3..7860812 100644
--- a/http/lynx/HISTORY
+++ b/http/lynx/HISTORY
@@ -1,3 +1,8 @@
+2012-05-15 Vlad Glagolev <stealth at sourcemage.org>
+	* DEPENDS: added more dependencies
+	* BUILD: use LYNX_OPTS
+	* CONFIGURE: added, for IPv6 support selector
+
 2010-08-02 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 2.8.7rel.2
 


More information about the SM-Commit mailing list