sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Vlad Glagolev (d57378f903c31d92c73d1050f31ff1146bb6dcfc)

From: Vlad Glagolev <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (d57378f903c31d92c73d1050f31ff1146bb6dcfc)
Date: Sun, 5 Aug 2012 07:17:01 -0500

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

dev/null |binary
disk/fuse/DETAILS | 5 +-
disk/fuse/HISTORY | 6 +++
disk/fuse/PRE_BUILD | 3 -
disk/fuse/init.patch | 12 +++---
disk/fuse/unlock.patch | 71
-----------------------------------------
net/ferm/DEPENDS | 4 +-
net/ferm/DETAILS | 5 +-
net/ferm/HISTORY | 4 ++
net/ferm/ferm-2.1.1.tar.gz.sig |binary
net/ferm/ferm-2.1.tar.gz.sig | 0
net/samba/HISTORY | 4 ++
net/samba/PRE_BUILD | 3 +
net/samba/cups16.patch.gz |binary
printer/cups-filters/DEPENDS | 2 -
printer/cups-filters/HISTORY | 3 +
smgl/castfs/DETAILS | 2 -
smgl/castfs/HISTORY | 7 ++++
smgl/castfs/PRE_BUILD | 3 +
smgl/castfs/TRIGGERS | 2 -
smgl/castfs/argc.patch | 30 +++++++++++++++++
21 files changed, 76 insertions(+), 90 deletions(-)

New commits:
commit 97a7df774a4796df05c6992d6eb0805cbc8b585e
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

castfs: fixes crashing when running without arguments, see #395

commit 734076c6c8cc0517acd0bf35995c64ebedca9154
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

castfs: fixed TRIGGERS

commit 382a264886735197a83dcf8c700e541a77dd2c04
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

fuse: => 2.9.1

commit 882d3feb5323ca0243512b9b51d9a108febf5378
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

samba: fixed build with cups 1.6

commit ccea06934d1bcdbc4882bd190e4249221e565981
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

ferm: => 2.1.1

commit cfb0718292d8df6f6f6aafa747f54d342429f4b7
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

cups-filters: fixed build when poppler doesn't conform required options

diff --git a/disk/fuse/DETAILS b/disk/fuse/DETAILS
index c9ece06..6f3dee8 100755
--- a/disk/fuse/DETAILS
+++ b/disk/fuse/DETAILS
@@ -1,8 +1,7 @@
SPELL=fuse
if [ "$FUSE_BRANCH" != "scm" ]; then
- VERSION=2.9.0
- PATCHLEVEL=1
-
SOURCE_HASH=sha512:bee17f24299b96af956fa2620d3d6764ac742197fd5e5b168f495d8b046d9954ccf7fbbdadc0087f52cf341cc90a31bd0404108403eb6dcabed5508c5f2d1918
+ VERSION=2.9.1
+
SOURCE_HASH=sha512:6675810ba92b9f8dd289eec9c4eb45fe371e6a7f7c0c5c7a2533d813353fcbbcb78e20eb61a92057a985a556eacc67e4e6a9d5d06513028e1c2c19ab7fe59ffc
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 86811ba..85d3042 100644
--- a/disk/fuse/HISTORY
+++ b/disk/fuse/HISTORY
@@ -1,3 +1,9 @@
+2012-08-05 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.9.1
+ * init.patch: updated
+ * unlock.patch: removed, finally fixed in upstream vcs with
+ (3c4c063a2fd5cc6e9ce2b5db82e2a0dfa59b2e40)
+
2012-07-23 Pol Vinogradov <vin.public AT gmail.com>
* PRE_BUILD: unlock.patch now applies to stable branch only

diff --git a/disk/fuse/PRE_BUILD b/disk/fuse/PRE_BUILD
index dc1471d..0545e39 100755
--- a/disk/fuse/PRE_BUILD
+++ b/disk/fuse/PRE_BUILD
@@ -6,9 +6,6 @@ cd "$SOURCE_DIRECTORY" &&
sed -i "/sched/s|<|<linux/|" util/fusermount.c &&

if [ "$FUSE_BRANCH" != "scm" ]; then
- # part of revert of official commit 3743f3fe
- # that brakes our castfs staging system
- patch -p1 < "$SPELL_DIRECTORY/unlock.patch"
# prevent installing fuse initscript into the wrong place
patch -p0 < "$SPELL_DIRECTORY/init.patch"
else
diff --git a/disk/fuse/init.patch b/disk/fuse/init.patch
index 5f3b3b2..7846a18 100644
--- a/disk/fuse/init.patch
+++ b/disk/fuse/init.patch
@@ -1,10 +1,10 @@
---- util/Makefile.in.orig 2010-09-28 13:23:54.000000000 +0400
-+++ util/Makefile.in 2011-05-14 22:35:20.612452475 +0400
-@@ -593,8 +593,6 @@
+--- util/Makefile.in.orig 2012-07-19 16:53:28.000000000 +0400
++++ util/Makefile.in 2012-08-05 15:32:53.820922057 +0400
+@@ -650,8 +650,6 @@
install-exec-local:
- $(mkdir_p) $(DESTDIR)$(MOUNT_FUSE_PATH)
- $(INSTALL_PROGRAM) $(srcdir)/mount.fuse
$(DESTDIR)$(MOUNT_FUSE_PATH)/mount.fuse
-- $(mkdir_p) $(DESTDIR)$(INIT_D_PATH)
+ $(MKDIR_P) $(DESTDIR)$(MOUNT_FUSE_PATH)
+ $(INSTALL_PROGRAM) $(builddir)/mount.fuse
$(DESTDIR)$(MOUNT_FUSE_PATH)/mount.fuse
+- $(MKDIR_P) $(DESTDIR)$(INIT_D_PATH)
- $(INSTALL_SCRIPT) $(srcdir)/init_script $(DESTDIR)$(INIT_D_PATH)/fuse
@if test -x /usr/sbin/update-rc.d; then \
echo "/usr/sbin/update-rc.d fuse start 34 S . start 41 0 6 .
|| true"; \
diff --git a/disk/fuse/unlock.patch b/disk/fuse/unlock.patch
deleted file mode 100644
index 44ea382..0000000
--- a/disk/fuse/unlock.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-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/net/ferm/DEPENDS b/net/ferm/DEPENDS
index 71c5d27..a47a141 100755
--- a/net/ferm/DEPENDS
+++ b/net/ferm/DEPENDS
@@ -1,2 +1,2 @@
-depends perl &&
-depends iptables
+runtime_depends perl &&
+runtime_depends iptables
diff --git a/net/ferm/DETAILS b/net/ferm/DETAILS
index 04534a7..773041b 100755
--- a/net/ferm/DETAILS
+++ b/net/ferm/DETAILS
@@ -1,7 +1,8 @@
SPELL=ferm
- VERSION=2.1
+ VERSION=2.1.1
+ BRANCH=`echo $VERSION | cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.gz
- SOURCE_URL[0]=http://ferm.foo-projects.org/download/${VERSION}/$SOURCE
+ SOURCE_URL[0]=http://ferm.foo-projects.org/download/${BRANCH}/$SOURCE
SOURCE_GPG=gurus.gpg:$SOURCE.sig
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://ferm.foo-projects.org/
diff --git a/net/ferm/HISTORY b/net/ferm/HISTORY
index ec59a0d..70cf197 100644
--- a/net/ferm/HISTORY
+++ b/net/ferm/HISTORY
@@ -1,3 +1,7 @@
+2012-08-05 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.1.1; use BRANCH
+ * DEPENDS: depends -> runtime_depends
+
2011-07-18 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 2.1

diff --git a/net/ferm/ferm-2.1.1.tar.gz.sig b/net/ferm/ferm-2.1.1.tar.gz.sig
new file mode 100644
index 0000000..8395f68
Binary files /dev/null and b/net/ferm/ferm-2.1.1.tar.gz.sig differ
diff --git a/net/ferm/ferm-2.1.tar.gz.sig b/net/ferm/ferm-2.1.tar.gz.sig
deleted file mode 100644
index e303f75..0000000
Binary files a/net/ferm/ferm-2.1.tar.gz.sig and /dev/null differ
diff --git a/net/samba/HISTORY b/net/samba/HISTORY
index e11d37b..32986c4 100644
--- a/net/samba/HISTORY
+++ b/net/samba/HISTORY
@@ -1,3 +1,7 @@
+2012-08-05 Vlad Glagolev <stealth AT sourcemage.org>
+ * cups16.patch.gz: added, to fix build with cups 1.6
+ * PRE_BUILD: apply the patch
+
2012-07-29 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: PATCHLEVEL=1
* init.d/samba: fixed bug about start/stop for a long time when
running
diff --git a/net/samba/PRE_BUILD b/net/samba/PRE_BUILD
index 633d405..39dfe86 100755
--- a/net/samba/PRE_BUILD
+++ b/net/samba/PRE_BUILD
@@ -1,6 +1,9 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&

+if is_depends_enabled $SPELL cups; then
+ zcat "$SPELL_DIRECTORY/cups16.patch" | patch -p1
+fi &&

#sedit 's!libsmbclient.*\$(LIBDIR)!&/..!' source/Makefile.in &&

diff --git a/net/samba/cups16.patch.gz b/net/samba/cups16.patch.gz
new file mode 100644
index 0000000..5953412
Binary files /dev/null and b/net/samba/cups16.patch.gz differ
diff --git a/printer/cups-filters/DEPENDS b/printer/cups-filters/DEPENDS
index 2fdfbb4..bb90580 100755
--- a/printer/cups-filters/DEPENDS
+++ b/printer/cups-filters/DEPENDS
@@ -2,7 +2,7 @@ depends -sub CXX gcc &&
depends zlib &&
depends pkgconfig &&
depends ghostscript &&
-depends poppler &&
+depends -sub XPDF_HEADERS poppler &&
depends lcms2 &&
depends freetype2 &&
depends fontconfig &&
diff --git a/printer/cups-filters/HISTORY b/printer/cups-filters/HISTORY
index bc27516..74ed833 100644
--- a/printer/cups-filters/HISTORY
+++ b/printer/cups-filters/HISTORY
@@ -1,3 +1,6 @@
+2012-08-05 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: requires poppler built with xpdf headers
+
2012-08-01 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: runtime_depends bc

diff --git a/smgl/castfs/DETAILS b/smgl/castfs/DETAILS
index 57caacd..5ddd3bb 100755
--- a/smgl/castfs/DETAILS
+++ b/smgl/castfs/DETAILS
@@ -14,6 +14,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}-git
FORCE_DOWNLOAD=1
else
VERSION=0.6.1
+ PATCHLEVEL=4
SOURCE=${SPELL}-${VERSION}.tar.bz2
SOURCE2=${SOURCE}.sig
SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}-${VERSION}
@@ -27,7 +28,6 @@ fi
LICENSE[0]=GPL
KEYWORDS="filesystems smgl"
SHORT="Fuse filesystem used for staging packages."
- PATCHLEVEL=3
cat << EOF
castfs is a fuse filesystem written in C and is used for capturing
filesystem
calls for your root filesystem and staging any modifications or additions to
diff --git a/smgl/castfs/HISTORY b/smgl/castfs/HISTORY
index abe8701..6c0c4df 100644
--- a/smgl/castfs/HISTORY
+++ b/smgl/castfs/HISTORY
@@ -1,3 +1,10 @@
+2012-08-05 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: register new triggers (PATCHLEVEL+=1)
+ * TRIGGERS: corrected static build check
+ * PRE_BUILD: apply the patch
+ * argc.patch: added, to prevent crashing when ran without arguments
+ (fixes #395)
+
2012-06-06 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* BUILD: added -lpthread to LDFLAGS to prevent link error

diff --git a/smgl/castfs/PRE_BUILD b/smgl/castfs/PRE_BUILD
index 946a46c..20c1e58 100755
--- a/smgl/castfs/PRE_BUILD
+++ b/smgl/castfs/PRE_BUILD
@@ -1,4 +1,7 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
+
+patch -p0 < "$SPELL_DIRECTORY/argc.patch" &&
+
# disable the xattr functions until they get fixed #14479
sed -i 's,setxattr,,' configure
diff --git a/smgl/castfs/TRIGGERS b/smgl/castfs/TRIGGERS
index 1324f64..6af29bb 100755
--- a/smgl/castfs/TRIGGERS
+++ b/smgl/castfs/TRIGGERS
@@ -1,3 +1,3 @@
-if [[ $STATIC_FUSE == y ]]; then
+if list_find "$STATIC_FUSE" "--enable-static-fuse"; then
on_cast fuse cast_self
fi
diff --git a/smgl/castfs/argc.patch b/smgl/castfs/argc.patch
new file mode 100644
index 0000000..a70bc69
--- /dev/null
+++ b/smgl/castfs/argc.patch
@@ -0,0 +1,30 @@
+--- src/castfs.c.orig 2010-03-30 09:07:57.000000000 +0400
++++ src/castfs.c 2012-08-05 16:05:34.667167115 +0400
+@@ -724,6 +724,13 @@
+ char *new_argv[argc], *logptr, *dbgptr, deflog[]="/tmp/castfs.log";
+ int new_argc = 0;
+
++ /* Currently, need: `castfs mnt-dir -o stage=stage-dir` */
++ if (argc < 4) {
++fprintf(stderr, "castfs: argc wrong\n");
++ usage();
++ exit(-1);
++ }
++
+ /* get environmental vars and open fd's for log file */
+ umask(0);
+
+@@ -760,13 +767,6 @@
+ dbglvl = dbgdef; // Toggle the needed bits.
+ }
+
+- /* Currently, need: `castfs mnt-dir -o stage=stage-dir` */
+- if (argc < 4) {
+-fprintf(stderr, "castfs: argc wrong\n");
+- usage();
+- exit(-1);
+- }
+-
+ /* dump some nice header information in the log file */
+ cast_log(CAST_DBG_MAIN, "main\n");
+ cast_log(CAST_DBG_MAIN, "logfile %s fd %d\n",
getenv("CASTFS_LOGFILE"),

[SM-Commit] GIT changes to master grimoire by Vlad Glagolev (d57378f903c31d92c73d1050f31ff1146bb6dcfc), Vlad Glagolev, 08/05/2012