rpms/manedit/devel manedit-1.1.1-fix-compilation.patch, NONE, 1.1 manedit-1.1.1-fix-segv-on-manview.patch, NONE, 1.1 manedit-1.1.1-more-manpages.patch, NONE, 1.1 manedit-1.1.1-tmpdir.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 manedit.desktop, 1.3, 1.4 manedit.spec, 1.21, 1.22 manview.desktop, 1.1, 1.2 sources, 1.6, 1.7 manedit-0.7.1-manbase.patch, 1.1, NONE manedit-0.8.1-allow-more_section.patch, 1.1, NONE manedit-0.8.1-function-declration.patch, 1.1, NONE manedit-0.8.1-segv-when-press-new.patch, 1.1, NONE
Mamoru Tasaka (mtasaka)
fedora-extras-commits at redhat.com
Mon Jun 30 12:05:55 UTC 2008
- Previous message: rpms/manedit/F-9 manedit-1.1.1-fix-compilation.patch, NONE, 1.1 manedit-1.1.1-fix-segv-on-manview.patch, NONE, 1.1 manedit-1.1.1-more-manpages.patch, NONE, 1.1 manedit-1.1.1-tmpdir.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 manedit.desktop, 1.3, 1.4 manedit.spec, 1.21, 1.22 manview.desktop, 1.1, 1.2 sources, 1.6, 1.7 manedit-0.7.1-manbase.patch, 1.1, NONE manedit-0.8.1-allow-more_section.patch, 1.1, NONE manedit-0.8.1-function-declration.patch, 1.1, NONE manedit-0.8.1-segv-when-press-new.patch, 1.1, NONE
- Next message: rpms/scanssh/devel scanssh.spec,1.12,1.13
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mtasaka
Update of /cvs/extras/rpms/manedit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7738/devel
Modified Files:
.cvsignore manedit.desktop manedit.spec manview.desktop
sources
Added Files:
manedit-1.1.1-fix-compilation.patch
manedit-1.1.1-fix-segv-on-manview.patch
manedit-1.1.1-more-manpages.patch manedit-1.1.1-tmpdir.patch
Removed Files:
manedit-0.7.1-manbase.patch
manedit-0.8.1-allow-more_section.patch
manedit-0.8.1-function-declration.patch
manedit-0.8.1-segv-when-press-new.patch
Log Message:
* Mon Jun 30 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.1.1-1
- 1.1.1
- Seems that URL are moved temporarily
- Fix segv on clicking "Index" on manview
- Fix potentially insecure tmpdir creation
manedit-1.1.1-fix-compilation.patch:
--- NEW FILE manedit-1.1.1-fix-compilation.patch ---
--- manedit-1.1.1/manedit/ca_string.c.compile 2008-06-17 15:00:00.000000000 +0900
+++ manedit-1.1.1/manedit/ca_string.c 2008-06-30 15:31:48.000000000 +0900
@@ -1,4 +1,5 @@
#include <glib.h>
+#include <string.h>
#include "ca_string.h"
--- manedit-1.1.1/manedit/editor_find_replace.c.compile 2008-06-17 15:00:00.000000000 +0900
+++ manedit-1.1.1/manedit/editor_find_replace.c 2008-06-30 15:34:25.000000000 +0900
@@ -1,3 +1,5 @@
+#define _GNU_SOURCE
+
#include <string.h>
#include <gtk/gtk.h>
--- manedit-1.1.1/manedit/manpage_view.c.compile 2008-06-17 15:00:00.000000000 +0900
+++ manedit-1.1.1/manedit/manpage_view.c 2008-06-30 15:30:10.000000000 +0900
@@ -1,4 +1,5 @@
#include <gtk/gtk.h>
+#include <string.h>
#include "guiutils.h"
manedit-1.1.1-fix-segv-on-manview.patch:
--- NEW FILE manedit-1.1.1-fix-segv-on-manview.patch ---
--- manedit-1.1.1/manedit/viewer.c.debug 2008-06-17 15:00:00.000000000 +0900
+++ manedit-1.1.1/manedit/viewer.c 2008-06-30 17:17:43.000000000 +0900
@@ -569,7 +569,11 @@
/* Get the list of child objects in this directory */
names_list = GetDirEntNames(path);
- for(i = 0; names_list[i] != NULL; i++)
+ /*
+ names_list may return NULL, for example when user has no
+ right to access path
+ */
+ for(i = 0; names_list && names_list[i]; i++)
{
name = names_list[i];
@@ -822,7 +826,7 @@
names_list = StringQSort(names_list, npaths);
/* Iterate through each child */
- for(i = 0; names_list[i] != NULL; i++)
+ for(i = 0; names_list && names_list[i]; i++)
{
name = names_list[i];
manedit-1.1.1-more-manpages.patch:
--- NEW FILE manedit-1.1.1-more-manpages.patch ---
--- manedit-1.1.1/manedit/editor_cb.c.manpages 2008-06-17 15:00:00.000000000 +0900
+++ manedit-1.1.1/manedit/editor_cb.c 2008-06-30 15:47:17.000000000 +0900
@@ -32,6 +32,9 @@
#include "me_cfg_list.h"
#include "config.h"
+#define MANPAGE_SUFFIX \
+ ".1 .2 .3 .4 .5 .6 .7 .8 .9 .bz2 .gz" \
+ " .1x .2x .3x .4x .5x .6x .7x .8x .9x"
void EditorItemDestroyCB(gpointer data);
@@ -508,7 +511,7 @@
FileBrowserTypeListNew(
&ftypes_list, &nftypes,
- ".1 .2 .3 .4 .5 .6 .7 .8 .9 .bz2 .gz",
+ MANPAGE_SUFFIX,
"Manual page"
);
FileBrowserTypeListNew(
@@ -848,7 +851,7 @@
/* Create the file types list */
FileBrowserTypeListNew(
&ftypes_list, &nftypes,
- ".1 .2 .3 .4 .5 .6 .7 .8 .9 .bz2 .gz",
+ MANPAGE_SUFFIX,
"Manual page"
);
FileBrowserTypeListNew(
@@ -1299,7 +1302,7 @@
/* Create the file types list */
FileBrowserTypeListNew(
&ftypes_list, &nftypes,
- ".1 .2 .3 .4 .5 .6 .7 .8 .9 .bz2 .gz",
+ MANPAGE_SUFFIX,
"Manual page"
);
FileBrowserTypeListNew(
--- manedit-1.1.1/manedit/me_core.c.manpages 2008-06-17 15:00:00.000000000 +0900
+++ manedit-1.1.1/manedit/me_core.c 2008-06-30 16:09:21.000000000 +0900
@@ -112,6 +112,10 @@
string_list = CFGStringListNew(NULL);
string_list->list = g_list_append(
string_list->list,
+ g_strdup("/usr/kerberos/man")
+ );
+ string_list->list = g_list_append(
+ string_list->list,
g_strdup("/usr/man")
);
string_list->list = g_list_append(
manedit-1.1.1-tmpdir.patch:
--- NEW FILE manedit-1.1.1-tmpdir.patch ---
--- manedit-1.1.1/manedit/main.c.tmppath 2008-06-17 15:00:00.000000000 +0900
+++ manedit-1.1.1/manedit/main.c 2008-06-30 19:23:22.000000000 +0900
@@ -4,6 +4,7 @@
#include <locale.h>
#include <gtk/gtk.h>
#include <gdk/gdkx.h>
+#include <unistd.h>
#include "../include/disk.h"
#include "../include/string.h"
@@ -199,5 +200,8 @@
CDialogShutdown();
FPromptShutdown();
+ /* clean up */
+ rmdir (MECreateTemporaryDirectory(NULL));
+
return(0);
}
--- manedit-1.1.1/manedit/me_op.c.tmppath 2008-06-17 15:00:00.000000000 +0900
+++ manedit-1.1.1/manedit/me_op.c 2008-06-30 19:23:04.000000000 +0900
@@ -1,3 +1,5 @@
+#define _BSD_SOURCE
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -275,11 +277,18 @@
* The returned pointer needs to be deleted by the calling
* function.
*/
+
+#define TMP_DIR_MAX_LEN 1024
+
gchar *MECreateTemporaryDirectory(me_core_struct *core)
{
const gchar *user_name,
*tmp_path;
gchar *tmp_dir_rtn;
+
+ static gchar tmp_dir_memory[TMP_DIR_MAX_LEN] = "";
+ if (*tmp_dir_memory) return g_strdup(tmp_dir_memory);
+
CfgList *cfg_list = core->cfg_list;
/* Get the tempory directory */
@@ -303,6 +312,7 @@
user_name = "anon";
/* Format the return temporary directory path */
+#if 0
tmp_dir_rtn = g_strconcat(
tmp_path,
G_DIR_SEPARATOR_S,
@@ -328,6 +338,22 @@
}
return(tmp_dir_rtn);
+#else
+ snprintf(tmp_dir_memory, TMP_DIR_MAX_LEN -1,
+ "%s%s%s%s%s",
+ tmp_path,
+ G_DIR_SEPARATOR_S,
+ "manedit-",
+ user_name,
+ ".XXXXXX"
+ );
+
+ if (!mkdtemp(tmp_dir_memory)){
+ fprintf(stderr, "Could not create temporary directory\n");
+ exit(1);
+ }
+ return g_strdup(tmp_dir_memory);
+#endif
}
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/manedit/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore 11 Feb 2007 14:05:35 -0000 1.6
+++ .cvsignore 30 Jun 2008 12:04:45 -0000 1.7
@@ -1 +1 @@
-manedit-0.8.1.tar.bz2
+manedit-1.1.1.tar.bz2
Index: manedit.desktop
===================================================================
RCS file: /cvs/extras/rpms/manedit/devel/manedit.desktop,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- manedit.desktop 13 Nov 2006 08:38:09 -0000 1.3
+++ manedit.desktop 30 Jun 2008 12:04:45 -0000 1.4
@@ -7,4 +7,4 @@
Icon=manedit
Terminal=false
Type=Application
-Categories=Application;Development;
+Categories=Development;Translation;
Index: manedit.spec
===================================================================
RCS file: /cvs/extras/rpms/manedit/devel/manedit.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- manedit.spec 3 Apr 2008 15:51:54 -0000 1.21
+++ manedit.spec 30 Jun 2008 12:04:45 -0000 1.22
@@ -1,19 +1,24 @@
+%define repoid 6183
+
+
Name: manedit
-Version: 0.8.1
-Release: 3%{?dist}
+Version: 1.1.1
+Release: 1%{?dist}
Summary: UNIX Manual Page Editor
Group: Development/Tools
License: GPLv2
-URL: http://wolfpack.twu.net/ManEdit/
-Source0: http://wolfpack.twu.net/users/wolfpack/%{name}-%{version}.tar.bz2
+#URL: http://wolfpack.twu.net/ManEdit/
+URL: http://freshmeat.net/projects/manedit/
+#Source0: http://wolfpack.twu.net/users/wolfpack/%{name}-%{version}.tar.bz2
+Source0: http://freshmeat.net/redir/manedit/%{repoid}/url_bz2/manedit-%{version}.tar.bz2
Source1: manedit.desktop
Source2: manview.desktop
Patch0: manedit-0.7.1-makefile.patch
-Patch1: manedit-0.8.1-allow-more_section.patch
-Patch2: manedit-0.7.1-manbase.patch
-Patch3: manedit-0.8.1-segv-when-press-new.patch
-Patch4: manedit-0.8.1-function-declration.patch
+Patch1: manedit-1.1.1-more-manpages.patch
+Patch4: manedit-1.1.1-fix-compilation.patch
+Patch5: manedit-1.1.1-fix-segv-on-manview.patch
+Patch6: manedit-1.1.1-tmpdir.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# This is gtk+ package
@@ -22,6 +27,7 @@
BuildRequires: bzip2-devel
BuildRequires: desktop-file-utils
Requires: man
+Requires: xorg-x11-fonts-ISO8859-15-100dpi
%description
ManEdit is a UNIX manual page editor and viewer,
@@ -37,17 +43,17 @@
# Base Makefile on FreeBSD style
%{__cp} -p ./manedit/Makefile.FreeBSD ./manedit/Makefile
%patch0 -p1 -b .fedora
-%patch1 -p1 -b .section
-%patch2 -p1 -b .manbase
-%patch3 -p1 -b .segv_pressed_new
-%patch4 -p1 -b .func_declare
+%patch4 -p1 -b .compile
+%patch1 -p1 -b .manpages
+%patch5 -p1 -b .segv_manview
+%patch6 -p1 -b .tmpdir
%build
# I cannot understand this configure!!
#%%configure
pushd manedit
-%{__make} %{?_smp_mflags} \
+%{__make} %{?_smp_mflags} -k \
CC="%{__cc} -Werror-implicit-function-declaration" \
OPTFLAGS="$RPM_OPT_FLAGS -DHAVE_GZIP -DHAVE_BZIP2" \
LDFLAGS="-lz -lbz2"
@@ -66,24 +72,20 @@
desktop-file-install \
--vendor fedora \
- --remove-category Application \
- --dir $RPM_BUILD_ROOT%{_datadir}/applications \
- %{SOURCE1}
-
-desktop-file-install \
- --vendor fedora \
- --remove-category Application \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
+ %{SOURCE1} \
%{SOURCE2}
# install icons
# size 20 don't seems to be owned by hicolor-icon-theme
+for size in 32x32 48x48; do
+ %{__install} -D -c -p -m 644 images/icon_manedit_${size}.xpm \
+ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${size}/apps/manedit.xpm
+done
+
for size in 16x16 48x48 ; do
- %{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${size}/apps/
- for f in manedit mp_viewer ; do
- %{__install} -c -p -m 644 images/${f}_${size}.xpm \
- $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${size}/apps/${f}.xpm
- done
+ %{__install} -D -c -p -m 644 images/icon_manedit_viewer_${size}.xpm \
+ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${size}/apps/manedit_viewer.xpm
done
%{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/pixmaps/
@@ -113,6 +115,12 @@
%{_mandir}/man1/%{name}.1*
%changelog
+* Mon Jun 30 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.1.1-1
+- 1.1.1
+- Seems that URL are moved temporarily
+- Fix segv on clicking "Index" on manview
+- Fix potentially insecure tmpdir creation
+
* Fri Apr 4 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.8.1-3
- Fix implicit function declaration
Index: manview.desktop
===================================================================
RCS file: /cvs/extras/rpms/manedit/devel/manview.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- manview.desktop 13 Nov 2006 08:38:09 -0000 1.1
+++ manview.desktop 30 Jun 2008 12:04:45 -0000 1.2
@@ -4,7 +4,7 @@
Name=ManView
Comment=UNIX Manual Page Viewer
Exec=manview
-Icon=mp_viewer
+Icon=manedit_viewer
Terminal=false
Type=Application
-Categories=Application;Graphics;
+Categories=Graphics;Viewer;
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/manedit/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources 11 Feb 2007 14:05:35 -0000 1.6
+++ sources 30 Jun 2008 12:04:45 -0000 1.7
@@ -1 +1 @@
-a3124ad8e5234c54c1493a821501c64d manedit-0.8.1.tar.bz2
+8fcc4675b31d2d6828081243320b1a89 manedit-1.1.1.tar.bz2
--- manedit-0.7.1-manbase.patch DELETED ---
--- manedit-0.8.1-allow-more_section.patch DELETED ---
--- manedit-0.8.1-function-declration.patch DELETED ---
--- manedit-0.8.1-segv-when-press-new.patch DELETED ---
- Previous message: rpms/manedit/F-9 manedit-1.1.1-fix-compilation.patch, NONE, 1.1 manedit-1.1.1-fix-segv-on-manview.patch, NONE, 1.1 manedit-1.1.1-more-manpages.patch, NONE, 1.1 manedit-1.1.1-tmpdir.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 manedit.desktop, 1.3, 1.4 manedit.spec, 1.21, 1.22 manview.desktop, 1.1, 1.2 sources, 1.6, 1.7 manedit-0.7.1-manbase.patch, 1.1, NONE manedit-0.8.1-allow-more_section.patch, 1.1, NONE manedit-0.8.1-function-declration.patch, 1.1, NONE manedit-0.8.1-segv-when-press-new.patch, 1.1, NONE
- Next message: rpms/scanssh/devel scanssh.spec,1.12,1.13
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list