[gentoo-commits] repo/gentoo:master commit in: sys-libs/gpm/files/, sys-libs/gpm/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: sys-libs/gpm/files/, sys-libs/gpm/
@ 2016-02-15  2:17 Mike Frysinger
  0 siblings, 0 replies; 5+ messages in thread
From: Mike Frysinger @ 2016-02-15  2:17 UTC (permalink / raw
  To: gentoo-commits

commit:     78b7654d0916f43fd973a3ecfe3726267e0f13b7
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 15 02:11:09 2016 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Mon Feb 15 02:12:06 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78b7654d

sys-libs/gpm: delete old <1.20.7-r2 versions

 sys-libs/gpm/Manifest                              |  1 -
 .../0001-daemon-use-sys-ioctl.h-for-ioctl.patch    | 31 ----------
 sys-libs/gpm/files/0001-fixup-make-warnings.patch  | 35 -----------
 sys-libs/gpm/files/gpm-1.20.5-abi.patch            | 13 ----
 sys-libs/gpm/files/gpm-1.20.6-disablestatic.patch  | 66 --------------------
 sys-libs/gpm/files/gpm.rc6                         | 38 ------------
 sys-libs/gpm/gpm-1.20.6-r1.ebuild                  | 71 ----------------------
 sys-libs/gpm/gpm-1.20.6.ebuild                     | 60 ------------------
 sys-libs/gpm/gpm-1.20.7-r1.ebuild                  | 65 --------------------
 sys-libs/gpm/gpm-1.20.7.ebuild                     | 64 -------------------
 10 files changed, 444 deletions(-)

diff --git a/sys-libs/gpm/Manifest b/sys-libs/gpm/Manifest
index 5a1f854..afdac3e 100644
--- a/sys-libs/gpm/Manifest
+++ b/sys-libs/gpm/Manifest
@@ -1,2 +1 @@
-DIST gpm-1.20.6.tar.lzma 1280871 SHA256 27abb8a9142d3f7c31aeade2f2f1ed4b76bc760e181f552c504a7a9be00a868f SHA512 6f12d49cb690506ed116251376f0a2c946d86d323e93e11b9c71e7c40212fcc25b9ed364cd4dca3e5f0666fc7d9c38f1c3cdf6e80924cc68aef8623b39c0e623 WHIRLPOOL 05bee4c9156bbde78ea6ee06d7c4afba39899d2877a90a72e60bdab8c921fca9041cbebe5fa0afcc055a1cec2b0674392bcb9b3f1712103f236172e54e15b3b9
 DIST gpm-1.20.7.tar.lzma 789691 SHA256 a955053b36556ffa7c628ce18fd6de7d625966573fa412fb08869533d8f7385c SHA512 a502741e2f457b47e41c6d155b1f7ef7c95384fd394503f82ddacf80cde9cdc286c906c77be12b6af8565ef1c3ab24d226379c1dcebcfcd15d64bcf3e94b63b9 WHIRLPOOL d3d142c3aa385e2ef4b16c96e0f94c04b3666376d893c516d439737c2f3016a12fff7884a8f18b5e6b58e4ba21d82379204b18621a2f338d8ab6d478e4e1ec1a

diff --git a/sys-libs/gpm/files/0001-daemon-use-sys-ioctl.h-for-ioctl.patch b/sys-libs/gpm/files/0001-daemon-use-sys-ioctl.h-for-ioctl.patch
deleted file mode 100644
index b6c7809..0000000
--- a/sys-libs/gpm/files/0001-daemon-use-sys-ioctl.h-for-ioctl.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From b184152761d8a4dbf73adcffaddac85709949c2f Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Sun, 15 Feb 2009 16:16:51 -0500
-Subject: [PATCH] daemon: use sys/ioctl.h for ioctl()
-
-Including stropts.h for the ioctl() prototype is weird and breaks some
-systems that do not implement stropts.h.  Use sys/ioctl.h like normal.
-
-URL: http://bugs.gentoo.org/222099
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
-Reported-by: Sergey Dryabzhinsky <sergey.dryabzhinsky@gmail.com>
----
- src/daemon/open_console.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/daemon/open_console.c b/src/daemon/open_console.c
-index 27b62e2..98297c9 100644
---- a/src/daemon/open_console.c
-+++ b/src/daemon/open_console.c
-@@ -21,7 +21,7 @@
- 
- #include <fcntl.h>                  /* open and co.      */
- #include <sys/stat.h>               /* stat()            */
--#include <stropts.h>                /* ioctl             */
-+#include <sys/ioctl.h>              /* ioctl             */
- 
- /* Linux specific (to be outsourced in gpm2 */
- #include <linux/serial.h>           /* for serial console check */
--- 
-1.6.1.3
-

diff --git a/sys-libs/gpm/files/0001-fixup-make-warnings.patch b/sys-libs/gpm/files/0001-fixup-make-warnings.patch
deleted file mode 100644
index c55d2f8..0000000
--- a/sys-libs/gpm/files/0001-fixup-make-warnings.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 1bee81778e7355e6b902986b6e0fc5750546444a Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Mon, 16 Feb 2009 15:43:40 -0500
-Subject: [PATCH] fixup make warnings
-
-Split the toplevel dep target to use normal make dependencies and use the
-$(MAKE) var rather than hardcoding `make`.
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- Makefile.in |    8 +++++---
- 1 files changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index 90b92d0..89cbb5e 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -26,9 +26,11 @@ SUBDIRS = src doc contrib
- 
- all: do-all
- 
--dep:
--	touch src/$(DEPFILE) # to prevent unecessary warnings
--	make -C src dep
-+src/$(DEPFILE):
-+	touch $@ # to prevent unecessary warnings
-+
-+dep: src/$(DEPFILE)
-+	$(MAKE) -C src dep
- 
- check: all
- 
--- 
-1.7.3.1
-

diff --git a/sys-libs/gpm/files/gpm-1.20.5-abi.patch b/sys-libs/gpm/files/gpm-1.20.5-abi.patch
deleted file mode 100644
index 2898015..0000000
--- a/sys-libs/gpm/files/gpm-1.20.5-abi.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-the SONAME upstream was bumped to try and sort out the 1.19.x/1.20.x mess, but
-since we've always had 1.20.x in our tree, we dont care about that breakage.
-
-http://lists.linux.it/pipermail/gpm/2008-June/001026.html
-http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=473496
-
---- gpm/configure
-+++ gpm/configure
-@@ -1736,2 +1736,2 @@
--abi_lev="2"
--abi_age="1"
-+abi_lev="1"
-+abi_age="20"

diff --git a/sys-libs/gpm/files/gpm-1.20.6-disablestatic.patch b/sys-libs/gpm/files/gpm-1.20.6-disablestatic.patch
deleted file mode 100644
index cb51a71..0000000
--- a/sys-libs/gpm/files/gpm-1.20.6-disablestatic.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From b28e69f92f0b0a690e01a7a9b9bc08ffa9e9bc5e Mon Sep 17 00:00:00 2001
-From: Sean McGovern <gseanmcg@gmail.com>
-Date: Mon, 27 Aug 2012 01:00:44 -0400
-Subject: [PATCH] configure: don't build static libgpm by default
-
----
- configure.ac    |   11 +++++++++++
- src/Makefile.in |    6 ++++--
- 2 files changed, 15 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 7245826..899b92d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -79,6 +79,16 @@ AC_CHECK_HEADERS(sys/sysmacros.h linux/major.h linux/tty.h)
- # Required headers
- AC_CHECK_HEADERS(sys/socket.h,,[AC_MSG_ERROR([Required header file missing])])
- 
-+AC_ARG_ENABLE([static],
-+[  --enable-static         build static libraries @<:@default=no@:>@])
-+
-+LIBGPM_A=
-+
-+AS_IF([test "x$enable_static" = "xyes"], [
-+        LIBGPM_A=lib/libgpm.a
-+])
-+
-+
- AC_ARG_WITH(curses,
- [  --without-curses        disable curses support even if curses found])
- 
-@@ -138,6 +148,7 @@ AC_SUBST(ELISP)
- AC_SUBST(SHLIB)
- AC_SUBST(PICFLAGS)
- AC_SUBST(SOLDFLAGS)
-+AC_SUBST(LIBGPM_A)
- AC_SUBST(CURSES_OBJS)
- AC_SUBST(SHARED_LIBS)
- AC_SUBST(lispdir)
-diff --git a/src/Makefile.in b/src/Makefile.in
-index da35a5d..d3b1dcd 100644
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -79,7 +79,7 @@ prog/%:	prog/%.o
- #		| $(SED) '\''s/\($*\)\.o\([ :]*\)/\1.o \1.lo\2/g'\'' > $(DEPDIR)/$@'
- 
- # Do it all!
--all:	gpm lib/libgpm.so.@abi_lev@ lib/libgpm.a $(PROG)
-+all:	gpm lib/libgpm.so.@abi_lev@ @LIBGPM_A@ $(PROG)
- 
- gpm:	$(GOBJ)
- 	$(CC) @LDFLAGS@ $(LDFLAGS) -o $@ $(GOBJ) @LIBS@ $(LIBS) -lm
-@@ -105,7 +105,9 @@ installdirs:
- 
- install:	check 
- 	$(INSTALL_PROGRAM) gpm $(sbindir)/gpm
--	$(INSTALL_DATA) -m 644 lib/libgpm.a $(libdir)/libgpm.a
-+	if [ -f lib/libgpm.a ] ; then \
-+	$(INSTALL_DATA) -m 644 lib/libgpm.a $(libdir)/libgpm.a ; \
-+	fi
- 	$(INSTALL_DATA) -m 644 $(srcdir)/headers/gpm.h $(includedir)/gpm.h
- 	# POSIX requires the range of a for loop be nonempty and Bash
- 	# 2.x goes along; unfortunately that means an additional
--- 
-1.7.8.6
-

diff --git a/sys-libs/gpm/files/gpm.rc6 b/sys-libs/gpm/files/gpm.rc6
deleted file mode 100644
index 7a3328c..0000000
--- a/sys-libs/gpm/files/gpm.rc6
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-#NB: Config is in /etc/conf.d/gpm
-
-depend() {
-	need localmount
-	use hotplug logger
-}
-
-checkconfig() {
-	if [ -z "$MOUSEDEV" ] || [ -z "$MOUSE" ] ; then
-		eerror "You need to setup MOUSEDEV and MOUSE in /etc/conf.d/gpm first"
-		return 1
-	fi
-}
-
-start() {
-	checkconfig || return 1
-
-	local params=""
-	[ -n "$RESPONSIVENESS" ] && params="$params -r $RESPONSIVENESS"
-	[ -n "$REPEAT_TYPE" ]    && params="$params -R$REPEAT_TYPE"
-	[ -n "$APPEND" ]         && params="$params $APPEND "
-	
-	ebegin "Starting gpm"
-	start-stop-daemon --start --quiet --exec /usr/sbin/gpm \
-		-- -m ${MOUSEDEV} -t ${MOUSE} ${params}
-	eend ${?}
-}
-
-stop() {
-	ebegin "Stopping gpm"
-	start-stop-daemon --stop --quiet --pidfile /var/run/gpm.pid
-	eend ${?}
-}

diff --git a/sys-libs/gpm/gpm-1.20.6-r1.ebuild b/sys-libs/gpm/gpm-1.20.6-r1.ebuild
deleted file mode 100644
index ddebd1d..0000000
--- a/sys-libs/gpm/gpm-1.20.6-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# emacs support disabled due to #99533 #335900
-
-EAPI=4
-
-inherit eutils toolchain-funcs autotools
-
-DESCRIPTION="Console-based mouse driver"
-HOMEPAGE="http://www.nico.schottelius.org/software/gpm/"
-SRC_URI="http://www.nico.schottelius.org/software/${PN}/archives/${P}.tar.lzma"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="selinux static-libs"
-
-CDPEND="sys-libs/ncurses"
-DEPEND="${CDEPEND}
-	app-arch/xz-utils
-	virtual/yacc"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-gpm )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/0001-daemon-use-sys-ioctl.h-for-ioctl.patch #222099
-	epatch "${FILESDIR}"/0001-fixup-make-warnings.patch #206291
-	epatch "${FILESDIR}"/${P}-disablestatic.patch #378283
-
-	# fix ABI values
-	sed -i \
-		-e 's/^abi_lev=.*$/abi_lev="1"/' \
-		-e 's/^abi_age=.*$/abi_age="20"/' \
-		configure.ac || die
-
-	# workaround broken release
-	find -name '*.o' -delete
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--sysconfdir=/etc/gpm \
-		$(use_enable static-libs static) \
-		emacs=/bin/false
-}
-
-src_compile() {
-	# make sure nothing compiled is left
-	emake clean
-	emake EMACS=:
-}
-
-src_install() {
-	emake install DESTDIR="${D}" EMACS=: ELISP=""
-
-	dosym libgpm.so.1 /usr/$(get_libdir)/libgpm.so
-	gen_usr_ldscript -a gpm
-
-	insinto /etc/gpm
-	doins conf/gpm-*.conf
-
-	dodoc BUGS Changes README TODO
-	dodoc doc/Announce doc/FAQ doc/README*
-
-	newinitd "${FILESDIR}"/gpm.rc6-2 gpm
-	newconfd "${FILESDIR}"/gpm.conf.d gpm
-}

diff --git a/sys-libs/gpm/gpm-1.20.6.ebuild b/sys-libs/gpm/gpm-1.20.6.ebuild
deleted file mode 100644
index 3a923a9..0000000
--- a/sys-libs/gpm/gpm-1.20.6.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# emacs support disabled due to #99533 #335900
-
-EAPI="2"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Console-based mouse driver"
-HOMEPAGE="http://www.nico.schottelius.org/software/gpm/"
-SRC_URI="http://www.nico.schottelius.org/software/${PN}/archives/${P}.tar.lzma"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="selinux"
-
-DEPEND="sys-libs/ncurses
-	app-arch/xz-utils
-	virtual/yacc"
-RDEPEND="selinux? ( sec-policy/selinux-gpm )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.20.5-abi.patch
-	epatch "${FILESDIR}"/0001-daemon-use-sys-ioctl.h-for-ioctl.patch #222099
-	epatch "${FILESDIR}"/0001-fixup-make-warnings.patch #206291
-
-	# workaround broken release
-	find -name '*.o' -delete
-}
-
-src_configure() {
-	econf \
-		--sysconfdir=/etc/gpm \
-		emacs=/bin/false
-}
-
-src_compile() {
-	# make sure nothing compiled is left
-	emake clean || die
-	emake EMACS=: || die
-}
-
-src_install() {
-	emake install DESTDIR="${D}" EMACS=: ELISP="" || die
-
-	dosym libgpm.so.1 /usr/$(get_libdir)/libgpm.so
-	gen_usr_ldscript -a gpm
-
-	insinto /etc/gpm
-	doins conf/gpm-*.conf
-
-	dodoc BUGS Changes README TODO
-	dodoc doc/Announce doc/FAQ doc/README*
-
-	newinitd "${FILESDIR}"/gpm.rc6 gpm
-	newconfd "${FILESDIR}"/gpm.conf.d gpm
-}

diff --git a/sys-libs/gpm/gpm-1.20.7-r1.ebuild b/sys-libs/gpm/gpm-1.20.7-r1.ebuild
deleted file mode 100644
index c2024fd..0000000
--- a/sys-libs/gpm/gpm-1.20.7-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# emacs support disabled due to #99533 #335900
-
-EAPI="4"
-
-inherit eutils systemd toolchain-funcs autotools
-
-DESCRIPTION="Console-based mouse driver"
-HOMEPAGE="http://www.nico.schottelius.org/software/gpm/"
-SRC_URI="http://www.nico.schottelius.org/software/${PN}/archives/${P}.tar.lzma"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="selinux static-libs"
-
-RDEPEND="sys-libs/ncurses
-	selinux? ( sec-policy/selinux-gpm )"
-DEPEND="sys-libs/ncurses
-	app-arch/xz-utils
-	virtual/yacc"
-
-src_prepare() {
-	# fix ABI values
-	sed -i \
-		-e '/^abi_lev=/s:=.*:=1:' \
-		-e '/^abi_age=/s:=.*:=20:' \
-		configure.ac.footer || die
-	sed -i -e '/ACLOCAL/,$d' autogen.sh || die
-	./autogen.sh
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--sysconfdir=/etc/gpm \
-		$(use_enable static-libs static) \
-		emacs=/bin/false
-}
-
-src_compile() {
-	# make sure nothing compiled is left
-	emake clean
-	emake EMACS=:
-}
-
-src_install() {
-	emake install DESTDIR="${D}" EMACS=: ELISP=""
-
-	dosym libgpm.so.1 /usr/$(get_libdir)/libgpm.so
-	gen_usr_ldscript -a gpm
-
-	insinto /etc/gpm
-	doins conf/gpm-*.conf
-
-	dodoc README TODO
-	dodoc doc/Announce doc/FAQ doc/README*
-
-	newinitd "${FILESDIR}"/gpm.rc6-2 gpm
-	newconfd "${FILESDIR}"/gpm.conf.d gpm
-	systemd_dounit "${FILESDIR}"/gpm.service
-}

diff --git a/sys-libs/gpm/gpm-1.20.7.ebuild b/sys-libs/gpm/gpm-1.20.7.ebuild
deleted file mode 100644
index 6cc573c..0000000
--- a/sys-libs/gpm/gpm-1.20.7.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# emacs support disabled due to #99533 #335900
-
-EAPI="4"
-
-inherit eutils toolchain-funcs autotools
-
-DESCRIPTION="Console-based mouse driver"
-HOMEPAGE="http://www.nico.schottelius.org/software/gpm/"
-SRC_URI="http://www.nico.schottelius.org/software/${PN}/archives/${P}.tar.lzma"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="selinux static-libs"
-
-RDEPEND="sys-libs/ncurses
-	selinux? ( sec-policy/selinux-gpm )"
-DEPEND="sys-libs/ncurses
-	app-arch/xz-utils
-	virtual/yacc"
-
-src_prepare() {
-	# fix ABI values
-	sed -i \
-		-e '/^abi_lev=/s:=.*:=1:' \
-		-e '/^abi_age=/s:=.*:=20:' \
-		configure.ac.footer || die
-	sed -i -e '/ACLOCAL/,$d' autogen.sh || die
-	./autogen.sh
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--sysconfdir=/etc/gpm \
-		$(use_enable static-libs static) \
-		emacs=/bin/false
-}
-
-src_compile() {
-	# make sure nothing compiled is left
-	emake clean
-	emake EMACS=:
-}
-
-src_install() {
-	emake install DESTDIR="${D}" EMACS=: ELISP=""
-
-	dosym libgpm.so.1 /usr/$(get_libdir)/libgpm.so
-	gen_usr_ldscript -a gpm
-
-	insinto /etc/gpm
-	doins conf/gpm-*.conf
-
-	dodoc README TODO
-	dodoc doc/Announce doc/FAQ doc/README*
-
-	newinitd "${FILESDIR}"/gpm.rc6-2 gpm
-	newconfd "${FILESDIR}"/gpm.conf.d gpm
-}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-libs/gpm/files/, sys-libs/gpm/
@ 2016-03-15  2:33 Mike Frysinger
  0 siblings, 0 replies; 5+ messages in thread
From: Mike Frysinger @ 2016-03-15  2:33 UTC (permalink / raw
  To: gentoo-commits

commit:     dcd2860118fdc2618738bca23c8c0aa65255a4ab
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 14 19:42:36 2016 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Tue Mar 15 02:31:59 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcd28601

sys-libs/gpm: fix build w/newer glibc

 sys-libs/gpm/files/gpm-1.20.7-sysmacros.patch | 30 +++++++++++++++++++++++++++
 sys-libs/gpm/gpm-1.20.7-r2.ebuild             |  1 +
 2 files changed, 31 insertions(+)

diff --git a/sys-libs/gpm/files/gpm-1.20.7-sysmacros.patch b/sys-libs/gpm/files/gpm-1.20.7-sysmacros.patch
new file mode 100644
index 0000000..d8ab2d1
--- /dev/null
+++ b/sys-libs/gpm/files/gpm-1.20.7-sysmacros.patch
@@ -0,0 +1,30 @@
+From b350aee4ea5785a75cb6ad770f6b768c506ebb70 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Mon, 14 Mar 2016 15:39:54 -0400
+Subject: [PATCH] fix building w/newer glibc
+
+Linux C libraries are looking to disentangle sysmacros.h from the
+sys/types.h include, so make sure we pull in the header when it is
+found.
+---
+ src/daemon/open_console.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/daemon/open_console.c b/src/daemon/open_console.c
+index 4d6c0af..6dd43e6 100644
+--- a/src/daemon/open_console.c
++++ b/src/daemon/open_console.c
+@@ -24,6 +24,10 @@
+ #include <sys/types.h>              /* major()           */
+ #include <sys/ioctl.h>              /* ioctl             */
+ 
++#ifdef HAVE_SYS_SYSMACROS_H
++#include <sys/sysmacros.h>          /* major() w/newer glibc */
++#endif
++
+ /* Linux specific (to be outsourced in gpm2 */
+ #include <linux/serial.h>           /* for serial console check */
+ #include <asm/ioctls.h>            /* for serial console check */
+-- 
+2.6.2
+

diff --git a/sys-libs/gpm/gpm-1.20.7-r2.ebuild b/sys-libs/gpm/gpm-1.20.7-r2.ebuild
index af8bb4a..8a191dd 100644
--- a/sys-libs/gpm/gpm-1.20.7-r2.ebuild
+++ b/sys-libs/gpm/gpm-1.20.7-r2.ebuild
@@ -29,6 +29,7 @@ DEPEND=">=sys-libs/ncurses-5.9-r3[${MULTILIB_USEDEP}]
 	virtual/yacc"
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-sysmacros.patch
 	# fix ABI values
 	sed -i \
 		-e '/^abi_lev=/s:=.*:=1:' \


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-libs/gpm/files/, sys-libs/gpm/
@ 2017-09-19 21:34 Sergei Trofimovich
  0 siblings, 0 replies; 5+ messages in thread
From: Sergei Trofimovich @ 2017-09-19 21:34 UTC (permalink / raw
  To: gentoo-commits

commit:     1618968c56caf7f8c08823908d88dc49bb8f7649
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 19 21:34:32 2017 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Tue Sep 19 21:34:42 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1618968c

sys-libs/gpm: tweak for glibc-2.26, bug #629774

Reported-by: Philipp Psurek
Fix-by: cyrillic
Closes: https://bugs.gentoo.org/629774
Package-Manager: Portage-2.3.8, Repoman-2.3.3

 sys-libs/gpm/files/gpm-1.20.7-glibc-2.26.patch | 12 ++++++++++++
 sys-libs/gpm/gpm-1.20.7-r2.ebuild              |  7 ++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/sys-libs/gpm/files/gpm-1.20.7-glibc-2.26.patch b/sys-libs/gpm/files/gpm-1.20.7-glibc-2.26.patch
new file mode 100644
index 00000000000..ef2de01a6d6
--- /dev/null
+++ b/sys-libs/gpm/files/gpm-1.20.7-glibc-2.26.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/629774
+--- a/src/prog/gpm-root.y	2012-10-26 17:21:38.000000000 -0400
++++ b/src/prog/gpm-root.y	2017-09-07 20:39:51.933264063 -0400
+@@ -1197,7 +1197,7 @@
+    /* reap your zombies */
+    childaction.sa_handler=reap_children;
+ #if defined(__GLIBC__)
+-   __sigemptyset(&childaction.sa_mask);
++   sigemptyset(&childaction.sa_mask);
+ #else /* __GLIBC__ */
+    childaction.sa_mask=0;
+ #endif /* __GLIBC__ */

diff --git a/sys-libs/gpm/gpm-1.20.7-r2.ebuild b/sys-libs/gpm/gpm-1.20.7-r2.ebuild
index bfb8982b46e..943ef06732c 100644
--- a/sys-libs/gpm/gpm-1.20.7-r2.ebuild
+++ b/sys-libs/gpm/gpm-1.20.7-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # emacs support disabled due to #99533 #335900
@@ -36,6 +36,11 @@ src_prepare() {
 	epatch "${WORKDIR}"/${P}-docs.patch
 	touch -r . doc/* || die
 
+	# bug #629774
+	epatch "${FILESDIR}"/${P}-glibc-2.26.patch
+
+	epatch_user
+
 	# fix ABI values
 	sed -i \
 		-e '/^abi_lev=/s:=.*:=1:' \


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-libs/gpm/files/, sys-libs/gpm/
@ 2020-02-03 23:07 Sergei Trofimovich
  0 siblings, 0 replies; 5+ messages in thread
From: Sergei Trofimovich @ 2020-02-03 23:07 UTC (permalink / raw
  To: gentoo-commits

commit:     8f7e2ac82fc5a1847c132057fb7de1a996d66c76
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Mon Feb  3 22:55:06 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Mon Feb  3 23:07:28 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f7e2ac8

sys-libs/gpm: tweak for gcc-10, bug #705878

Closes: https://bugs.gentoo.org/705878
Package-Manager: Portage-2.3.87, Repoman-2.3.20
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 sys-libs/gpm/files/gpm-1.20.7-gcc-10.patch | 14 ++++++++++++++
 sys-libs/gpm/gpm-1.20.7-r2.ebuild          |  5 ++++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/sys-libs/gpm/files/gpm-1.20.7-gcc-10.patch b/sys-libs/gpm/files/gpm-1.20.7-gcc-10.patch
new file mode 100644
index 00000000000..a55c44fae55
--- /dev/null
+++ b/sys-libs/gpm/files/gpm-1.20.7-gcc-10.patch
@@ -0,0 +1,14 @@
+https://bugs.gentoo.org/705878
+https://github.com/telmich/gpm/pull/37
+
+--- a/src/headers/daemon.h
++++ b/src/headers/daemon.h
+@@ -180,7 +180,7 @@ extern struct mouse_features  mouse_table[3],
+ extern Gpm_Type         mice[];
+ extern Gpm_Type         *repeated_type;
+ 
+-time_t                  last_selection_time;
++extern time_t           last_selection_time;
+ 
+ 
+ 

diff --git a/sys-libs/gpm/gpm-1.20.7-r2.ebuild b/sys-libs/gpm/gpm-1.20.7-r2.ebuild
index c550f3ee116..df485bea459 100644
--- a/sys-libs/gpm/gpm-1.20.7-r2.ebuild
+++ b/sys-libs/gpm/gpm-1.20.7-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # emacs support disabled due to #99533 #335900
@@ -35,6 +35,9 @@ src_prepare() {
 	# bug #629774
 	epatch "${FILESDIR}"/${P}-glibc-2.26.patch
 
+	# bug #705878
+	epatch "${FILESDIR}"/${P}-gcc-10.patch
+
 	epatch_user
 
 	# fix ABI values


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-libs/gpm/files/, sys-libs/gpm/
@ 2022-01-28  2:30 Sam James
  0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2022-01-28  2:30 UTC (permalink / raw
  To: gentoo-commits

commit:     77c6aa5ac90ebe5ef18bf7f6afe44833b383c974
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 28 02:30:08 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jan 28 02:30:42 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77c6aa5a

sys-libs/gpm: fix build with musl, misc upstream backports

- Backport musl patches
- Backport include path fix
- Backport signedness fix

Closes: https://bugs.gentoo.org/829581
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-libs/gpm/files/gpm-1.20.7-gcc-include.patch |  18 +++
 sys-libs/gpm/files/gpm-1.20.7-musl.patch        | 143 ++++++++++++++++++++++++
 sys-libs/gpm/files/gpm-1.20.7-signedness.patch  |  20 ++++
 sys-libs/gpm/gpm-1.20.7-r4.ebuild               | 112 +++++++++++++++++++
 4 files changed, 293 insertions(+)

diff --git a/sys-libs/gpm/files/gpm-1.20.7-gcc-include.patch b/sys-libs/gpm/files/gpm-1.20.7-gcc-include.patch
new file mode 100644
index 000000000000..51d047c465cc
--- /dev/null
+++ b/sys-libs/gpm/files/gpm-1.20.7-gcc-include.patch
@@ -0,0 +1,18 @@
+https://github.com/telmich/gpm/commit/80cac2a2bd7eed7e80626559f792f37319030729
+
+From: "Desmond O. Chang" <dochang@gmail.com>
+Date: Wed, 13 Apr 2016 21:17:48 +0800
+Subject: [PATCH] Add gcc include path
+
+Close #13
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -96,7 +96,7 @@ $(DEPFILE) dep: prog/gpm-root.c
+ 
+ 	# create dependencies
+ 	for DEPS in `echo *.c */*.c`; do \
+-	$(CC) -I. -I $(srcdir) -M @CPPFLAGS@ $(CPPFLAGS) $$DEPS | \
++	$(CC) -I. -I $(srcdir) -I $(srcdir)/headers -M @CPPFLAGS@ $(CPPFLAGS) $$DEPS | \
+ 	$(SED) 's/^\(.*\)\.o\([ :]+\)/\1.o \1.lo\2/g' >> $(DEPFILE) ; done
+ 
+ ### INSTALL

diff --git a/sys-libs/gpm/files/gpm-1.20.7-musl.patch b/sys-libs/gpm/files/gpm-1.20.7-musl.patch
new file mode 100644
index 000000000000..37f8542a87aa
--- /dev/null
+++ b/sys-libs/gpm/files/gpm-1.20.7-musl.patch
@@ -0,0 +1,143 @@
+https://github.com/telmich/gpm/commit/d88fb1de5803c366ab62f7de9ee5d83207fb2afe
+https://github.com/telmich/gpm/commit/4a938233fbe6de7af05aabc74891b68d4bae40f8
+https://bugs.gentoo.org/829581
+
+From: Dima Krasner <dima@dimakrasner.com>
+Date: Wed, 12 Nov 2014 23:06:46 +0200
+Subject: [PATCH] Added musl support to libgpm and the daemon.
+
+--- a/src/daemon/open_console.c
++++ b/src/daemon/open_console.c
+@@ -21,6 +21,7 @@
+ 
+ #include <fcntl.h>                  /* open and co.      */
+ #include <sys/stat.h>               /* stat()            */
++#include <sys/types.h>              /* major()           */
+ #include <sys/ioctl.h>              /* ioctl             */
+ 
+ /* Linux specific (to be outsourced in gpm2 */
+--- a/src/prog/display-buttons.c
++++ b/src/prog/display-buttons.c
+@@ -36,6 +36,7 @@
+ #include <stdio.h>            /* printf()             */
+ #include <time.h>             /* time()               */
+ #include <errno.h>            /* errno                */
++#include <sys/select.h>       /* fd_set and FD_*      */
+ #include <gpm.h>              /* gpm information      */
+ 
+ /* display resulting data */
+--- a/src/prog/display-coords.c
++++ b/src/prog/display-coords.c
+@@ -38,6 +38,7 @@
+ #include <stdio.h>            /* printf()             */
+ #include <time.h>             /* time()               */
+ #include <errno.h>            /* errno                */
++#include <sys/select.h>       /* fd_set and FD_*      */
+ #include <gpm.h>              /* gpm information      */
+ 
+ /* display resulting data */
+--- a/src/prog/gpm-root.y
++++ b/src/prog/gpm-root.y
+@@ -1199,9 +1199,9 @@ int main(int argc, char **argv)
+ #if defined(__GLIBC__)
+    __sigemptyset(&childaction.sa_mask);
+ #else /* __GLIBC__ */
+-   childaction.sa_mask=0;
++   sigemptyset(&childaction.sa_mask);
+ #endif /* __GLIBC__ */
+-   childaction.sa_flags=SA_INTERRUPT; /* need to break the select() call */
++   childaction.sa_flags=0;
+    sigaction(SIGCHLD,&childaction,NULL);
+ 
+    /*....................................... Connect and get your buffer */
+
+From: Kurt Nalty <46026992+kurtnalty@users.noreply.github.com>
+Date: Sat, 29 Dec 2018 23:44:24 -0600
+Subject: [PATCH 1/4] Update gpm.c
+
+--- a/src/daemon/gpm.c
++++ b/src/daemon/gpm.c
+@@ -29,7 +29,7 @@
+ #include <signal.h>        /* SIGPIPE */
+ #include <time.h>          /* time() */
+ #include <sys/param.h>
+-#include <sys/fcntl.h>     /* O_RDONLY */
++#include <fcntl.h>         /* O_RDONLY */
+ #include <sys/wait.h>      /* wait()   */
+ #include <sys/stat.h>      /* mkdir()  */
+ #include <sys/time.h>      /* timeval */
+
+From: Kurt Nalty <46026992+kurtnalty@users.noreply.github.com>
+Date: Sat, 29 Dec 2018 23:47:17 -0600
+Subject: [PATCH 2/4] Add include <string.h>
+
+Added
+ line 28, #include <string.h>                 /* strcpy, bzero     */
+for musl compilation
+--- a/src/daemon/old_main.c
++++ b/src/daemon/old_main.c
+@@ -25,6 +25,7 @@
+ #include <signal.h>                 /* guess again       */
+ #include <errno.h>                  /* guess again       */
+ #include <unistd.h>                 /* unlink            */
++#include <string.h>                 /* strcpy, bzero     */
+ #include <sys/stat.h>               /* chmod             */
+ 
+ #include <linux/kd.h>               /* linux hd*         */
+
+From: Kurt Nalty <46026992+kurtnalty@users.noreply.github.com>
+Date: Sat, 29 Dec 2018 23:52:58 -0600
+Subject: [PATCH 3/4] Update liblow.c for musl compatible
+
+Changed #include <sys/fcntl.h>   to    #include <fcntl.h>
+Changed SA_NOMASK to SA_NODEFER on lines 176, 367
+--- a/src/lib/liblow.c
++++ b/src/lib/liblow.c
+@@ -33,7 +33,7 @@
+ #include <sys/types.h>     /* socket() */
+ #include <sys/socket.h>    /* socket() */
+ #include <sys/un.h>        /* struct sockaddr_un */
+-#include <sys/fcntl.h>     /* O_RDONLY */
++#include <fcntl.h>     /* O_RDONLY */
+ #include <sys/stat.h>      /* stat() */
+ 
+ #ifdef  SIGTSTP         /* true if BSD system */
+@@ -173,7 +173,7 @@ static void gpm_suspend_hook (int signum)
+   /* Reincarnation. Prepare for another death early. */
+   sigemptyset(&sa.sa_mask);
+   sa.sa_handler = gpm_suspend_hook;
+-  sa.sa_flags = SA_NOMASK;
++  sa.sa_flags = SA_NODEFER;
+   sigaction (SIGTSTP, &sa, 0);
+ 
+   /* Pop the gpm stack by closing the useless connection */
+@@ -364,7 +364,7 @@ int Gpm_Open(Gpm_Connect *conn, int flag)
+ 
+          /* if signal was originally ignored, job control is not supported */
+          if (gpm_saved_suspend_hook.sa_handler != SIG_IGN) {
+-            sa.sa_flags = SA_NOMASK;
++            sa.sa_flags = SA_NODEFER;
+             sa.sa_handler = gpm_suspend_hook;
+             sigaction(SIGTSTP, &sa, 0);
+          }
+
+From: Kurt Nalty <46026992+kurtnalty@users.noreply.github.com>
+Date: Mon, 31 Dec 2018 18:41:19 -0600
+Subject: [PATCH 4/4] Aligned comments
+
+--- a/src/lib/liblow.c
++++ b/src/lib/liblow.c
+@@ -29,11 +29,12 @@
+ #include <string.h>        /* strncmp */
+ #include <unistd.h>        /* select(); */
+ #include <errno.h>
++#include <fcntl.h>         /* O_RDONLY */
++
+ #include <sys/time.h>      /* timeval */
+ #include <sys/types.h>     /* socket() */
+ #include <sys/socket.h>    /* socket() */
+ #include <sys/un.h>        /* struct sockaddr_un */
+-#include <fcntl.h>     /* O_RDONLY */
+ #include <sys/stat.h>      /* stat() */
+ 
+ #ifdef  SIGTSTP         /* true if BSD system */

diff --git a/sys-libs/gpm/files/gpm-1.20.7-signedness.patch b/sys-libs/gpm/files/gpm-1.20.7-signedness.patch
new file mode 100644
index 000000000000..3904bfd6cca3
--- /dev/null
+++ b/sys-libs/gpm/files/gpm-1.20.7-signedness.patch
@@ -0,0 +1,20 @@
+https://github.com/telmich/gpm/commit/4337fd9fc2d2ea83654f2ca69245503730231ac3
+
+From: iljavs <ivansprundel@ioactive.com>
+Date: Mon, 27 Jun 2016 01:17:57 -0700
+Subject: [PATCH] fix signedness issue
+
+This commit fixes a signedness issue, where a negative vc coming from a malicious client could possibly cause memory corruption.
+--- a/src/daemon/processconn.c
++++ b/src/daemon/processconn.c
+@@ -67,7 +67,8 @@ int processConn(int fd)
+       return -1;
+    }
+ 
+-   if((vc = request->vc) > MAX_VC) {
++   vc = request->vc;
++   if(vc > MAX_VC || vc < 0) {
+       gpm_report(GPM_PR_DEBUG, GPM_MESS_REQUEST_ON, vc, MAX_VC);
+       free(info);
+       close(newfd);
+

diff --git a/sys-libs/gpm/gpm-1.20.7-r4.ebuild b/sys-libs/gpm/gpm-1.20.7-r4.ebuild
new file mode 100644
index 000000000000..d554df614508
--- /dev/null
+++ b/sys-libs/gpm/gpm-1.20.7-r4.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# emacs support disabled due to #99533 #335900
+
+EAPI=7
+
+inherit autotools linux-info systemd usr-ldscript multilib-minimal
+
+DESCRIPTION="Console-based mouse driver"
+HOMEPAGE="https://www.nico.schottelius.org/software/gpm/"
+SRC_URI="
+	https://www.nico.schottelius.org/software/${PN}/archives/${P}.tar.lzma
+	mirror://gentoo/${P}-docs.patch.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="selinux"
+
+RDEPEND="
+	sys-libs/ncurses:=[${MULTILIB_USEDEP}]
+	selinux? ( sec-policy/selinux-gpm )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-arch/xz-utils
+	sys-apps/texinfo
+	virtual/yacc"
+
+CONFIG_CHECK="~INPUT_MOUSEDEV"
+ERROR_INPUT_MOUSEDEV="CONFIG_INPUT_MOUSEDEV:\tis not set (required to expose mice for GPM)"
+
+pkg_pretend() {
+	check_extra_config
+}
+
+src_prepare() {
+	eapply "${FILESDIR}"/${P}-sysmacros.patch
+
+	# Hack up the docs until we get this sorted upstream.
+	# https://github.com/telmich/gpm/issues/8
+	eapply "${WORKDIR}"/${P}-docs.patch
+	touch -r . doc/* || die
+
+	# bug #629774
+	eapply "${FILESDIR}"/${P}-glibc-2.26.patch
+	# bug #705878
+	eapply "${FILESDIR}"/${P}-gcc-10.patch
+	# bug #829581
+	eapply "${FILESDIR}"/${P}-musl.patch
+	#
+	eapply "${FILESDIR}"/${P}-gcc-include.patch
+	eapply "${FILESDIR}"/${P}-signedness.patch
+
+	eapply_user
+
+	# fix ABI values
+	sed -i \
+		-e '/^abi_lev=/s:=.*:=1:' \
+		-e '/^abi_age=/s:=.*:=20:' \
+		configure.ac.footer || die
+	# Rebuild autotools since release doesn't include them.
+	# Should be fixed with the next release though.
+	# https://github.com/telmich/gpm/pull/15
+	sed -i -e '/ACLOCAL/,$d' autogen.sh || die
+	./autogen.sh
+	eautoreconf
+
+	# Out-of-tree builds are broken.
+	# https://github.com/telmich/gpm/issues/16
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	econf \
+		--disable-static \
+		--sysconfdir="${EPREFIX}"/etc/gpm \
+		emacs="${BROOT}"/bin/false
+}
+
+_emake() {
+	emake \
+		EMACS=: ELISP="" \
+		$(multilib_is_native_abi || echo "PROG= ") \
+		"$@"
+}
+
+multilib_src_compile() {
+	_emake
+}
+
+multilib_src_test() {
+	_emake check
+}
+
+multilib_src_install() {
+	_emake DESTDIR="${D}" install
+
+	dosym libgpm.so.1 /usr/$(get_libdir)/libgpm.so
+	gen_usr_ldscript -a gpm
+}
+
+multilib_src_install_all() {
+	insinto /etc/gpm
+	doins conf/gpm-*.conf
+
+	dodoc README TODO doc/Announce doc/FAQ doc/README*
+
+	newinitd "${FILESDIR}"/gpm.rc6-2 gpm
+	newconfd "${FILESDIR}"/gpm.conf.d gpm
+	systemd_dounit "${FILESDIR}"/gpm.service
+}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2022-01-28  2:31 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-02-03 23:07 [gentoo-commits] repo/gentoo:master commit in: sys-libs/gpm/files/, sys-libs/gpm/ Sergei Trofimovich
  -- strict thread matches above, loose matches on Subject: below --
2022-01-28  2:30 Sam James
2017-09-19 21:34 Sergei Trofimovich
2016-03-15  2:33 Mike Frysinger
2016-02-15  2:17 Mike Frysinger

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox