* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libspt/, dev-libs/libspt/files/
@ 2017-12-09 13:34 Akinori Hattori
0 siblings, 0 replies; 4+ messages in thread
From: Akinori Hattori @ 2017-12-09 13:34 UTC (permalink / raw
To: gentoo-commits
commit: a6be33d66a7215a8f5f5ba63686090130b270151
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 9 13:32:22 2017 +0000
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Sat Dec 9 13:33:18 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6be33d6
dev-libs/libspt: fix build with >=sys-libs/glibc-2.26
Closes: https://bugs.gentoo.org/630780
Package-Manager: Portage-2.3.13, Repoman-2.3.4
dev-libs/libspt/Manifest | 2 +-
dev-libs/libspt/files/libspt-rpc.patch | 22 ++++++++++++++++++++++
dev-libs/libspt/libspt-1.1-r2.ebuild | 25 +++++++++++++++++++++++--
dev-libs/libspt/libspt-1.1-r3.ebuild | 25 +++++++++++++++++++++++--
dev-libs/libspt/metadata.xml | 11 +++++++----
5 files changed, 76 insertions(+), 9 deletions(-)
diff --git a/dev-libs/libspt/Manifest b/dev-libs/libspt/Manifest
index 77e4a20d9a4..ca801f97ad8 100644
--- a/dev-libs/libspt/Manifest
+++ b/dev-libs/libspt/Manifest
@@ -1 +1 @@
-DIST libspt-1.1.tar.bz2 165168 SHA256 fda34d08a8d167cdabd1d8645210b7ffc9e624e5accd37577f2bcb025830e22e SHA512 5b2ec289ce51f1f2040b68c559ef6e1ea1e59f50c3d639a93176fa8a5f3f75481651c4d0acd393eac8d2193f2aae19f882897323caf344cbfde52e32cc3a02b9 WHIRLPOOL ed05a7cbbdcd420d811a13dfc29b712a6bd241b41740029b4b366907085f98f13d14a4012ea53d862f4780a3f070f9ea7cbd70bf8bff30c8aec87a3a2d7c0e95
+DIST libspt-1.1.tar.bz2 165168 BLAKE2B a21778ba8b3c22d7fa655460ede0d04efc98635b1be74575cbb996b33bdb27ed75479ae6a2d7bc38c1052ac23547483e9d93c03531cbfe236e1e07944bad1673 SHA512 5b2ec289ce51f1f2040b68c559ef6e1ea1e59f50c3d639a93176fa8a5f3f75481651c4d0acd393eac8d2193f2aae19f882897323caf344cbfde52e32cc3a02b9
diff --git a/dev-libs/libspt/files/libspt-rpc.patch b/dev-libs/libspt/files/libspt-rpc.patch
new file mode 100644
index 00000000000..79b545ace4f
--- /dev/null
+++ b/dev-libs/libspt/files/libspt-rpc.patch
@@ -0,0 +1,22 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -55,7 +55,18 @@
+ AC_CHECK_FUNCS([dup2 ftruncate gettimeofday select strcspn strstr]dnl
+ [ strchr memcpy bzero setutent setutxent updwtmp updwtmpx _openpty revoke getsid]dnl
+ [ setsid setpgrp snprintf sigaction cfmakeraw])
++AC_ARG_WITH([libtirpc],
++ [AS_HELP_STRING([--with-libtirpc],[Use libtirpc as RPC implementation (instead of sunrpc)])])
++AS_IF([test "x$with_libtirpc" = xyes],
++ [PKG_CHECK_MODULES([TIRPC],
++ [libtirpc],
++ [CFLAGS="$CFLAGS $TIRPC_CFLAGS"; LIBS="$LIBS $TIRPC_LIBS";],
++ [AC_MSG_ERROR([libtirpc requested, but library not found.])]
++ )],
++ [AC_CHECK_HEADER(rpc/rpc.h,
++ [],
++ [AC_MSG_ERROR([sunrpc requested, but headers are not present.])]
++)])
+-AC_SEARCH_LIBS([xdr_free],[nsl rpclib])
+ AC_SEARCH_LIBS([socket],[socket])
+ AC_SEARCH_LIBS([nanosleep],[posix4])
+
diff --git a/dev-libs/libspt/libspt-1.1-r2.ebuild b/dev-libs/libspt/libspt-1.1-r2.ebuild
index 55536d07fd3..cf5d08f80b2 100644
--- a/dev-libs/libspt/libspt-1.1-r2.ebuild
+++ b/dev-libs/libspt/libspt-1.1-r2.ebuild
@@ -3,6 +3,8 @@
EAPI="6"
+inherit autotools
+
DESCRIPTION="Library for handling root privilege"
#HOMEPAGE="http://www.j10n.org/libspt/index.html"
HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
@@ -11,7 +13,26 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
LICENSE="BSD-2"
SLOT="0"
KEYWORDS="alpha amd64 ppc x86"
-IUSE=""
+IUSE="+libtirpc"
RESTRICT="test"
-PATCHES=( "${FILESDIR}/${PN}-gentoo.patch" )
+RDEPEND="!libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) )
+ libtirpc? ( net-libs/libtirpc )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-gentoo.patch"
+ "${FILESDIR}/${PN}-rpc.patch"
+)
+
+src_prepare() {
+ rm aclocal.m4
+
+ default
+ eautoreconf
+}
+
+src_configure() {
+ econf $(use_with libtirpc)
+}
diff --git a/dev-libs/libspt/libspt-1.1-r3.ebuild b/dev-libs/libspt/libspt-1.1-r3.ebuild
index 028608c7a2d..d922b8c9919 100644
--- a/dev-libs/libspt/libspt-1.1-r3.ebuild
+++ b/dev-libs/libspt/libspt-1.1-r3.ebuild
@@ -3,6 +3,8 @@
EAPI="6"
+inherit autotools
+
DESCRIPTION="Library for handling root privilege"
#HOMEPAGE="http://www.j10n.org/libspt/index.html"
HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
@@ -11,10 +13,29 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
LICENSE="BSD-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="suid"
+IUSE="+libtirpc suid"
RESTRICT="test"
-PATCHES=( "${FILESDIR}/${PN}-gentoo.patch" )
+RDEPEND="!libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) )
+ libtirpc? ( net-libs/libtirpc )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-gentoo.patch"
+ "${FILESDIR}/${PN}-rpc.patch"
+)
+
+src_prepare() {
+ rm aclocal.m4
+
+ default
+ eautoreconf
+}
+
+src_configure() {
+ econf $(use_with libtirpc)
+}
src_install() {
default
diff --git a/dev-libs/libspt/metadata.xml b/dev-libs/libspt/metadata.xml
index c921b96adf6..4b6896b6c4a 100644
--- a/dev-libs/libspt/metadata.xml
+++ b/dev-libs/libspt/metadata.xml
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer type="project">
- <email>cjk@gentoo.org</email>
- <name>Cjk</name>
-</maintainer>
+ <maintainer type="project">
+ <email>cjk@gentoo.org</email>
+ <name>Cjk</name>
+ </maintainer>
+ <use>
+ <flag name="libtirpc">Build against net-libs/libtirpc for RPC support</flag>
+ </use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libspt/, dev-libs/libspt/files/
@ 2024-11-07 20:15 Andreas K. Hüttel
0 siblings, 0 replies; 4+ messages in thread
From: Andreas K. Hüttel @ 2024-11-07 20:15 UTC (permalink / raw
To: gentoo-commits
commit: 45316ada568cb0962417ba4b68727d35ee0d049d
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 7 20:14:41 2024 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Thu Nov 7 20:15:24 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45316ada
dev-libs/libspt: fix compilation with musl
Closes: https://bugs.gentoo.org/895050
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
dev-libs/libspt/files/libspt-gettimeofday.patch | 14 ++++++++++++++
dev-libs/libspt/libspt-1.1-r4.ebuild | 3 ++-
2 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/dev-libs/libspt/files/libspt-gettimeofday.patch b/dev-libs/libspt/files/libspt-gettimeofday.patch
new file mode 100644
index 000000000000..fde0f009aa2a
--- /dev/null
+++ b/dev-libs/libspt/files/libspt-gettimeofday.patch
@@ -0,0 +1,14 @@
+
+See https://bugs.gentoo.org/895050
+
+diff '--color=auto' -ruN libspt-1.1.orig/sptagent.c libspt-1.1/sptagent.c
+--- libspt-1.1.orig/sptagent.c 2024-11-07 21:12:10.902407126 +0100
++++ libspt-1.1/sptagent.c 2024-11-07 21:12:03.434285665 +0100
+@@ -5,6 +5,7 @@
+ #include "sptprivate.h"
+ #include <stdio.h>
+ #include <sys/stat.h>
++#include <sys/time.h>
+ #include <grp.h>
+ #include <pwd.h>
+ #include <time.h>
diff --git a/dev-libs/libspt/libspt-1.1-r4.ebuild b/dev-libs/libspt/libspt-1.1-r4.ebuild
index 5e381b2ef84e..52475a23099b 100644
--- a/dev-libs/libspt/libspt-1.1-r4.ebuild
+++ b/dev-libs/libspt/libspt-1.1-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -23,6 +23,7 @@ PATCHES=(
"${FILESDIR}/${PN}-gentoo.patch"
"${FILESDIR}/${PN}-glibc-2.30.patch"
"${FILESDIR}/${PN}-rpc.patch"
+ "${FILESDIR}/${PN}-gettimeofday.patch"
)
src_prepare() {
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libspt/, dev-libs/libspt/files/
@ 2019-10-27 9:09 Akinori Hattori
0 siblings, 0 replies; 4+ messages in thread
From: Akinori Hattori @ 2019-10-27 9:09 UTC (permalink / raw
To: gentoo-commits
commit: 5a78e4dc89f02a15ad86b09a8fe84d1c02822d71
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 27 09:06:16 2019 +0000
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Sun Oct 27 09:08:58 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a78e4dc
dev-libs/libspt: fix build with >=sys-libs/glibc-2.30
Closes: https://bugs.gentoo.org/691762
Package-Manager: Portage-2.3.76, Repoman-2.3.16
Signed-off-by: Akinori Hattori <hattya <AT> gentoo.org>
dev-libs/libspt/files/libspt-glibc-2.30.patch | 12 ++++++++++++
dev-libs/libspt/libspt-1.1-r2.ebuild | 1 +
dev-libs/libspt/libspt-1.1-r3.ebuild | 1 +
dev-libs/libspt/libspt-1.1-r4.ebuild | 1 +
4 files changed, 15 insertions(+)
diff --git a/dev-libs/libspt/files/libspt-glibc-2.30.patch b/dev-libs/libspt/files/libspt-glibc-2.30.patch
new file mode 100644
index 00000000000..1ebb9b969b2
--- /dev/null
+++ b/dev-libs/libspt/files/libspt-glibc-2.30.patch
@@ -0,0 +1,12 @@
+--- a/libspt.c
++++ b/libspt.c
+@@ -7,9 +7,6 @@
+ #include <time.h>
+ #include <stdio.h> /* for perror() */
+ #include <signal.h>
+-#ifdef HAVE_PTY_SVR4
+-#include <sys/stropts.h>
+-#endif
+
+ struct spt_handle_tag {
+ connection *pconn;
diff --git a/dev-libs/libspt/libspt-1.1-r2.ebuild b/dev-libs/libspt/libspt-1.1-r2.ebuild
index 1118a347b3a..a2bbec0ed4d 100644
--- a/dev-libs/libspt/libspt-1.1-r2.ebuild
+++ b/dev-libs/libspt/libspt-1.1-r2.ebuild
@@ -22,6 +22,7 @@ DEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}/${PN}-gentoo.patch"
+ "${FILESDIR}/${PN}-glibc-2.30.patch"
"${FILESDIR}/${PN}-rpc.patch"
)
diff --git a/dev-libs/libspt/libspt-1.1-r3.ebuild b/dev-libs/libspt/libspt-1.1-r3.ebuild
index c629d49e661..4ed4bdc71bf 100644
--- a/dev-libs/libspt/libspt-1.1-r3.ebuild
+++ b/dev-libs/libspt/libspt-1.1-r3.ebuild
@@ -22,6 +22,7 @@ DEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}/${PN}-gentoo.patch"
+ "${FILESDIR}/${PN}-glibc-2.30.patch"
"${FILESDIR}/${PN}-rpc.patch"
)
diff --git a/dev-libs/libspt/libspt-1.1-r4.ebuild b/dev-libs/libspt/libspt-1.1-r4.ebuild
index 8cd01a692c3..4679b16bc3f 100644
--- a/dev-libs/libspt/libspt-1.1-r4.ebuild
+++ b/dev-libs/libspt/libspt-1.1-r4.ebuild
@@ -21,6 +21,7 @@ DEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}/${PN}-gentoo.patch"
+ "${FILESDIR}/${PN}-glibc-2.30.patch"
"${FILESDIR}/${PN}-rpc.patch"
)
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libspt/, dev-libs/libspt/files/
@ 2017-07-08 8:23 Akinori Hattori
0 siblings, 0 replies; 4+ messages in thread
From: Akinori Hattori @ 2017-07-08 8:23 UTC (permalink / raw
To: gentoo-commits
commit: e8f7b002330ec9985b91cd1cee4018b38f29b362
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 8 08:17:25 2017 +0000
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Sat Jul 8 08:17:25 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8f7b002
dev-libs/libspt: update patches
Package-Manager: Portage-2.3.6, Repoman-2.3.1
dev-libs/libspt/files/libspt-gentoo.patch | 29 +++++++++++++++++++++++++++++
dev-libs/libspt/files/libspt-werror.patch | 11 -----------
dev-libs/libspt/libspt-1.1-r2.ebuild | 8 +++-----
3 files changed, 32 insertions(+), 16 deletions(-)
diff --git a/dev-libs/libspt/files/libspt-gentoo.patch b/dev-libs/libspt/files/libspt-gentoo.patch
new file mode 100644
index 00000000000..f6c709b6b79
--- /dev/null
+++ b/dev-libs/libspt/files/libspt-gentoo.patch
@@ -0,0 +1,29 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -9,7 +9,7 @@
+ libexecdir = @libexecdir@
+ includedir = @includedir@
+ #docdir = $(prefix)/doc
+-mandir = $(prefix)/man
++mandir = @mandir@
+
+ EXEEXT = @EXEEXT@
+
+@@ -29,7 +29,7 @@
+ INCLUDES = -I.
+ DEFS = @DEFS@
+ CC = @CC@
+-COMMONCFLAGS = -Wall -g -Werror -pipe
++COMMONCFLAGS = -Wall -g -pipe
+ CFLAGS = $(COMMONCFLAGS) @CFLAGS@
+ INSTALL = $(LIBTOOL) --mode=install @INSTALL@
+ INSTALL_DATA = $(LIBTOOL) --mode=install @INSTALL@ -m 644
+@@ -48,7 +48,7 @@
+ AGENTOBJS = sptagent.o sptconn.$lo cfuncs.$lo
+ LIBOBJS = libspt.$lo sptconn.$lo cfuncs.$lo error.$lo utilapi.$lo termios.$lo
+ OBJS = test.o $(LIBOBJS)
+-AGENT_MODE = -m 4755 -o root -g wheel
++AGENT_MODE =
+
+ .SUFFIXES: .c .o .cc .lo
+ .c.lo:
diff --git a/dev-libs/libspt/files/libspt-werror.patch b/dev-libs/libspt/files/libspt-werror.patch
deleted file mode 100644
index 6190ea5a455..00000000000
--- a/dev-libs/libspt/files/libspt-werror.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in 2003-12-07 06:42:15.000000000 +0000
-+++ Makefile.in 2009-03-10 21:09:43.000000000 +0000
-@@ -29,7 +29,7 @@
- INCLUDES = -I.
- DEFS = @DEFS@
- CC = @CC@
--COMMONCFLAGS = -Wall -g -Werror -pipe
-+COMMONCFLAGS = -Wall -g -pipe
- CFLAGS = $(COMMONCFLAGS) @CFLAGS@
- INSTALL = $(LIBTOOL) --mode=install @INSTALL@
- INSTALL_DATA = $(LIBTOOL) --mode=install @INSTALL@ -m 644
diff --git a/dev-libs/libspt/libspt-1.1-r2.ebuild b/dev-libs/libspt/libspt-1.1-r2.ebuild
index 255689643e5..cd153e95227 100644
--- a/dev-libs/libspt/libspt-1.1-r2.ebuild
+++ b/dev-libs/libspt/libspt-1.1-r2.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="2"
+
inherit base
DESCRIPTION="Library for handling root privilege"
@@ -12,13 +13,10 @@ LICENSE="BSD-2"
SLOT="0"
KEYWORDS="alpha amd64 ppc x86"
IUSE=""
-
RESTRICT="test"
src_prepare() {
- epatch \
- "${FILESDIR}/libspt-werror.patch" \
- "${FILESDIR}/${P}-gentoo.patch"
+ epatch "${FILESDIR}/${PN}-gentoo.patch"
}
src_install() {
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-11-07 20:15 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-12-09 13:34 [gentoo-commits] repo/gentoo:master commit in: dev-libs/libspt/, dev-libs/libspt/files/ Akinori Hattori
-- strict thread matches above, loose matches on Subject: below --
2024-11-07 20:15 Andreas K. Hüttel
2019-10-27 9:09 Akinori Hattori
2017-07-08 8:23 Akinori Hattori
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox