From 511cd65e2a46cf65c4940204bf56da31b2bc909d Mon Sep 17 00:00:00 2001
From: Thorsten Leemhuis <thl@fedoraproject.org>
Date: Sun, 15 Jan 2006 10:16:27 +0000
Subject: [PATCH] revert back to fuse (the filesystem) 2.4.2-2 ; pfj overwrote
 is     accidentally (second part)

---
 README.z88sdk         |  20 ------
 fuse-README.fedora    |  17 +++++
 fuse-makedev.d-fuse   |   1 +
 fuse-mount.fuse.patch |  23 +++++++
 fuse-sound.patch      |  13 ----
 fuse-udev.nodes       |   1 +
 fuse-udev_rules.patch |   6 ++
 fuse.png              | Bin 3225 -> 0 bytes
 fuse.spec             | 140 ++++++++++++++++++++++++++++++++++++++++++
 9 files changed, 188 insertions(+), 33 deletions(-)
 delete mode 100644 README.z88sdk
 create mode 100644 fuse-README.fedora
 create mode 100644 fuse-makedev.d-fuse
 create mode 100644 fuse-mount.fuse.patch
 delete mode 100644 fuse-sound.patch
 create mode 100644 fuse-udev.nodes
 create mode 100644 fuse-udev_rules.patch
 delete mode 100644 fuse.png
 create mode 100644 fuse.spec

diff --git a/README.z88sdk b/README.z88sdk
deleted file mode 100644
index dc79f20..0000000
--- a/README.z88sdk
+++ /dev/null
@@ -1,20 +0,0 @@
-HOW TO USE THE Z88SDK WITH FUSE
--------------------------------
-
-Using the Z88 SDK with fuse is a very simple operation. Grab a copy of the rpm, install and write your code, as you would, in C.
-
-Next, compile and target the ZX Spectrum
-
-zcc +zx <your-source>.c -o <output-name>.bin -lndos
-
-Assuming all is well, your code will be generated. THIS IS NOT AN EXECUTABLE!
-
-Load up Fuse. Click on File, move to "Open Binary Data". The usual filer window opens. Select the file you've just compiled and click "Open". The filer closes and you're presented with another window asking for a start address. You can enter any number from about 25000. For this explaination, I would use 32768. Click OK. Your .bin file is now in memory.
-
-To run the code, press the following keys
-
-T, ctrl + shift (the cursor turns to a white on black E), L 32768 return.
-
-On screen you will see the words RANDOMISE USR 32768 before you press return. When you press return, the code will be executed.
-
-That's about it!
diff --git a/fuse-README.fedora b/fuse-README.fedora
new file mode 100644
index 0000000..26034c2
--- /dev/null
+++ b/fuse-README.fedora
@@ -0,0 +1,17 @@
+This fuse package for security reasons only allows members of the group "fuse"
+to (u)mount fuse filesystems. If you for example want to allow the user "foo" 
+to mount fuse filesystems you have to add him to the fuse group by running
+
+# /usr/sbin/usermod -a -G fuse foo
+
+Or use tools like "system-config-users" to add user "foo" to the fuse group.
+
+Note that the user has to re-login after he was added to the group.
+
+
+If you don't want to add all users to the fuse group you can also run
+
+# chmod 4755 /usr/bin/fusermount
+
+to allow everyone to mount fuse filesystems. You have to re-run that command
+after each fuse update.
diff --git a/fuse-makedev.d-fuse b/fuse-makedev.d-fuse
new file mode 100644
index 0000000..c71ea7b
--- /dev/null
+++ b/fuse-makedev.d-fuse
@@ -0,0 +1 @@
+c 660 root     fuse      10 229  1   1 fuse
diff --git a/fuse-mount.fuse.patch b/fuse-mount.fuse.patch
new file mode 100644
index 0000000..7901ee2
--- /dev/null
+++ b/fuse-mount.fuse.patch
@@ -0,0 +1,23 @@
+diff -u util.org/mount.fuse util/mount.fuse
+--- util.org/mount.fuse	2005-11-02 20:52:12.000000000 +0100
++++ util/mount.fuse	2005-11-02 20:59:51.000000000 +0100
+@@ -5,6 +5,7 @@
+ # Thanks to Miklos Szeredi <miklos@szeredi.hu>
+ # to kick me to the right way
+ #
++export PATH
+ 
+ VERSION="0.0.1"
+ PRGNAME=`basename $0`
+@@ -40,9 +41,9 @@
+ shift
+ shift
+ 
+-OPTIONS="$@"
++# If there is a better regex that can remove all user from a sting like "-o user,rw,noexec,user,nosuid,nodev,user" tell me, thx
++OPTIONS="`echo $@ | sed 's|,user$|| ; s| user,| | ; s|,user,|,|'`"
+ 
+-export PATH
+ ${FSTYPE} ${MOUNTPATH} ${MOUNTPOINT} ${OPTIONS}
+ 
+ 
diff --git a/fuse-sound.patch b/fuse-sound.patch
deleted file mode 100644
index 330dd97..0000000
--- a/fuse-sound.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- sound.c	2005-10-17 23:20:45.000000000 +0100
-+++ fuse-0.7.0/sound.c	2005-08-20 23:46:32.000000000 +0100
-@@ -58,8 +58,8 @@
- int sound_stereo_ay_abc=0;	/* (AY stereo) true for ABC stereo, else ACB */
- int sound_stereo_ay_narrow=0;	/* (AY stereo) true for narrow AY st. sep. */
- 
--static int sound_stereo_ay=0;	/* local copy of settings_current.stereo_ay */
--static int sound_stereo_beeper=0;   /* and settings_current.stereo_beeper */
-+int sound_stereo_ay=0;	/* local copy of settings_current.stereo_ay */
-+int sound_stereo_beeper=0;   /* and settings_current.stereo_beeper */
- 
- 
- /* assume all three tone channels together match the beeper volume (ish).
diff --git a/fuse-udev.nodes b/fuse-udev.nodes
new file mode 100644
index 0000000..a517c48
--- /dev/null
+++ b/fuse-udev.nodes
@@ -0,0 +1 @@
+fuse
diff --git a/fuse-udev_rules.patch b/fuse-udev_rules.patch
new file mode 100644
index 0000000..d641c4a
--- /dev/null
+++ b/fuse-udev_rules.patch
@@ -0,0 +1,6 @@
+diff -u util.org/udev.rules util/udev.rules
+--- util.org/udev.rules	2005-11-03 19:38:05.000000000 +0100
++++ util/udev.rules	2005-11-03 19:38:13.000000000 +0100
+@@ -1 +1 @@
+-KERNEL="fuse", NAME="%k", MODE="0666"
++KERNEL="fuse", NAME="%k", MODE="0660",OWNER="root" GROUP="fuse"
diff --git a/fuse.png b/fuse.png
deleted file mode 100644
index d0a89c559e9aa05f698c743faabc35ad2278c14f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3225
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
LNkvXXu0mjfvb#gr

diff --git a/fuse.spec b/fuse.spec
new file mode 100644
index 0000000..8468f56
--- /dev/null
+++ b/fuse.spec
@@ -0,0 +1,140 @@
+Name:           fuse
+Version:        2.4.2
+Release:        2%{?dist}
+Summary:        File System in Userspace (FUSE) utilities
+
+Group:          System Environment/Base
+License:        GPL
+URL:            http://fuse.sf.net
+Source0:        http://dl.sourceforge.net/sourceforge/fuse/fuse-2.4.2.tar.gz
+Source1:	fuse-udev.nodes
+Source2:	fuse-makedev.d-fuse
+Source3:	fuse-README.fedora
+
+Patch0:		fuse-mount.fuse.patch
+Patch1:		fuse-udev_rules.patch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Requires:	kernel >= 2.6.14
+Requires(pre):	  %{_sbindir}/groupadd
+Requires(post):   /sbin/MAKEDEV
+Requires(postun): %{_sbindir}/groupdel
+
+%description
+With FUSE it is possible to implement a fully functional filesystem in a 
+userspace program. This package contains the FUSE userspace tools to 
+mount a FUSE filesystem.
+
+Note: For security reasons only members of the group "fuse" are allowed to
+(u)mount fuse filesystems. You can find more details on this issue in
+%{_docdir}/%{name}-%{version}/README.fedora
+
+
+%package libs
+Summary:        File System in Userspace (FUSE) libraries
+Group:          System Environment/Libraries
+License:        LGPL
+
+%description libs
+Devel With FUSE it is possible to implement a fully functional filesystem in a 
+userspace program. This package contains the FUSE libraries. 
+
+
+%package devel
+Summary:        File System in Userspace (FUSE) devel files
+Group:          Development/Libraries
+Requires:	%{name}-libs = %{version}-%{release}
+License:        LGPL
+
+%description devel
+With FUSE it is possible to implement a fully functional filesystem in a 
+userspace program. This package contains development files (headers, 
+pgk-config) to develop FUSE based applications/filesystems.
+
+
+%prep
+%setup -q
+#disable device creation during build/install
+sed -i 's|mknod|echo Disabled: mknod |g' util/Makefile.in
+%patch0 -b .patch0
+%patch1 -b .patch1
+cp %{SOURCE3} README.fedora
+
+%build
+%configure \
+ --disable-static \
+ --disable-kernel-module 
+make %{?_smp_mflags}
+
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
+find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
+install -D -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/udev/makedev.d/40-fuse.nodes
+install -D -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/makedev.d/z-fuse
+# change from 4755 to 0755 to allow stripping -- fixed later in files
+chmod 0755 $RPM_BUILD_ROOT/%{_bindir}/fusermount
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%pre 
+if [ $1 -eq 1 ]; then
+     %{_sbindir}/groupadd -r fuse &>/dev/null || :
+fi
+
+%post
+/sbin/MAKEDEV fuse
+
+%postun 
+if [ $1 = 0 ]; then
+ %{_sbindir}/groupdel fuse || :
+fi
+
+%post libs -p /sbin/ldconfig
+
+%postun libs -p /sbin/ldconfig
+
+
+%files
+%doc AUTHORS ChangeLog COPYING FAQ Filesystems NEWS README README.NFS README.fedora
+/sbin/mount.fuse
+%attr(4754,root,fuse) %{_bindir}/fusermount
+%{_sysconfdir}/makedev.d/z-fuse
+%{_sysconfdir}/udev/rules.d/40-fuse.rules
+%{_sysconfdir}/udev/makedev.d/40-fuse.nodes
+
+%files libs
+%doc COPYING.LIB
+%{_libdir}/libfuse.so.*
+
+%files devel
+%defattr(-,root,root,-)
+%{_libdir}/libfuse.so
+%{_libdir}/pkgconfig/*.pc
+%{_includedir}/fuse.h
+%{_includedir}/fuse
+
+%changelog
+* Wed Nov 23 2005 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 2.4.2-1
+- Use dist
+
+* Wed Nov 23 2005 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 2.4.2-1
+- Update to 2.4.2 (solves CVE-2005-3531)
+- Update README.fedora
+
+* Sat Nov 12 2005 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 2.4.1-3
+- Add README.fedora
+- Add hint to README.fedora and that you have to be member of the group "fuse"
+  in the description
+- Use groupadd instead of fedora-groupadd
+
+* Fri Nov 04 2005 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 2.4.1-2
+- Rename packages a bit
+- use makedev.d/40-fuse.nodes
+- fix /sbin/mount.fuse
+- Use a fuse group to restict access to fuse-filesystems
+
+* Fri Oct 28 2005 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 2.4.1-1
+- Initial RPM release.