scm-commits December 2009

scm-commits@lists.fedoraproject.org

373 participants
11609 discussions

rpms/lzip/devel lzip.spec,1.7,1.8
by Till Maas 31 Dec '09

31 Dec '09

Author: till Update of /cvs/pkgs/rpms/lzip/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv342 Modified Files: lzip.spec Log Message: * Thu Dec 31 2009 Till Maas <opensource(a)till.name> - 1.8-1 - Update to new release - Fix end of line encoding of COPYING Index: lzip.spec =================================================================== RCS file: /cvs/pkgs/rpms/lzip/devel/lzip.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -p -r1.7 -r1.8 --- lzip.spec 31 Dec 2009 13:02:42 -0000 1.7 +++ lzip.spec 31 Dec 2009 16:49:58 -0000 1.8 @@ -22,8 +22,10 @@ format (.lz) is not compatible with the %prep %setup -q +# file needs to be copied, because it is used in "make check" +cp -a COPYING{,.txt} # convert CRLF to LF -sed -i 's/\r//' COPYING +sed -i 's/\r//' COPYING.txt %build @@ -60,7 +62,7 @@ fi %files %defattr(-,root,root,-) # TODO is currently empty -%doc AUTHORS ChangeLog COPYING NEWS README +%doc AUTHORS ChangeLog COPYING.txt NEWS README %{_bindir}/lzip %{_bindir}/lziprecover %{_infodir}/lzip.info*

1 0

rpms/zfs-fuse/EL-5 zfs-fuse.scrub,NONE,1.1
by Uwe Kubosch 31 Dec '09

31 Dec '09

Author: donv Update of /cvs/pkgs/rpms/zfs-fuse/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31633/EL-5 Added Files: zfs-fuse.scrub Log Message: * - Relaxed dependency on fuse from 2.8.0 to 2.7.4 to allow installation on RHEL/Centos 5 --- NEW FILE zfs-fuse.scrub --- #!/bin/bash # # This script reads it's configuration from /etc/sysconfig/zfs-fuse # Please use that file to enable/disable this script or to set the # type of check you wish performed. [ -f /etc/sysconfig/zfs-fuse ] || exit 0 . /etc/sysconfig/zfs-fuse [ "$ZFS_WEEKLY_SCRUB" != "yes" ] && exit 0 zpool=/usr/bin/zpool pools=$zpool list -H | cut -f1 echo Found these pools: $pools for pool in $pools; do echo "Starting scrub of pool $pool" $zpool scrub $pool done echo "ZFS Fuse automatic scrub start done. Use '$zpool status' to see progress.

1 0

rpms/zfs-fuse/F-11 zfs-fuse.scrub,NONE,1.1
by Uwe Kubosch 31 Dec '09

31 Dec '09

Author: donv Update of /cvs/pkgs/rpms/zfs-fuse/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31633/F-11 Added Files: zfs-fuse.scrub Log Message: * - Relaxed dependency on fuse from 2.8.0 to 2.7.4 to allow installation on RHEL/Centos 5 --- NEW FILE zfs-fuse.scrub --- #!/bin/bash # # This script reads it's configuration from /etc/sysconfig/zfs-fuse # Please use that file to enable/disable this script or to set the # type of check you wish performed. [ -f /etc/sysconfig/zfs-fuse ] || exit 0 . /etc/sysconfig/zfs-fuse [ "$ZFS_WEEKLY_SCRUB" != "yes" ] && exit 0 zpool=/usr/bin/zpool pools=$zpool list -H | cut -f1 echo Found these pools: $pools for pool in $pools; do echo "Starting scrub of pool $pool" $zpool scrub $pool done echo "ZFS Fuse automatic scrub start done. Use '$zpool status' to see progress.

1 0

rpms/zfs-fuse/F-12 zfs-fuse.scrub,NONE,1.1
by Uwe Kubosch 31 Dec '09

31 Dec '09

Author: donv Update of /cvs/pkgs/rpms/zfs-fuse/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31633/F-12 Added Files: zfs-fuse.scrub Log Message: * - Relaxed dependency on fuse from 2.8.0 to 2.7.4 to allow installation on RHEL/Centos 5 --- NEW FILE zfs-fuse.scrub --- #!/bin/bash # # This script reads it's configuration from /etc/sysconfig/zfs-fuse # Please use that file to enable/disable this script or to set the # type of check you wish performed. [ -f /etc/sysconfig/zfs-fuse ] || exit 0 . /etc/sysconfig/zfs-fuse [ "$ZFS_WEEKLY_SCRUB" != "yes" ] && exit 0 zpool=/usr/bin/zpool pools=$zpool list -H | cut -f1 echo Found these pools: $pools for pool in $pools; do echo "Starting scrub of pool $pool" $zpool scrub $pool done echo "ZFS Fuse automatic scrub start done. Use '$zpool status' to see progress.

1 0

rpms/zfs-fuse/EL-5 zfs-fuse.init, 1.4, 1.5 zfs-fuse.spec, 1.23, 1.24 zfs-fuse.sysconfig, 1.1, 1.2
by Uwe Kubosch 31 Dec '09

31 Dec '09

Author: donv Update of /cvs/pkgs/rpms/zfs-fuse/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31224/EL-5 Modified Files: zfs-fuse.init zfs-fuse.spec zfs-fuse.sysconfig Log Message: * - Relaxed dependency on fuse from 2.8.0 to 2.7.4 to allow installation on RHEL/Centos 5 Index: zfs-fuse.init =================================================================== RCS file: /cvs/pkgs/rpms/zfs-fuse/EL-5/zfs-fuse.init,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- zfs-fuse.init 23 Jan 2009 23:48:24 -0000 1.4 +++ zfs-fuse.init 31 Dec 2009 16:45:13 -0000 1.5 @@ -55,6 +55,32 @@ start() { exit 99 esac + if [ "$ZFS_KILL_ORPHANS" == "yes_really" ] ; then + echo -n Killing processes with unknown working directory: + for a in 1 2 3 4 5 ; do + orphans=`lsof -w -n | awk '$4 == "cwd" && $5 == "unknown" {print $2}'` + echo -n $orphans + [ "$orphans" == "" ] && break + echo -n . + kill $orphans + sleep 1 + done + orphans=`lsof -w -n | awk '$4 == "cwd" && $5 == "unknown" {print $2}'` + if [ "$orphans" != "" ] ; then + echo_failure ; echo + echo -n Some orphans still live: $orphans Killing with signal 9 + kill -9 $orphans + fi + orphans=`lsof -w -n | awk '$4 == "cwd" && $5 == "unknown" {print $2}'` + if [ "$orphans" != "" ] ; then + echo_failure ; echo + echo -n Some orphans still live: $orphans + echo_failure ; echo + exit 8 + fi + echo_success ; echo + fi + echo -n $"Starting $prog: " daemon $exec -p "$PIDFILE" exec_retval=$? @@ -84,7 +110,12 @@ start() { echo_success echo - if [ $ZFS_AUTOMOUNT -eq 1 ] ; then + if [ "$ZFS_AUTOMOUNT" == "1" ] ; then + echo "Deprecated use of ZFS_AUTOMOUNT option. Use ZFS_AUTOMOUNT=yes instead." + ZFS_AUTOMOUNT=yes + fi + + if [ "$ZFS_AUTOMOUNT" == "yes" ] ; then echo -n $"Mounting zfs partitions: " sleep 1 rm -f /var/lib/random-seed Index: zfs-fuse.spec =================================================================== RCS file: /cvs/pkgs/rpms/zfs-fuse/EL-5/zfs-fuse.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -p -r1.23 -r1.24 --- zfs-fuse.spec 26 Dec 2009 19:30:37 -0000 1.23 +++ zfs-fuse.spec 31 Dec 2009 16:45:13 -0000 1.24 @@ -1,7 +1,7 @@ Summary: ZFS ported to Linux FUSE Name: zfs-fuse Version: 0.6.0 -Release: 5%{?dist} +Release: 6%{?dist} Group: System Environment/Base License: CDDL URL: http://zfs-fuse.net/ @@ -10,9 +10,10 @@ URL: http://zfs-fuse.net/ # wget http://zfs-fuse.net/releases/0.6.0/zfs-fuse-0.6.0.tar.bz2 Source00: %{name}/%{name}-%{version}.tar.bz2 Source01: zfs-fuse.init -Source02: zfs-fuse.sysconfig +Source02: zfs-fuse.scrub +Source03: zfs-fuse.sysconfig BuildRequires: fuse-devel libaio-devel scons zlib-devel -Requires: fuse >= 2.8.0-1 +Requires: fuse >= 2.7.4-1 Requires(post): chkconfig Requires(preun): chkconfig initscripts Requires(postun): initscripts @@ -32,6 +33,8 @@ Microsystems, originally designed for So This project is a port of ZFS to the FUSE framework for the Linux operating system. +Project home page is at http://zfs-fuse.net/ + %prep %setup -q @@ -50,7 +53,8 @@ scons pushd src scons install install_dir=%{buildroot}%{_bindir} %{__install} -Dp -m 0755 %{SOURCE1} %{buildroot}%{_initrddir}/%{name} -%{__install} -Dp -m 0755 %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/%{name} +%{__install} -Dp -m 0755 %{SOURCE2} %{buildroot}%{_sysconfdir}/cron.weekly/98-%{name}-scrub +%{__install} -Dp -m 0755 %{SOURCE3} %{buildroot}%{_sysconfdir}/sysconfig/%{name} %clean %{__rm} -rf %{buildroot} @@ -83,9 +87,20 @@ fi %{_bindir}/zpool %{_bindir}/ztest %{_initrddir}/%{name} +%{_sysconfdir}/cron.weekly/98-%{name}-scrub %{_sysconfdir}/sysconfig/%{name} %changelog +* Mon Jan 04 2010 Uwe Kubosch <uwe(a)kubosch.no> - 0.6.0-6 +- Added option for automatic weekly scrubbing. + Set ZFS_WEEKLY_SCRUB=yes in /etc/sysconfig/zfs-fuse to enable +- Changed ZFS_AUTOMOUNT option value from "1" to "yes" for better readability. + ZFS_AUTOMOUNT=1 deprecated and will be removed in version 0.7.0. +- Added option for killing processes with unknown working directory at zfs-fuse startup. + This would be the case if zfs-fuse crashed. Use with care. It may kill unrelated processes. + Set ZFS_KILL_ORPHANS=yes_really in /etc/sysconfig/zfs-fuse to enable. +- Relaxed dependency on fuse from 2.8.0 to 2.7.4 to allow installation on RHEL/Centos 5 + * Sat Dec 26 2009 Uwe Kubosch <uwe(a)kubosch.no> - 0.6.0-5 - Removed chckconfig on and service start commands from install script See https://fedoraproject.org/wiki/Packaging:SysVInitScript#Why_don.27t_we Index: zfs-fuse.sysconfig =================================================================== RCS file: /cvs/pkgs/rpms/zfs-fuse/EL-5/zfs-fuse.sysconfig,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- zfs-fuse.sysconfig 22 Dec 2008 21:45:14 -0000 1.1 +++ zfs-fuse.sysconfig 31 Dec 2009 16:45:13 -0000 1.2 @@ -1,2 +1,9 @@ -# Set this option to 1 if you want all ZFS filesystems to be mounted on boot. -ZFS_AUTOMOUNT=1 +# Set this option to yes if you want all ZFS filesystems to be mounted on boot. +ZFS_AUTOMOUNT=yes + +# Set this option to yes to enable weekly scrubbing of your ZFS pools. +ZFS_WEEKLY_SCRUB=yes + +# Set this option to yes_really to kill all processes with unknown working directory at zfs-fuse startup +# Use with extreme care. This will also kill processes totally unrelated to zfs-fuse. +# ZFS_KILL_ORPHANS=no|yes_really

1 0

rpms/zfs-fuse/devel zfs-fuse.init, 1.6, 1.7 zfs-fuse.spec, 1.26, 1.27 zfs-fuse.sysconfig, 1.3, 1.4
by Uwe Kubosch 31 Dec '09

31 Dec '09

Author: donv Update of /cvs/pkgs/rpms/zfs-fuse/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31224/devel Modified Files: zfs-fuse.init zfs-fuse.spec zfs-fuse.sysconfig Log Message: * - Relaxed dependency on fuse from 2.8.0 to 2.7.4 to allow installation on RHEL/Centos 5 Index: zfs-fuse.init =================================================================== RCS file: /cvs/pkgs/rpms/zfs-fuse/devel/zfs-fuse.init,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- zfs-fuse.init 29 Dec 2009 09:18:23 -0000 1.6 +++ zfs-fuse.init 31 Dec 2009 16:45:15 -0000 1.7 @@ -58,20 +58,20 @@ start() { if [ "$ZFS_KILL_ORPHANS" == "yes_really" ] ; then echo -n Killing processes with unknown working directory: for a in 1 2 3 4 5 ; do - orphans=`lsof -w -n | grep "cwd unknown" | awk '{print $2}'` + orphans=`lsof -w -n | awk '$4 == "cwd" && $5 == "unknown" {print $2}'` echo -n $orphans [ "$orphans" == "" ] && break echo -n . kill $orphans sleep 1 done - orphans=`lsof -w -n | grep "cwd unknown" | awk '{print $2}'` + orphans=`lsof -w -n | awk '$4 == "cwd" && $5 == "unknown" {print $2}'` if [ "$orphans" != "" ] ; then echo_failure ; echo echo -n Some orphans still live: $orphans Killing with signal 9 kill -9 $orphans fi - orphans=`lsof -w -n | grep "cwd unknown" | awk '{print $2}'` + orphans=`lsof -w -n | awk '$4 == "cwd" && $5 == "unknown" {print $2}'` if [ "$orphans" != "" ] ; then echo_failure ; echo echo -n Some orphans still live: $orphans Index: zfs-fuse.spec =================================================================== RCS file: /cvs/pkgs/rpms/zfs-fuse/devel/zfs-fuse.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -p -r1.26 -r1.27 --- zfs-fuse.spec 29 Dec 2009 09:18:24 -0000 1.26 +++ zfs-fuse.spec 31 Dec 2009 16:45:15 -0000 1.27 @@ -13,7 +13,7 @@ Source01: zfs-fuse.init Source02: zfs-fuse.scrub Source03: zfs-fuse.sysconfig BuildRequires: fuse-devel libaio-devel scons zlib-devel -Requires: fuse >= 2.8.0-1 +Requires: fuse >= 2.7.4-1 Requires(post): chkconfig Requires(preun): chkconfig initscripts Requires(postun): initscripts @@ -99,6 +99,8 @@ fi - Added option for killing processes with unknown working directory at zfs-fuse startup. This would be the case if zfs-fuse crashed. Use with care. It may kill unrelated processes. Set ZFS_KILL_ORPHANS=yes_really in /etc/sysconfig/zfs-fuse to enable. +- Relaxed dependency on fuse from 2.8.0 to 2.7.4 to allow installation on RHEL/Centos 5 + * Sat Dec 26 2009 Uwe Kubosch <uwe(a)kubosch.no> - 0.6.0-5 - Removed chckconfig on and service start commands from install script See https://fedoraproject.org/wiki/Packaging:SysVInitScript#Why_don.27t_we Index: zfs-fuse.sysconfig =================================================================== RCS file: /cvs/pkgs/rpms/zfs-fuse/devel/zfs-fuse.sysconfig,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- zfs-fuse.sysconfig 29 Dec 2009 09:18:24 -0000 1.3 +++ zfs-fuse.sysconfig 31 Dec 2009 16:45:15 -0000 1.4 @@ -5,5 +5,5 @@ ZFS_AUTOMOUNT=yes ZFS_WEEKLY_SCRUB=yes # Set this option to yes_really to kill all processes with unknown working directory at zfs-fuse startup -# This might kill processes totally unrelated to zfs-fuse. +# Use with extreme care. This will also kill processes totally unrelated to zfs-fuse. # ZFS_KILL_ORPHANS=no|yes_really

1 0

rpms/zfs-fuse/F-11 zfs-fuse.init, 1.4, 1.5 zfs-fuse.spec, 1.17, 1.18 zfs-fuse.sysconfig, 1.1, 1.2
by Uwe Kubosch 31 Dec '09

31 Dec '09

Author: donv Update of /cvs/pkgs/rpms/zfs-fuse/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31224/F-11 Modified Files: zfs-fuse.init zfs-fuse.spec zfs-fuse.sysconfig Log Message: * - Relaxed dependency on fuse from 2.8.0 to 2.7.4 to allow installation on RHEL/Centos 5 Index: zfs-fuse.init =================================================================== RCS file: /cvs/pkgs/rpms/zfs-fuse/F-11/zfs-fuse.init,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- zfs-fuse.init 23 Jan 2009 23:48:24 -0000 1.4 +++ zfs-fuse.init 31 Dec 2009 16:45:14 -0000 1.5 @@ -55,6 +55,32 @@ start() { exit 99 esac + if [ "$ZFS_KILL_ORPHANS" == "yes_really" ] ; then + echo -n Killing processes with unknown working directory: + for a in 1 2 3 4 5 ; do + orphans=`lsof -w -n | awk '$4 == "cwd" && $5 == "unknown" {print $2}'` + echo -n $orphans + [ "$orphans" == "" ] && break + echo -n . + kill $orphans + sleep 1 + done + orphans=`lsof -w -n | awk '$4 == "cwd" && $5 == "unknown" {print $2}'` + if [ "$orphans" != "" ] ; then + echo_failure ; echo + echo -n Some orphans still live: $orphans Killing with signal 9 + kill -9 $orphans + fi + orphans=`lsof -w -n | awk '$4 == "cwd" && $5 == "unknown" {print $2}'` + if [ "$orphans" != "" ] ; then + echo_failure ; echo + echo -n Some orphans still live: $orphans + echo_failure ; echo + exit 8 + fi + echo_success ; echo + fi + echo -n $"Starting $prog: " daemon $exec -p "$PIDFILE" exec_retval=$? @@ -84,7 +110,12 @@ start() { echo_success echo - if [ $ZFS_AUTOMOUNT -eq 1 ] ; then + if [ "$ZFS_AUTOMOUNT" == "1" ] ; then + echo "Deprecated use of ZFS_AUTOMOUNT option. Use ZFS_AUTOMOUNT=yes instead." + ZFS_AUTOMOUNT=yes + fi + + if [ "$ZFS_AUTOMOUNT" == "yes" ] ; then echo -n $"Mounting zfs partitions: " sleep 1 rm -f /var/lib/random-seed Index: zfs-fuse.spec =================================================================== RCS file: /cvs/pkgs/rpms/zfs-fuse/F-11/zfs-fuse.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -p -r1.17 -r1.18 --- zfs-fuse.spec 26 Dec 2009 19:30:37 -0000 1.17 +++ zfs-fuse.spec 31 Dec 2009 16:45:14 -0000 1.18 @@ -1,7 +1,7 @@ Summary: ZFS ported to Linux FUSE Name: zfs-fuse Version: 0.6.0 -Release: 5%{?dist} +Release: 6%{?dist} Group: System Environment/Base License: CDDL URL: http://zfs-fuse.net/ @@ -10,9 +10,10 @@ URL: http://zfs-fuse.net/ # wget http://zfs-fuse.net/releases/0.6.0/zfs-fuse-0.6.0.tar.bz2 Source00: %{name}/%{name}-%{version}.tar.bz2 Source01: zfs-fuse.init -Source02: zfs-fuse.sysconfig +Source02: zfs-fuse.scrub +Source03: zfs-fuse.sysconfig BuildRequires: fuse-devel libaio-devel scons zlib-devel -Requires: fuse >= 2.8.0-1 +Requires: fuse >= 2.7.4-1 Requires(post): chkconfig Requires(preun): chkconfig initscripts Requires(postun): initscripts @@ -32,6 +33,8 @@ Microsystems, originally designed for So This project is a port of ZFS to the FUSE framework for the Linux operating system. +Project home page is at http://zfs-fuse.net/ + %prep %setup -q @@ -50,7 +53,8 @@ scons pushd src scons install install_dir=%{buildroot}%{_bindir} %{__install} -Dp -m 0755 %{SOURCE1} %{buildroot}%{_initrddir}/%{name} -%{__install} -Dp -m 0755 %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/%{name} +%{__install} -Dp -m 0755 %{SOURCE2} %{buildroot}%{_sysconfdir}/cron.weekly/98-%{name}-scrub +%{__install} -Dp -m 0755 %{SOURCE3} %{buildroot}%{_sysconfdir}/sysconfig/%{name} %clean %{__rm} -rf %{buildroot} @@ -83,9 +87,20 @@ fi %{_bindir}/zpool %{_bindir}/ztest %{_initrddir}/%{name} +%{_sysconfdir}/cron.weekly/98-%{name}-scrub %{_sysconfdir}/sysconfig/%{name} %changelog +* Mon Jan 04 2010 Uwe Kubosch <uwe(a)kubosch.no> - 0.6.0-6 +- Added option for automatic weekly scrubbing. + Set ZFS_WEEKLY_SCRUB=yes in /etc/sysconfig/zfs-fuse to enable +- Changed ZFS_AUTOMOUNT option value from "1" to "yes" for better readability. + ZFS_AUTOMOUNT=1 deprecated and will be removed in version 0.7.0. +- Added option for killing processes with unknown working directory at zfs-fuse startup. + This would be the case if zfs-fuse crashed. Use with care. It may kill unrelated processes. + Set ZFS_KILL_ORPHANS=yes_really in /etc/sysconfig/zfs-fuse to enable. +- Relaxed dependency on fuse from 2.8.0 to 2.7.4 to allow installation on RHEL/Centos 5 + * Sat Dec 26 2009 Uwe Kubosch <uwe(a)kubosch.no> - 0.6.0-5 - Removed chckconfig on and service start commands from install script See https://fedoraproject.org/wiki/Packaging:SysVInitScript#Why_don.27t_we Index: zfs-fuse.sysconfig =================================================================== RCS file: /cvs/pkgs/rpms/zfs-fuse/F-11/zfs-fuse.sysconfig,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- zfs-fuse.sysconfig 22 Dec 2008 21:45:14 -0000 1.1 +++ zfs-fuse.sysconfig 31 Dec 2009 16:45:14 -0000 1.2 @@ -1,2 +1,9 @@ -# Set this option to 1 if you want all ZFS filesystems to be mounted on boot. -ZFS_AUTOMOUNT=1 +# Set this option to yes if you want all ZFS filesystems to be mounted on boot. +ZFS_AUTOMOUNT=yes + +# Set this option to yes to enable weekly scrubbing of your ZFS pools. +ZFS_WEEKLY_SCRUB=yes + +# Set this option to yes_really to kill all processes with unknown working directory at zfs-fuse startup +# Use with extreme care. This will also kill processes totally unrelated to zfs-fuse. +# ZFS_KILL_ORPHANS=no|yes_really

1 0

rpms/zfs-fuse/F-12 zfs-fuse.init, 1.4, 1.5 zfs-fuse.spec, 1.19, 1.20 zfs-fuse.sysconfig, 1.1, 1.2
by Uwe Kubosch 31 Dec '09

31 Dec '09

Author: donv Update of /cvs/pkgs/rpms/zfs-fuse/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31224/F-12 Modified Files: zfs-fuse.init zfs-fuse.spec zfs-fuse.sysconfig Log Message: * - Relaxed dependency on fuse from 2.8.0 to 2.7.4 to allow installation on RHEL/Centos 5 Index: zfs-fuse.init =================================================================== RCS file: /cvs/pkgs/rpms/zfs-fuse/F-12/zfs-fuse.init,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- zfs-fuse.init 23 Jan 2009 23:48:24 -0000 1.4 +++ zfs-fuse.init 31 Dec 2009 16:45:15 -0000 1.5 @@ -55,6 +55,32 @@ start() { exit 99 esac + if [ "$ZFS_KILL_ORPHANS" == "yes_really" ] ; then + echo -n Killing processes with unknown working directory: + for a in 1 2 3 4 5 ; do + orphans=`lsof -w -n | awk '$4 == "cwd" && $5 == "unknown" {print $2}'` + echo -n $orphans + [ "$orphans" == "" ] && break + echo -n . + kill $orphans + sleep 1 + done + orphans=`lsof -w -n | awk '$4 == "cwd" && $5 == "unknown" {print $2}'` + if [ "$orphans" != "" ] ; then + echo_failure ; echo + echo -n Some orphans still live: $orphans Killing with signal 9 + kill -9 $orphans + fi + orphans=`lsof -w -n | awk '$4 == "cwd" && $5 == "unknown" {print $2}'` + if [ "$orphans" != "" ] ; then + echo_failure ; echo + echo -n Some orphans still live: $orphans + echo_failure ; echo + exit 8 + fi + echo_success ; echo + fi + echo -n $"Starting $prog: " daemon $exec -p "$PIDFILE" exec_retval=$? @@ -84,7 +110,12 @@ start() { echo_success echo - if [ $ZFS_AUTOMOUNT -eq 1 ] ; then + if [ "$ZFS_AUTOMOUNT" == "1" ] ; then + echo "Deprecated use of ZFS_AUTOMOUNT option. Use ZFS_AUTOMOUNT=yes instead." + ZFS_AUTOMOUNT=yes + fi + + if [ "$ZFS_AUTOMOUNT" == "yes" ] ; then echo -n $"Mounting zfs partitions: " sleep 1 rm -f /var/lib/random-seed Index: zfs-fuse.spec =================================================================== RCS file: /cvs/pkgs/rpms/zfs-fuse/F-12/zfs-fuse.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -p -r1.19 -r1.20 --- zfs-fuse.spec 26 Dec 2009 19:30:37 -0000 1.19 +++ zfs-fuse.spec 31 Dec 2009 16:45:15 -0000 1.20 @@ -1,7 +1,7 @@ Summary: ZFS ported to Linux FUSE Name: zfs-fuse Version: 0.6.0 -Release: 5%{?dist} +Release: 6%{?dist} Group: System Environment/Base License: CDDL URL: http://zfs-fuse.net/ @@ -10,9 +10,10 @@ URL: http://zfs-fuse.net/ # wget http://zfs-fuse.net/releases/0.6.0/zfs-fuse-0.6.0.tar.bz2 Source00: %{name}/%{name}-%{version}.tar.bz2 Source01: zfs-fuse.init -Source02: zfs-fuse.sysconfig +Source02: zfs-fuse.scrub +Source03: zfs-fuse.sysconfig BuildRequires: fuse-devel libaio-devel scons zlib-devel -Requires: fuse >= 2.8.0-1 +Requires: fuse >= 2.7.4-1 Requires(post): chkconfig Requires(preun): chkconfig initscripts Requires(postun): initscripts @@ -32,6 +33,8 @@ Microsystems, originally designed for So This project is a port of ZFS to the FUSE framework for the Linux operating system. +Project home page is at http://zfs-fuse.net/ + %prep %setup -q @@ -50,7 +53,8 @@ scons pushd src scons install install_dir=%{buildroot}%{_bindir} %{__install} -Dp -m 0755 %{SOURCE1} %{buildroot}%{_initrddir}/%{name} -%{__install} -Dp -m 0755 %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/%{name} +%{__install} -Dp -m 0755 %{SOURCE2} %{buildroot}%{_sysconfdir}/cron.weekly/98-%{name}-scrub +%{__install} -Dp -m 0755 %{SOURCE3} %{buildroot}%{_sysconfdir}/sysconfig/%{name} %clean %{__rm} -rf %{buildroot} @@ -83,9 +87,20 @@ fi %{_bindir}/zpool %{_bindir}/ztest %{_initrddir}/%{name} +%{_sysconfdir}/cron.weekly/98-%{name}-scrub %{_sysconfdir}/sysconfig/%{name} %changelog +* Mon Jan 04 2010 Uwe Kubosch <uwe(a)kubosch.no> - 0.6.0-6 +- Added option for automatic weekly scrubbing. + Set ZFS_WEEKLY_SCRUB=yes in /etc/sysconfig/zfs-fuse to enable +- Changed ZFS_AUTOMOUNT option value from "1" to "yes" for better readability. + ZFS_AUTOMOUNT=1 deprecated and will be removed in version 0.7.0. +- Added option for killing processes with unknown working directory at zfs-fuse startup. + This would be the case if zfs-fuse crashed. Use with care. It may kill unrelated processes. + Set ZFS_KILL_ORPHANS=yes_really in /etc/sysconfig/zfs-fuse to enable. +- Relaxed dependency on fuse from 2.8.0 to 2.7.4 to allow installation on RHEL/Centos 5 + * Sat Dec 26 2009 Uwe Kubosch <uwe(a)kubosch.no> - 0.6.0-5 - Removed chckconfig on and service start commands from install script See https://fedoraproject.org/wiki/Packaging:SysVInitScript#Why_don.27t_we Index: zfs-fuse.sysconfig =================================================================== RCS file: /cvs/pkgs/rpms/zfs-fuse/F-12/zfs-fuse.sysconfig,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- zfs-fuse.sysconfig 22 Dec 2008 21:45:14 -0000 1.1 +++ zfs-fuse.sysconfig 31 Dec 2009 16:45:15 -0000 1.2 @@ -1,2 +1,9 @@ -# Set this option to 1 if you want all ZFS filesystems to be mounted on boot. -ZFS_AUTOMOUNT=1 +# Set this option to yes if you want all ZFS filesystems to be mounted on boot. +ZFS_AUTOMOUNT=yes + +# Set this option to yes to enable weekly scrubbing of your ZFS pools. +ZFS_WEEKLY_SCRUB=yes + +# Set this option to yes_really to kill all processes with unknown working directory at zfs-fuse startup +# Use with extreme care. This will also kill processes totally unrelated to zfs-fuse. +# ZFS_KILL_ORPHANS=no|yes_really

1 0

rpms/emacs-vm/F-12 emacs-vm.spec, 1.39, 1.40 sources, 1.17, 1.18 vm-8.0.12-fix-charsets.patch, 1.1, NONE vm-8.0.12-fix-missing-autoload.patch, 1.1, NONE
by Jonathan G. Underwood 31 Dec '09

31 Dec '09

Author: jgu Update of /cvs/pkgs/rpms/emacs-vm/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22699 Modified Files: emacs-vm.spec sources Removed Files: vm-8.0.12-fix-charsets.patch vm-8.0.12-fix-missing-autoload.patch Log Message: * Sat Dec 26 2009 Jonathan G. Underwood <jonathan.underwood(a)gmail.com> - 8.1.0-0.1.beta - Update to 8.1.0 beta version Index: emacs-vm.spec =================================================================== RCS file: /cvs/pkgs/rpms/emacs-vm/F-12/emacs-vm.spec,v retrieving revision 1.39 retrieving revision 1.40 diff -u -p -r1.39 -r1.40 --- emacs-vm.spec 26 Dec 2009 14:26:29 -0000 1.39 +++ emacs-vm.spec 31 Dec 2009 16:04:46 -0000 1.40 @@ -16,12 +16,12 @@ Summary: Emacs VM mailreader Name: emacs-vm -Version: 8.0.14 -Release: 2%{?dist} +Version: 8.1.0 +Release: 0.1.beta%{?dist} License: GPLv2+ Group: Applications/Internet URL: https://launchpad.net/vm -Source0: http://launchpad.net/vm/8.0.x/%{version}/+download/vm-%{version}.tgz +Source0: http://launchpad.net/vm/trunk/%{version}-beta/+download/vm-%{version}-beta.… Requires: emacs >= %{_emacs_version} Requires(pre): /sbin/install-info @@ -52,7 +52,7 @@ The %{name}-el package contains the elis package. It is not necessary to install this if you want to run vm. %prep -%setup -q -n vm-%{version} +%setup -q -n vm-%{version}-beta # Add missing entry for u-vm-color.el to lisp Makefile.in sed -i -e '/SOURCES += tapestry.el/ a SOURCES += u-vm-color.el' lisp/Makefile.in @@ -122,6 +122,9 @@ fi %{pkgdir}/*.el %changelog +* Sat Dec 26 2009 Jonathan G. Underwood <jonathan.underwood(a)gmail.com> - 8.1.0-0.1.beta +- Update to 8.1.0 beta version + * Sat Dec 26 2009 Jonathan G. Underwood <jonathan.underwood(a)gmail.com> - 8.0.14-2 - Add -fno-var-tracking-assignments to CFLAGS to allow build to complete (gcc bug http://gcc.gnu.org/PR41371) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/emacs-vm/F-12/sources,v retrieving revision 1.17 retrieving revision 1.18 diff -u -p -r1.17 -r1.18 --- sources 18 Dec 2009 23:13:39 -0000 1.17 +++ sources 31 Dec 2009 16:04:46 -0000 1.18 @@ -1 +1 @@ -35657d3d3dec1dcce5b31ac155e0cc4f vm-8.0.14.tgz +03eac8406630ea4cf85ee422a76f62b8 vm-8.1.0-beta.tgz --- vm-8.0.12-fix-charsets.patch DELETED --- --- vm-8.0.12-fix-missing-autoload.patch DELETED ---

1 0

rpms/audacious/devel audacious-2.2-disabled-iplugins.patch,1.2,1.3
by Michael Schwendt 31 Dec '09

31 Dec '09

Author: mschwendt Update of /cvs/pkgs/rpms/audacious/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19801/d Modified Files: audacious-2.2-disabled-iplugins.patch Log Message: yadayada...redundancy audacious-2.2-disabled-iplugins.patch: playback.c | 2 +- playlist-utils.c | 16 +++++++++++----- 2 files changed, 12 insertions(+), 6 deletions(-) Index: audacious-2.2-disabled-iplugins.patch =================================================================== RCS file: /cvs/pkgs/rpms/audacious/devel/audacious-2.2-disabled-iplugins.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- audacious-2.2-disabled-iplugins.patch 31 Dec 2009 13:41:19 -0000 1.2 +++ audacious-2.2-disabled-iplugins.patch 31 Dec 2009 15:52:06 -0000 1.3 @@ -6,7 +6,7 @@ diff -Nur audacious-2.2-orig/src/audacio } - if (decoder == NULL) -+ if (decoder == NULL || (decoder && !decoder->enabled)) ++ if (decoder == NULL || !decoder->enabled) { ProbeResult * pr = input_check_file (filename);

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

scm-commits December 2009