packages/gpm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: packages:4bee8b5455771a78bd5f5ba8f00f030d798d72db
Branches Tags
packages:main
...
compare: packages:541dd95e413dea51d3c7fc2086fef3ae5f3fe7e9
Branches Tags
packages:main

11 Commits
4bee8b5455 ... 541dd95e41

Author SHA1 Message Date
openeuler-ci-bot
541dd95e41 !17 fix update error 
Merge pull request !17 from 邢星/openEuler-20.03-LTS-SP3
 2021-12-25 07:59:11 +00:00
xingxing
fd5350a4f9 fix update error 2021-12-25 15:24:54 +08:00
openeuler-ci-bot
6b982564f5 !7 [sync] PR-6: modify for invaild patch 
From: @openeuler-sync-bot
Reviewed-by: @yanan-rock
Signed-off-by: @yanan-rock
 2021-05-21 11:47:23 +08:00
compile_success
bd235819de modify patch invalid 
(cherry picked from commit 8be92b1a34a9038539871e384293c5824919d8dd)
 2021-05-21 10:26:27 +08:00
openeuler-ci-bot
aa250c0acd !3 gpm: add gdb in buildrequires 
Merge pull request !3 from orange-snn/master
 2020-03-20 15:26:01 +08:00
songnannan
1a1b5bc746 add gdb in buildrequires 2020-03-19 21:03:00 +08:00
openeuler-ci-bot
420ec33503 !2 gpm: optimization the spec 
Merge pull request !2 from orange-snn/init
 2020-01-09 09:20:35 +08:00
songnannan
a4d1343c2b optimization the spec 2020-01-08 16:00:56 +08:00
songnannan
f0504f0447 optimization the spec 2020-01-08 15:58:51 +08:00
openeuler-ci-bot
e6b2606787 !1 gpm: update tarball 
Merge pull request !1 from openeuler-basic/master
 2019-12-31 18:39:37 +08:00
hexiujun
0f2bd8bef7 update tarball 2019-12-31 18:23:58 +08:00
8 changed files with 37 additions and 139 deletions
Show Stats Expand all files Collapse all files

19
gpm-1.20.1-lib-silent.patch
View File

@ -1,19 +0,0 @@
--- gpm-1.20.1/src/lib/report-lib.c.lib-silent 2002-12-24 23:57:16.000000000 +0100
+++ gpm-1.20.1/src/lib/report-lib.c 2006-01-18 17:55:38.000000000 +0100
@@ -24,8 +24,16 @@
#include "headers/message.h"
+static int gpm_silent() {
+ if ( getenv( "GPM_VERBOSE" ) == NULL ) return 1;
+ return 0;
+}
+
void gpm_report(int line, char *file, int stat, char *text, ... )
{
+ if ( gpm_silent() && stat != GPM_STAT_OOPS )
+ return;
+
char *string = NULL;
int log_level;
va_list ap;

2
gpm-1.20.1-weak-wgetch.patch
View File

@ -15,7 +15,7 @@
int Gpm_Wgetch(WINDOW *win)
{
--- gpm-1.20.1/configure.ac.weak-wgetch 2004-03-22 15:49:51.000000000 -0500
+++ gpm-1.20.1/configure.ac 2004-03-22 15:51:24.000000000 -0500
+++ gpm-1.20.1/configure.ac.footer 2004-03-22 15:51:24.000000000 -0500
@@ -115,7 +115,7 @@
AC_CHECK_LIB($i, wgetch,,,$TERMLIBS)
else :; fi

17
gpm-1.20.5-close-fds.patch
View File

@ -1,17 +0,0 @@
diff -up gpm-1.20.5/src/daemon/startup.c.close-fds gpm-1.20.5/src/daemon/startup.c
--- gpm-1.20.5/src/daemon/startup.c.close-fds 2008-06-13 10:08:19.000000000 +0200
+++ gpm-1.20.5/src/daemon/startup.c 2008-12-02 10:11:12.000000000 +0100
@@ -135,6 +135,13 @@ void startup(int argc, char **argv)
check_uniqueness();
gpm_report(GPM_PR_INFO,GPM_MESS_STARTED);
+ // close extra fds
+ if (option.run_status == GPM_RUN_STARTUP ) {
+ close(0);
+ close(1);
+ close(2);
+ }
+
//return mouse_table[1].fd; /* the second is handled in the main() */
/****************** OLD CODE from gpn.c END ***********************/

45
gpm-1.20.6-multilib.patch
View File

@ -1,45 +0,0 @@
diff -up gpm-1.20.6/contrib/Makefile.in.multilib gpm-1.20.6/contrib/Makefile.in
--- gpm-1.20.6/contrib/Makefile.in.multilib 2008-06-19 07:48:48.000000000 +0200
+++ gpm-1.20.6/contrib/Makefile.in 2009-02-24 10:36:09.000000000 +0100
@@ -9,10 +9,10 @@ top_builddir = ..
include $(top_builddir)/Makefile.include
-all: $(srcdir)/$(ELISP)
+all: $(filter-out %.elc,$(srcdir)/$(ELISP))
install: all
- if [ -n "$(ELISP)" ]; then for i in `echo $(ELISP)`; do \
+ if [ -n "$(filter-out %.elc,$(ELISP))" ]; then for i in `echo $(filter-out %.elc,$(ELISP))`; do \
$(INSTALL_DATA) $(srcdir)/$$i $(lispdir)/`basename $$i` ;\
done; fi
@@ -20,7 +20,7 @@ install: all
$(EMACS) -batch -l $(srcdir)/emacs/exec.el -exec '(byte-compile-file "$<")'
uninstall:
- if [ -n "$(ELISP)" ]; then for i in `echo $(ELISP)`; do \
+ if [ -n "$(filter-out %.elc,$(ELISP))" ]; then for i in `echo $(filter-out %.elc,$(ELISP))`; do \
rm -f $(lispdir)/$$i ;\
done; fi
@@ -28,4 +28,4 @@ dist:
$(CP) -r $(srcdir) $(top_builddir)/gpm-$(release)/
clean distclean:
- $(RM) -f $(srcdir)/emacs/*.elc Makefile
+ $(RM) $(srcdir)/emacs/*.elc Makefile
diff -up gpm-1.20.6/doc/Makefile.in.multilib gpm-1.20.6/doc/Makefile.in
--- gpm-1.20.6/doc/Makefile.in.multilib 2009-02-09 10:58:53.000000000 +0100
+++ gpm-1.20.6/doc/Makefile.in 2009-02-24 10:36:09.000000000 +0100
@@ -130,8 +130,8 @@ install: all installdirs
#i keep all my infopages compressed and i'm tired to do it by
#hand, so check if there are any compressed pages and do this
#one too
- -ls $(infodir)/*[-.]info.gz >/dev/null 2>&1 \
- && gzip -f $(infodir)/gpm.info
+ #-ls $(infodir)/*[-.]info.gz >/dev/null 2>&1 \
+ # && gzip -f $(infodir)/gpm.info
# Hmm.... shouldn't man pages be compressed too?
# maybe they should, but at least at my system they are not.

30
gpm-1.20.7-rhbz-668480-gpm-types-7-manpage-fixes.patch
View File

@ -1,30 +0,0 @@
diff -Naur gpm-1.20.7.orig/doc/doc.gpm.in gpm-1.20.7/doc/doc.gpm.in
--- gpm-1.20.7.orig/doc/doc.gpm.in 2012-10-26 23:21:38.000000000 +0200
+++ gpm-1.20.7/doc/doc.gpm.in 2013-07-19 19:40:33.374213536 +0200
@@ -600,7 +600,7 @@
that one of @t{\-o dtr}, @t{\-o rts}, @t{\-o both} can be specified to
toggle the control lines of the serial port.
-The following mouse type are corrently recognized:
+The following mouse type are currently recognized:
@table @code
@item bare Microsoft
@@ -621,7 +621,7 @@
this is your case, use the @samp{bare} mouse type. Some new
two-button devices are ``plug and play'', and they don't play
fair at all; in this case try @t{\-t pnp}. Many (most)
- three-button devices that use the microsoft protocol fail to
+ three-button devices that use the Microsoft protocol fail to
report some middle-button events during mouse motion. Since
the protocol does not distinguish between the middle button
going up and the middle button going down it would be liable
@@ -649,7 +649,7 @@
decoder gets into a confused state where it thinks the middle
button is up when it's down and vice versa. (If you get sick
of having to do this, please don't blame gpm; blame your buggy
- mouse! Note that most three-button mice that do the microsoft
+ mouse! Note that most three-button mice that do the Microsoft
protocol can be made to do the MouseSystems protocol
instead. The ``3 Button Serial Mouse mini-HOWTO'' has
information about this.) This mouse decoder accepts standard

BIN
gpm-1.20.7.tar.gz Normal file
View File

Binary file not shown.

BIN
gpm-1.20.7.tar.xz
View File

Binary file not shown.

63
gpm.spec
View File

@ -1,21 +1,17 @@
Name: gpm
Version: 1.20.7
Release: 18
Release: 23
Summary: The gpm package contains a mouse server for the console and xterm
License: GPLv2 and GPLv2+ with exceptions and GPLv3+ and Verbatim and Copyright only
URL: http://www.nico.schottelius.org/software/gpm/
Source: %{name}-%{version}.tar.xz
URL: https://www.nico.schottelius.org/software/gpm/
Source: https://www.nico.schottelius.org/software/gpm/archives/%{name}-%{version}.tar.gz
Source1: gpm.service
Patch1: gpm-1.20.6-multilib.patch
Patch2: gpm-1.20.1-lib-silent.patch
Patch3: gpm-1.20.5-close-fds.patch
Patch4: gpm-1.20.1-weak-wgetch.patch
Patch5: gpm-1.20.7-rhbz-668480-gpm-types-7-manpage-fixes.patch
Patch6: gpm-1.20.6-missing-header-dir-in-make-depend.patch
Patch7: gpm-format-security.patch
Patch8: gpm-1.20.7-sysmacros.patch
Patch9: gpm-1.20.7-sigemptyset.patch
Patch1: gpm-1.20.1-weak-wgetch.patch
Patch2: gpm-1.20.6-missing-header-dir-in-make-depend.patch
Patch3: gpm-format-security.patch
Patch4: gpm-1.20.7-sysmacros.patch
Patch5: gpm-1.20.7-sigemptyset.patch
Patch6000: fix-highly-illegal-return-of-int-as-char-and-less-wo.patch
Patch6001: fix-signedness-issue.patch
@ -24,7 +20,7 @@ Requires(post): systemd systemd-sysv info
Requires(preun): systemd info
Requires(postun): systemd
Requires: linuxconsoletools
BuildRequires: autoconf automake bison gawk libtool libcap-ng-devel ncurses-devel sed systemd texinfo
BuildRequires: autoconf automake bison gawk libtool libcap-ng-devel ncurses-devel sed systemd texinfo gdb
Requires: %{name}-libs = %{version}-%{release}
%description
@ -53,21 +49,17 @@ for the gpm library.
%prep
%setup -q
./autogen.sh
%patch1 -p1 -b .multilib
%patch2 -p1 -b .lib-silent
%patch3 -p1 -b .close-fds
%patch4 -p1 -b .weak-wgetch
%patch1 -p1 -b .weak-wgetch
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch7 -p1
%patch8 -p1
%patch9 -p1
%patch6000 -p1
%patch6001 -p1
%build
./autogen.sh
%configure
%make_build
@ -84,20 +76,16 @@ cp %{SOURCE1} %{buildroot}%{_unitdir}
chmod 644 %{buildroot}%{_unitdir}/gpm.service
%post
%systemd_post gpm.service
if [ -e %{_infodir}/gpm.info.gz ]; then
/sbin/install-info %{_infodir}/gpm.info.gz %{_infodir}/dir || :
fi
%preun
%systemd_preun gpm.service
if [ $1 = 0 -a -e %{_infodir}/gpm.info.gz ]; then
/sbin/install-info %{_infodir}/gpm.info.gz --delete %{_infodir}/dir || :
fi
%postun
%systemd_postun_with_restart gpm.servic
%ldconfig_post
%ldconfig_postun
@ -105,7 +93,7 @@ fi
%doc COPYING
%{_infodir}/*
%config(noreplace) %{_sysconfdir}/gpm-*
%exclude %{_datadir}/emacs/site-lisp/t-mouse.el
%exclude %{_datadir}/emacs/site-lisp/*
%{_unitdir}/gpm.service
%{_sbindir}/*
%{_bindir}/*
@ -123,6 +111,27 @@ fi
%{_mandir}/man?/*
%changelog
* Sat Dec 25 2021 xingxing <xingxing9@huawei.com> - 1.20.7-23
- fix update error
* Fri Dec 11 2020 zhujunhao <zhujunhao8@huawei.com> - 1.20.7-22
- modify for patch invalid
* Thu Mar 19 2020 songnannan <songnannan2@huawei.com> - 1.20.7-21
- add gdb in buildrequires
* Wed Jan 8 2020 openEuler Buildteam <buildteam@openeuler.org> - 1.20.7-20
- Type:bugfix
- ID:NA
- SUG:NA
- DESC: optimization the spec
* Tue Dec 31 2019 openEuler Buildteam <buildteam@openeuler.org> - 1.20.7-19
- Type:NA
- Id:NA
- SUG:NA
- DESC:update tarball
* Thu Oct 24 2019 openEuler Buildteam <buildteam@openeuler.org> - 1.20.7-18
- Type:bugfix
- Id:NA