rpms/gnome-commander/devel gnome-commander.spec, 1.26, 1.27 mimeedit-svn1958.diff, 1.1, 1.2 gnome-commander-rev1874-hexmode-display.patch, 1.1, NONE
Mamoru Tasaka (mtasaka)
fedora-extras-commits at redhat.com
Tue Aug 12 15:07:30 UTC 2008
- Previous message (by thread): rpms/gnome-commander/F-8 gnome-commander.sh, NONE, 1.1 mimeedit-svn1958.diff, NONE, 1.1 mimeedit-svn1958.sh, NONE, 1.1 gnome-commander.spec, 1.16, 1.17
- Next message (by thread): rpms/kexec-tools/F-9 kexec-tools.spec, 1.115, 1.116 mkdumprd, 1.20, 1.21
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mtasaka
Update of /cvs/extras/rpms/gnome-commander/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14127/devel
Modified Files:
gnome-commander.spec mimeedit-svn1958.diff
Removed Files:
gnome-commander-rev1874-hexmode-display.patch
Log Message:
* Wed Aug 13 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.2.7-4
- More fix for mimeedit.sh to remove potentially unsafe tmpfile
creation
Index: gnome-commander.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-commander/devel/gnome-commander.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- gnome-commander.spec 12 Aug 2008 01:44:16 -0000 1.26
+++ gnome-commander.spec 12 Aug 2008 15:07:00 -0000 1.27
@@ -7,6 +7,8 @@
# Source10 is created by:
# svn co http://svn.gnome.org/svn/gnome-commander/branches/gcmd-1-3/tools/mimeedit/
# cp -p mimeedit/mimeedit.sh mimeedit-rev%%{mimeedit_rev}.sh
+#
+# ref: http://lists.gnu.org/archive/html/gcmd-devel/2007-11/msg00076.html
%define EXIV2_REQ 0.14
%define TAGLIB_REQ 1.4
@@ -14,7 +16,7 @@
%define use_autotool 0
%define if_pre 0
-%define main_release 3
+%define main_release 4
#%%define extratag svn1901_trunk
%define mimeedit_rev 1958
@@ -205,6 +207,10 @@
%{_datadir}/pixmaps/%{name}/
%changelog
+* Wed Aug 13 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.2.7-4
+- More fix for mimeedit.sh to remove potentially unsafe tmpfile
+ creation
+
* Tue Aug 12 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.2.7-3
- Install mimeedit script pulled from svn to support mime edit
menu (bug 458667)
mimeedit-svn1958.diff:
Index: mimeedit-svn1958.diff
===================================================================
RCS file: /cvs/extras/rpms/gnome-commander/devel/mimeedit-svn1958.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mimeedit-svn1958.diff 12 Aug 2008 01:44:16 -0000 1.1
+++ mimeedit-svn1958.diff 12 Aug 2008 15:07:00 -0000 1.2
@@ -1,8 +1,75 @@
Index: mimeedit.sh
===================================================================
---- mimeedit.sh (revision 1958)
+--- mimeedit.sh (revision 1962)
+++ mimeedit.sh (working copy)
-@@ -342,6 +342,7 @@
+@@ -63,11 +63,13 @@
+ # Build a list with registered apps for this mimetype.
+ #
+ function deflist (){
+- if [ -e "$UTMP.avail" ]; then cleanup;fi
++ TMP_AVAIL="`mktemp /tmp/gnome-commander.XXXXXX`"
++ TMP_CHOSEN="`mktemp /tmp/gnome-commander.XXXXXX`"
++ # if [ -e "$UTMP.avail" ]; then cleanup;fi
+ # Create the list in "$UTMP.avail" to be used by the zenity list-box
+ if [ "$NONEW" == 1 ]
+ then
+- echo "FALSE Add_New_App New" > "$UTMP.avail"
++ echo "FALSE Add_New_App New" > $TMP_AVAIL
+ fi
+ # Get all sub-mimetypes, one per row.
+ SUB="$(grep -hs "^$MTPE" $SUBC $G_CACHE $U_CACHE | awk -F= '{print $1}' | sed 's/ /\n/g')"
+@@ -77,14 +79,14 @@
+ then
+ for i in $(echo "$MTPEs" | sort -u); do
+ echo "FALSE $i $(grep -hs "^Name=" $GDATA_DIR/$i $DATA_DIR/$i | \
+- sed 's/Name=//;s/ /_/g')" >> "$UTMP.avail"
++ sed 's/Name=//;s/ /_/g')" >> $TMP_AVAIL
+ done
+ fi
+ # Change FALSE to TRUE for the default app.
+- if grep -q "desktop" "$UTMP.avail"
++ if grep -q "desktop" $TMP_AVAIL
+ then
+ DEF_APP=$(gnomevfs-info -s "$ARGU" | grep "Default app" | sed 's/.*: //')
+- sed -i "s|FALSE $DEF_APP|TRUE $DEF_APP|" "$UTMP.avail"
++ sed -i "s|FALSE $DEF_APP|TRUE $DEF_APP|" $TMP_AVAIL
+ fi
+ # Show the list
+ zenity --height="350" --width="550" --list --radiolist --text \
+@@ -99,17 +101,17 @@
+
+ Please select" \
+ --column "Pick" --column ".desktop file" --column "Application" \
+- $(cat "$UTMP.avail") > "$UTMP.chosen"
++ $(cat $TMP_AVAIL ) > $TMP_CHOSEN
+ retval=$?
+- choice=$(cat "$UTMP.chosen")
++ choice=$(cat $TMP_CHOSEN )
+ if grep -q "$MTPE=$choice" $U_DEF
+ then
+ retval=2
+ fi
+ case $retval in
+ 0)
+- DEF_CH=$(grep -s "$choice" "$UTMP.avail" | awk '{print $2}')
+- DEF_NME=$(grep -s "$choice" "$UTMP.avail" | awk '{print $3}')
++ DEF_CH=$(grep -s "$choice" $TMP_AVAIL | awk '{print $2}')
++ DEF_NME=$(grep -s "$choice" $TMP_AVAIL | awk '{print $3}')
+ if [ "$DEF_CH" = Add_New_App ]
+ then
+ newmime
+@@ -305,8 +307,8 @@
+ # Remove tempfiles.
+ #
+ function cleanup (){
+- rm -f "$UTMP.avail"
+- rm -f "$UTMP.chosen"
++ rm -f $TMP_AVAIL
++ rm -f $TMP_CHOSEN
+ }
+
+ #
+@@ -342,6 +344,7 @@
# The .desktop file editor
#
function dtfedit (){
@@ -10,7 +77,7 @@
USER_DTF="$DT_FILE-$EXT"
if [ -n "$DT_FILE" ]
then
-@@ -350,15 +351,22 @@
+@@ -350,15 +353,22 @@
then
TO_EDIT="$DATA_DIR/$USER_DTF"
else
--- gnome-commander-rev1874-hexmode-display.patch DELETED ---
- Previous message (by thread): rpms/gnome-commander/F-8 gnome-commander.sh, NONE, 1.1 mimeedit-svn1958.diff, NONE, 1.1 mimeedit-svn1958.sh, NONE, 1.1 gnome-commander.spec, 1.16, 1.17
- Next message (by thread): rpms/kexec-tools/F-9 kexec-tools.spec, 1.115, 1.116 mkdumprd, 1.20, 1.21
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list