[packages/xorg-app-xmh] - updated to 1.0.3 - updated man patch - added format patch (fixes build with -Werror=format-securit
qboosh
qboosh at pld-linux.org
Tue Apr 21 17:06:37 CEST 2015
commit 3d49cfe70f33eab5072eab9c1c462ebe56003c45
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Tue Apr 21 17:08:39 2015 +0200
- updated to 1.0.3
- updated man patch
- added format patch (fixes build with -Werror=format-security)
xorg-app-xmh-format.patch | 58 +++++++++++++++++++++++++++++++++++++++++++++++
xorg-app-xmh-man.patch | 4 ++--
xorg-app-xmh.spec | 9 +++++---
3 files changed, 66 insertions(+), 5 deletions(-)
---
diff --git a/xorg-app-xmh.spec b/xorg-app-xmh.spec
index d2ce702..8be3a07 100644
--- a/xorg-app-xmh.spec
+++ b/xorg-app-xmh.spec
@@ -1,18 +1,20 @@
Summary: xmh application - send and read mail with an X interface to MH
Summary(pl.UTF-8): Aplikacja xmh - czytanie i wysyłanie poczty poprzez interfejs X do MH
Name: xorg-app-xmh
-Version: 1.0.2
+Version: 1.0.3
Release: 1
License: MIT
Group: X11/Applications
Source0: http://xorg.freedesktop.org/releases/individual/app/xmh-%{version}.tar.bz2
-# Source0-md5: f5956a63c3d4d4b004b73e8be64d6d6e
+# Source0-md5: 342484425ae92cee33dfb8791b1cc2bf
Patch0: %{name}-man.patch
+Patch1: %{name}-format.patch
URL: http://xorg.freedesktop.org/
BuildRequires: autoconf >= 2.60
BuildRequires: automake
BuildRequires: pkgconfig >= 1:0.19
BuildRequires: xorg-data-xbitmaps >= 1.1.0
+BuildRequires: xorg-lib-libX11-devel
BuildRequires: xorg-lib-libXaw-devel
BuildRequires: xorg-lib-libXmu-devel
BuildRequires: xorg-lib-libXt-devel >= 1.0.0
@@ -33,6 +35,7 @@ wykonywane poprzez odwołania do pakietu MH.
%prep
%setup -q -n xmh-%{version}
%patch0 -p1
+%patch1 -p1
%build
%{__aclocal}
@@ -57,4 +60,4 @@ rm -rf $RPM_BUILD_ROOT
%doc COPYING ChangeLog README
%attr(755,root,root) %{_bindir}/xmh
%{_datadir}/X11/app-defaults/Xmh
-%{_mandir}/man1/xmh.1x*
+%{_mandir}/man1/xmh.1*
diff --git a/xorg-app-xmh-format.patch b/xorg-app-xmh-format.patch
new file mode 100644
index 0000000..a5886dc
--- /dev/null
+++ b/xorg-app-xmh-format.patch
@@ -0,0 +1,58 @@
+--- xmh-1.0.3/popup.c.orig 2015-04-17 09:01:32.000000000 +0200
++++ xmh-1.0.3/popup.c 2015-04-21 16:52:53.858720764 +0200
+@@ -508,6 +508,6 @@
+ PopupError((Widget)NULL, ptr);
+ allowPopup = True;
+ } else {
+- fprintf(stderr, ptr);
++ fputs(ptr, stderr);
+ }
+ }
+--- xmh-1.0.3/xmh.h.orig 2015-04-17 09:01:32.000000000 +0200
++++ xmh-1.0.3/xmh.h 2015-04-21 17:00:41.328711021 +0200
+@@ -69,7 +69,7 @@
+
+ #define DEBUG(msg) \
+ if (app_resources.debug) \
+- {(void)fprintf(stderr, msg); (void)fflush(stderr);}
++ {(void)fputs(msg, stderr); (void)fflush(stderr);}
+
+ #define DEBUG1(msg, arg) \
+ if (app_resources.debug) \
+@@ -79,6 +79,10 @@
+ if (app_resources.debug) \
+ {(void)fprintf(stderr,msg,arg1,arg2); (void)fflush(stderr);}
+
++#define DEBUG3(msg, arg1, arg2, arg3) \
++ if (app_resources.debug) \
++ {(void)fprintf(stderr,msg,arg1,arg2,arg3); (void)fflush(stderr);}
++
+ typedef int * dp; /* For debugging. */
+
+ typedef FILE* FILEPTR;
+--- xmh-1.0.3/toc.c.orig 2015-04-17 09:01:32.000000000 +0200
++++ xmh-1.0.3/toc.c 2015-04-21 16:58:45.382046771 +0200
+@@ -1136,9 +1136,7 @@
+ h = toc->nummsgs - 1;
+ if (h < 0) {
+ if (app_resources.debug) {
+- char str[100];
+- (void)sprintf(str, "Toc is empty! folder=%s\n", toc->foldername);
+- DEBUG( str )
++ DEBUG1("Toc is empty! folder=%s\n", toc->foldername);
+ }
+ return NULL;
+ }
+@@ -1152,11 +1150,8 @@
+ if (toc->msgs[l]->msgid == msgid) return toc->msgs[l];
+ if (toc->msgs[h]->msgid == msgid) return toc->msgs[h];
+ if (app_resources.debug) {
+- char str[100];
+- (void) sprintf(str,
+- "TocMsgFromId search failed! hi=%d, lo=%d, msgid=%d\n",
++ DEBUG3("TocMsgFromId search failed! hi=%d, lo=%d, msgid=%d\n",
+ h, l, msgid);
+- DEBUG( str )
+ }
+ return NULL;
+ }
diff --git a/xorg-app-xmh-man.patch b/xorg-app-xmh-man.patch
index c44cee2..05ac27a 100644
--- a/xorg-app-xmh-man.patch
+++ b/xorg-app-xmh-man.patch
@@ -1,5 +1,5 @@
---- xmh-1.0.1/xmh.man.orig 2004-04-23 21:54:58.000000000 +0200
-+++ xmh-1.0.1/xmh.man 2006-10-15 23:33:12.736811500 +0200
+--- xmh-1.0.3/man/xmh.man.orig 2004-04-23 21:54:58.000000000 +0200
++++ xmh-1.0.3/man/xmh.man 2006-10-15 23:33:12.736811500 +0200
@@ -1316,8 +1316,8 @@
An example of \fI.xmhcheck\fP file format, for the folders ``inbox'' and
``xpert'':
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/xorg-app-xmh.git/commitdiff/3d49cfe70f33eab5072eab9c1c462ebe56003c45
More information about the pld-cvs-commit
mailing list